refactor: Refactored usage of vscode modules (#578)

Author: edgardmessias

package-lock.json

@@ -68,7 +68,6 @@
     "cz-conventional-changelog": "^2.1.0",
     "decache": "^4.5.1",
     "glob": "^7.1.4",
-    "iconv-lite": "^0.4.23",
     "istanbul": "^0.4.5",
     "mocha": "^6.1.4",
     "mocha-junit-reporter": "^1.22.0",

package.json

@@ -1,22 +1,8 @@
-/**
- * Load local first, after load the from VSCode modules
- * == 0 - is svn-scm/out/node_modules
- * == 1 - is svn-scm/node_modules
- * == 2 - is vscode folder
- * >= 3 - parent folders of svn-scm
- */
-import * as vscode from "vscode";
-module.paths.splice(2, 0, `${vscode.env.appRoot}/node_modules.asar`);
-module.paths.splice(2, 0, `${vscode.env.appRoot}/node_modules`); // VSCode < 1.21.0
-
 import * as cp from "child_process";
 import { EventEmitter } from "events";
-import * as iconv from "iconv-lite";
 import isUtf8 = require("is-utf8");
-import * as jschardet from "jschardet";
 import * as proc from "process";
 import { Readable } from "stream";
-import { Uri, workspace } from "vscode";
 import {
   ConstructorPolicy,
   ICpOptions,
@@ -28,6 +14,7 @@ import { parseInfoXml } from "./infoParser";
 import SvnError from "./svnError";
 import { Repository } from "./svnRepository";
 import { dispose, IDisposable, toDisposable } from "./util";
+import { iconv, jschardet } from "./vscodeModules";
 
 export const svnErrorCodes: { [key: string]: string } = {
   AuthorizationFailed: "E170001",
@@ -182,8 +169,8 @@ export class Svn {
         if (!iconv.encodingExists(defaultEncoding)) {
           this.logOutput(
             "svn.default.encoding: Invalid Parameter: '" +
-              defaultEncoding +
-              "'.\n"
+            defaultEncoding +
+            "'.\n"
           );
         } else if (!isUtf8(stdout)) {
           encoding = defaultEncoding;

src/svn.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/// <reference types='node'/>
+
+declare module "iconv-lite" {
+  export function decode(buffer: Buffer, encoding: string): string;
+
+  export function encode(
+    content: string | Buffer,
+    encoding: string,
+    options?: { addBOM?: boolean }
+  ): Buffer;
+
+  export function encodingExists(encoding: string): boolean;
+
+  export function decodeStream(encoding: string): NodeJS.ReadWriteStream;
+
+  export function encodeStream(
+    encoding: string,
+    options?: { addBOM?: boolean }
+  ): NodeJS.ReadWriteStream;
+}

src/types/iconv-lite.d.ts

@@ -0,0 +1,18 @@
+// Only this file is allowed to import VSCode modules
+// tslint:disable: import-blacklist
+
+import * as path from "path";
+import * as vscode from "vscode";
+
+const appRoot = vscode.env.appRoot;
+
+// Try load only in VSCode node_modules, like .vsix files (without dev dependencies)
+module.paths = [
+  path.join(appRoot, "node_modules.asar"),
+  path.join(appRoot, "node_modules"), // VSCode < 1.21.0
+];
+
+import * as iconv from "iconv-lite";
+import * as jschardet from "jschardet";
+
+export { iconv, jschardet };

src/vscodeModules.ts

@@ -35,7 +35,7 @@
         ["Symbol", "Avoid using the `Symbol` type. Did you mean `symbol`?"]
       ]
     },
-    "import-blacklist": [true, "fs"]
+    "import-blacklist": [true, "fs", "iconv-lite", "jschardet"]
   },
   "rulesDirectory": [],
   "linterOptions": {