Merge pull request che-incubator#557 from RomanNikitenko/bump-tar-fs

RomanNikitenko · web-flow · commit f18c5059b19d · 2025-07-21T17:43:10.000+03:00
Update tar-fs to 2.1.3 and 3.0.9
diff --git a/.rebase/CHANGELOG.md b/.rebase/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @RomanNikitenko
+https://github.com/che-incubator/che-code/pull/557
+
+- code/package.json
+- code/build/package.json
+- code/remote/package.json
+---
+
 #### @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/549
 
diff --git a/.rebase/add/code/build/package.json b/.rebase/add/code/build/package.json
@@ -0,0 +1,7 @@
+{
+    "overrides": {
+        "prebuild-install": {
+            "tar-fs": "2.1.3"
+        }
+    }
+}
diff --git a/.rebase/add/code/package.json b/.rebase/add/code/package.json
@@ -16,6 +16,12 @@
         },
         "postcss": {
             "nanoid": "3.3.8"
+        },
+        "@vscode/test-web": {
+            "tar-fs": "3.0.9"
+        },
+        "prebuild-install": {
+            "tar-fs": "2.1.3"
         }
     }
 }
diff --git a/.rebase/add/code/remote/package.json b/.rebase/add/code/remote/package.json
@@ -3,5 +3,10 @@
         "ws": "8.2.3",
         "js-yaml": "^4.1.0",
         "@kubernetes/client-node": "^0.22.0"
+    },
+    "overrides": {
+        "prebuild-install": {
+            "tar-fs": "2.1.3"
+        }
     }
 }
diff --git a/code/build/package-lock.json b/code/build/package-lock.json
diff --git a/code/build/package.json b/code/build/package.json
@@ -66,5 +66,10 @@
   "optionalDependencies": {
     "tree-sitter-typescript": "^0.23.2",
     "vscode-gulp-watch": "^5.0.3"
+  },
+  "overrides": {
+    "prebuild-install": {
+      "tar-fs": "2.1.3"
+    }
   }
 }
diff --git a/code/package-lock.json b/code/package-lock.json
diff --git a/code/package.json b/code/package.json
@@ -239,6 +239,12 @@
     },
     "kerberos@2.1.1": {
       "node-addon-api": "7.1.0"
+    },
+    "@vscode/test-web": {
+      "tar-fs": "3.0.9"
+    },
+    "prebuild-install": {
+      "tar-fs": "2.1.3"
     }
   },
   "repository": {
diff --git a/code/remote/package-lock.json b/code/remote/package-lock.json
diff --git a/code/remote/package.json b/code/remote/package.json
@@ -47,6 +47,9 @@
     "node-gyp-build": "4.8.1",
     "kerberos@2.1.1": {
       "node-addon-api": "7.1.0"
+    },
+    "prebuild-install": {
+      "tar-fs": "2.1.3"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,12 @@`
`16`	`16`	`},`
`17`	`17`	`"postcss": {`
`18`	`18`	`"nanoid": "3.3.8"`
	`19`	`+ },`
	`20`	`+ "@vscode/test-web": {`
	`21`	`+ "tar-fs": "3.0.9"`
	`22`	`+ },`
	`23`	`+ "prebuild-install": {`
	`24`	`+ "tar-fs": "2.1.3"`
`19`	`25`	`}`
`20`	`26`	`}`
`21`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,10 @@`
`3`	`3`	`"ws": "8.2.3",`
`4`	`4`	`"js-yaml": "^4.1.0",`
`5`	`5`	`"@kubernetes/client-node": "^0.22.0"`
	`6`	`+ },`
	`7`	`+ "overrides": {`
	`8`	`+ "prebuild-install": {`
	`9`	`+ "tar-fs": "2.1.3"`
	`10`	`+ }`
`6`	`11`	`}`
`7`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,10 @@`
`66`	`66`	`"optionalDependencies": {`
`67`	`67`	`"tree-sitter-typescript": "^0.23.2",`
`68`	`68`	`"vscode-gulp-watch": "^5.0.3"`
	`69`	`+ },`
	`70`	`+ "overrides": {`
	`71`	`+ "prebuild-install": {`
	`72`	`+ "tar-fs": "2.1.3"`
	`73`	`+ }`
`69`	`74`	`}`
`70`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@`
`47`	`47`	`"node-gyp-build": "4.8.1",`
`48`	`48`	`"kerberos@2.1.1": {`
`49`	`49`	`"node-addon-api": "7.1.0"`
	`50`	`+ },`
	`51`	`+ "prebuild-install": {`
	`52`	`+ "tar-fs": "2.1.3"`
`50`	`53`	`}`
`51`	`54`	`}`
`52`	`55`	`}`