chore: Align sharedWebContentExtractorService.ts with upstream - typescript version was updated

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

.rebase/CHANGELOG.md

@@ -17,13 +17,11 @@ https://github.com/che-incubator/che-code/pull/545
 #### @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/540 \
 https://github.com/RomanNikitenko/che-code/commit/724c0a97f73e070f80818091a8d19b7ed186b394 \
-https://github.com/RomanNikitenko/che-code/commit/1e51134551f4c876c4d6de388dcab90180d4607d \
-https://github.com/RomanNikitenko/che-code/commit/7ea82ac755a21d2cb021736a07d8216fe294beff
+https://github.com/RomanNikitenko/che-code/commit/1e51134551f4c876c4d6de388dcab90180d4607d
 
 - code/package.json
 - code/remote/package.json
 - code/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-- code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts
 ---
 
 #### @RomanNikitenko

.rebase/replace/code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts.json

@@ -28,7 +28,7 @@ export class SharedWebContentExtractorService implements ISharedWebContentExtrac
 				return undefined;
 			}
 
-			const content = VSBuffer.wrap(new Uint8Array(await response.arrayBuffer()));
+			const content = VSBuffer.wrap(await response.bytes());
 			return content;
 		} catch (err) {
 			console.log(err);

code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts

@@ -486,8 +486,6 @@ resolve_conflicts() {
       apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/platform/extensionManagement/node/extensionManagementService.ts" ]]; then
       apply_changes "$conflictingFile"
-    elif [[ "$conflictingFile" == "code/src/vs/platform/webContentExtractor/node/sharedWebContentExtractorService.ts" ]]; then
-      apply_changes "$conflictingFile"
     elif [[ "$conflictingFile" == "code/src/vs/workbench/contrib/chat/browser/actions/chatActions.ts" ]]; then
       apply_multi_line_replace "$conflictingFile"
     else