fix: VSCode now uses iconv-lite-umd (#975)

Author: JohnstonCode

package.json

@@ -74,6 +74,7 @@
         "eslint-config-prettier": "^6.11.0",
         "eslint-plugin-prettier": "^3.1.4",
         "glob": "^7.1.4",
+        "iconv-lite-umd": "0.6.3",
         "milligram": "^1.4.1",
         "mocha": "^8.0.1",
         "node-sass": "^4.14.1",

src/temp_svn_fs.ts

@@ -203,7 +203,7 @@ class TempSvnFs implements FileSystemProvider, Disposable {
     let contentBuffer: Buffer;
 
     if (encoding) {
-      contentBuffer = iconv.encode(content, encoding);
+      contentBuffer = Buffer.from(iconv.encode(content, encoding));
     } else {
       contentBuffer = Buffer.from(content);
     }

src/types/iconv-lite.d.ts

@@ -6,20 +6,35 @@
 /// <reference types='node'/>
 
 declare module "iconv-lite" {
-  export function decode(buffer: Buffer, encoding: string): string;
+  export function decode(buffer: Buffer | Uint8Array, encoding: string): string;
 
   export function encode(
     content: string | Buffer,
     encoding: string,
     options?: { addBOM?: boolean }
-  ): Buffer;
+  ): Buffer | Uint8Array;
 
   export function encodingExists(encoding: string): boolean;
 
-  export function decodeStream(encoding: string): NodeJS.ReadWriteStream;
+  // Stream API
+  export function decodeStream(
+    encoding: string,
+    options?: Options
+  ): NodeJS.ReadWriteStream;
 
   export function encodeStream(
     encoding: string,
-    options?: { addBOM?: boolean }
+    options?: Options
   ): NodeJS.ReadWriteStream;
+
+  // Low-level stream APIs
+  export function getEncoder(
+    encoding: string,
+    options?: Options
+  ): EncoderStream;
+
+  export function getDecoder(
+    encoding: string,
+    options?: Options
+  ): DecoderStream;
 }

src/vscodeModules.ts

@@ -24,9 +24,31 @@ function loadVSCodeModule(id: string) {
   }
 }
 
-export const iconv = loadVSCodeModule(
-  "iconv-lite"
-) as typeof import("iconv-lite");
+function getNodeModule(moduleName: string) {
+  try {
+    return require(`${appRoot}/node_modules.asar/${moduleName}`);
+  } catch (error) {
+    //Ignore
+  }
+
+  const baseDir = path.dirname(process.execPath);
+
+  try {
+    module.paths.unshift(`${baseDir}/node_modules`);
+    return require(moduleName);
+  } catch (error) {}
+
+  return undefined;
+}
+
+let iconv_lite = getNodeModule(
+  "iconv-lite-umd"
+) as typeof import("iconv-lite-umd");
+if (!iconv_lite) {
+  iconv_lite = loadVSCodeModule("iconv-lite") as typeof import("iconv-lite");
+}
+
+export const iconv = iconv_lite;
 export const jschardet = loadVSCodeModule(
   "jschardet"
 ) as typeof import("jschardet");

yarn.lock

@@ -2523,7 +2523,12 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@~0.4.13:
+[email protected]:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.3.tgz#61307cab8ac29939992d0724d3ab8799467f0e97"
+  integrity sha512-fQ/8XE8reiCZ6t+SX4tX6/tQdV4tThJZv5qtMe5Sk+IWsExz0S2Zd+GiBS5IEPgDxnsmiJSpH67+qzN3FT4lKw==
+
+iconv-lite@^0.4.24, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==