Fix trash

Author: code-asher

package.json

@@ -51,7 +51,6 @@
   },
   "dependencies": {
     "node-loader": "^0.6.0",
-    "trash": "^4.3.0",
     "webpack-merge": "^4.2.1"
   }
 }

packages/ide/src/fill/electron.ts

@@ -180,10 +180,8 @@ class Clipboard {
 
 class Shell {
 	public async moveItemToTrash(path: string): Promise<void> {
-		await client.evaluate((_helper, path) => {
-			const trash = __non_webpack_require__("trash") as typeof import("trash");
-
-			return trash(path);
+		await client.evaluate((helper, path) => {
+			return helper.modules.trash(path);
 		}, path);
 	}
 }

packages/protocol/package.json

@@ -6,6 +6,7 @@
         "google-protobuf": "^3.6.1",
         "node-pty-prebuilt": "^0.7.6",
         "spdlog": "^0.7.2",
+        "trash": "^4.3.0",
         "tslib": "^1.9.3",
         "ws": "^6.1.2"
     },

packages/protocol/src/common/helpers.ts

@@ -1,4 +1,5 @@
 /// <reference path="../../../../lib/vscode/src/typings/spdlog.d.ts" />
+/// <reference path="../../node_modules/node-pty-prebuilt/typings/node-pty.d.ts" />
 import { ChildProcess, SpawnOptions, ForkOptions } from "child_process";
 import { EventEmitter } from "events";
 import { Socket } from "net";
@@ -20,22 +21,25 @@ interface ActiveEvalEmitter {
 	on(event: string, cb: (...args: any[]) => void): void;
 }
 
+/**
+ * For any non-external modules that are not built in, we need to require and
+ * access them server-side. A require on the client-side won't work since that
+ * code won't exist on the server (and bloat the client with an unused import),
+ * and we can't manually import on the server-side and then call
+ * `__webpack_require__` on the client-side because Webpack stores modules by
+ * their paths which would require us to hard-code the path.
+ */
+export interface Modules {
+	pty: typeof import("node-pty");
+	spdlog: typeof import("spdlog");
+	trash: typeof import("trash");
+}
+
 /**
  * Helper class for server-side evaluations.
  */
 export class EvalHelper {
-	// For any non-external modules that are not built in, we need to require and
-	// access them here. A require on the client-side won't work since that code
-	// won't exist on the server (and bloat the client with an unused import), and
-	// we can't manually import on the server-side and then call
-	// `__webpack_require__` on the client-side because Webpack stores modules by
-	// their paths which would require us to hard-code the path. These aren't
-	// required immediately so we have a chance to unpack the .node files and set
-	// their locations.
-	public modules = {
-		spdlog: require("spdlog") as typeof import("spdlog"),
-		pty: require("node-pty-prebuilt") as typeof import("node-pty"),
-	};
+	public constructor(public modules: Modules) {}
 
 	/**
 	 * Some spawn code tries to preserve the env (the debug adapter for instance)
@@ -113,11 +117,11 @@ export class ActiveEvalHelper implements ActiveEvalEmitter {
  * Helper class for server-side active evaluations.
  */
 export class ServerActiveEvalHelper extends ActiveEvalHelper implements EvalHelper {
-	private readonly evalHelper = new EvalHelper();
-	public modules = this.evalHelper.modules;
+	private readonly evalHelper: EvalHelper;
 
-	public constructor(emitter: ActiveEvalEmitter, public readonly fork: ForkProvider) {
+	public constructor(public modules: Modules, emitter: ActiveEvalEmitter, public readonly fork: ForkProvider) {
 		super(emitter);
+		this.evalHelper = new EvalHelper(modules);
 	}
 
 	public preserveEnv(options: SpawnOptions | ForkOptions): void {
@@ -208,7 +212,7 @@ export class ServerActiveEvalHelper extends ActiveEvalHelper implements EvalHelp
 	}
 
 	public createUnique(id: number | "stdout" | "stderr" | "stdin"): ServerActiveEvalHelper {
-		return new ServerActiveEvalHelper(this.createUniqueEmitter(id), this.fork);
+		return new ServerActiveEvalHelper(this.modules, this.createUniqueEmitter(id), this.fork);
 	}
 }
 

packages/protocol/src/node/evaluate.ts

@@ -4,7 +4,7 @@ import * as vm from "vm";
 import { logger, field } from "@coder/logger";
 import { NewEvalMessage, EvalFailedMessage, EvalDoneMessage, ServerMessage, EvalEventMessage } from "../proto";
 import { SendableConnection } from "../common/connection";
-import { ServerActiveEvalHelper, EvalHelper, ForkProvider } from "../common/helpers";
+import { ServerActiveEvalHelper, EvalHelper, ForkProvider, Modules } from "../common/helpers";
 import { stringify, parse } from "../common/util";
 
 export interface ActiveEvaluation {
@@ -57,9 +57,15 @@ export const evaluate = (connection: SendableConnection, message: NewEvalMessage
 		onDispose();
 	};
 
+	const modules: Modules = {
+		spdlog: require("spdlog"),
+		pty: require("node-pty-prebuilt"),
+		trash: require("trash"),
+	};
+
 	let eventEmitter = message.getActive() ? new EventEmitter(): undefined;
 	const sandbox = {
-		helper: eventEmitter ? new ServerActiveEvalHelper({
+		helper: eventEmitter ? new ServerActiveEvalHelper(modules, {
 			removeAllListeners: (event?: string): void => {
 				eventEmitter!.removeAllListeners(event);
 			},
@@ -89,7 +95,7 @@ export const evaluate = (connection: SendableConnection, message: NewEvalMessage
 				connection.send(serverMsg.serializeBinary());
 			},
 			// tslint:enable no-any
-		}, fork || cpFork) : new EvalHelper(),
+		}, fork || cpFork) : new EvalHelper(modules),
 		_Buffer: Buffer,
 		// When the client is ran from Webpack, it will replace
 		// __non_webpack_require__ with require, which we then need to provide to