chore: Add rebasing rules for minimatch related changes

sbouchet · claude · RomanNikitenko · commit eec9cd1e9e19 · 2026-03-25T16:06:27.000+02:00
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.rebase/add/code/build/npm/gyp/package.json b/.rebase/add/code/build/npm/gyp/package.json
@@ -1,6 +1,7 @@
 {
     "overrides": {
         "glob": "10.5.0",
-        "tar": "^7.5.11" 
+        "tar": "^7.5.11",
+        "minimatch": "^9.0.9"
     }
 }
diff --git a/.rebase/add/code/build/package.json b/.rebase/add/code/build/package.json
@@ -8,6 +8,12 @@
         },
         "qs": "6.14.1",
         "lodash": "^4.17.23",
-        "fast-xml-parser": "^4.5.4"
+        "fast-xml-parser": "^4.5.4",
+        "@vscode/vsce": {
+            "minimatch": "^3.1.5"
+        },
+        "vscode-universal-bundler": {
+            "minimatch": "^9.0.9"
+        }
     }
 }
diff --git a/.rebase/add/code/extensions/css-language-features/package.json b/.rebase/add/code/extensions/css-language-features/package.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "minimatch": "^10.2.4"
+    }
+}
diff --git a/.rebase/add/code/extensions/html-language-features/package.json b/.rebase/add/code/extensions/html-language-features/package.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "minimatch": "^10.2.4"
+    }
+}
diff --git a/.rebase/add/code/extensions/json-language-features/package.json b/.rebase/add/code/extensions/json-language-features/package.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "minimatch": "^10.2.4"
+    }
+}
diff --git a/.rebase/add/code/extensions/markdown-language-features/package.json b/.rebase/add/code/extensions/markdown-language-features/package.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "minimatch": "^3.1.5"
+    }
+}
diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json
@@ -42,6 +42,21 @@
         },
         "tar": "^7.5.11",
         "undici": "^7.24.0",
-        "svgo": "^2.8.1"
+        "svgo": "^2.8.1",
+        "mocha": {
+            "minimatch": "^5.1.9"
+        },
+        "@vscode/test-cli": {
+            "minimatch": "^9.0.9"
+        },
+        "@ts-morph/common": {
+            "minimatch": "^7.4.9"
+        },
+        "glob": {
+            "minimatch": "^5.1.9"
+        },
+        "@typescript-eslint/typescript-estree": {
+            "minimatch": "^9.0.9"
+        }
     }
 }
diff --git a/.rebase/add/code/test/automation/package.json b/.rebase/add/code/test/automation/package.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "minimatch": "^3.1.5"
+    }
+}
diff --git a/.rebase/add/code/test/integration/browser/package.json b/.rebase/add/code/test/integration/browser/package.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "minimatch": "^3.1.5"
+    }
+}
diff --git a/.rebase/add/code/test/mcp/package.json b/.rebase/add/code/test/mcp/package.json
@@ -1,6 +1,7 @@
 {
     "overrides": {
         "qs": "6.14.1",
-        "ajv": "6.14.0"
+        "ajv": "6.14.0",
+        "minimatch": "^3.1.5"
     }
 }
diff --git a/.rebase/add/code/test/smoke/package.json b/.rebase/add/code/test/smoke/package.json
@@ -1,5 +1,6 @@
 {
     "overrides": {
-        "form-data": "^3.0.4"
+        "form-data": "^3.0.4",
+        "minimatch": "^3.1.5"
     }
 }
diff --git a/.rebase/override/code/extensions/npm/package.json b/.rebase/override/code/extensions/npm/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "minimatch": "^5.1.9"
+    }
+}
diff --git a/.rebase/override/code/package.json b/.rebase/override/code/package.json
@@ -5,7 +5,7 @@
       "@vscode/l10n-dev": "0.0.18",
       "@vscode/test-cli": "^0.0.12",
       "@vscode/test-web": "^0.0.77",
-      "minimatch": "^3.0.5",
+      "minimatch": "^3.1.5",
       "eslint": "^9.39.3"
     }
 }
diff --git a/rebase.sh b/rebase.sh
@@ -543,6 +543,22 @@ resolve_conflicts() {
       apply_multi_line_replace "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts" ]]; then
       apply_multi_line_replace "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/extensions/css-language-features/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/extensions/html-language-features/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/extensions/json-language-features/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/extensions/markdown-language-features/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/extensions/npm/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/test/automation/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/test/integration/browser/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
+    elif [[ "$conflictingFile" == "code/test/smoke/package.json" ]]; then
+      apply_package_changes_by_path "$conflictingFile"
     elif [[ "$conflictingFile" == "code/build/gulpfile.cli.js" ]]; then
       apply_changes_multi_line "$conflictingFile"
     elif [[ "$conflictingFile" == "code/build/gulpfile.reh.js" ]]; then

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"overrides": {`
`3`	`3`	`"glob": "10.5.0",`
`4`		`- "tar": "^7.5.11"`
	`4`	`+ "tar": "^7.5.11",`
	`5`	`+ "minimatch": "^9.0.9"`
`5`	`6`	`}`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,12 @@`
`8`	`8`	`},`
`9`	`9`	`"qs": "6.14.1",`
`10`	`10`	`"lodash": "^4.17.23",`
`11`		`- "fast-xml-parser": "^4.5.4"`
	`11`	`+ "fast-xml-parser": "^4.5.4",`
	`12`	`+ "@vscode/vsce": {`
	`13`	`+ "minimatch": "^3.1.5"`
	`14`	`+ },`
	`15`	`+ "vscode-universal-bundler": {`
	`16`	`+ "minimatch": "^9.0.9"`
	`17`	`+ }`
`12`	`18`	`}`
`13`	`19`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "overrides": {
 +        "minimatch": "^10.2.4"
 +    }
 +}