Add trash module

code-asher · code-asher · commit 81f48b8b060a · 2019-02-07T11:05:17.000-06:00
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
   },
   "devDependencies": {
     "@types/node": "^10.12.18",
+    "@types/trash": "^4.3.1",
     "crypto-browserify": "^3.12.0",
     "css-loader": "^2.1.0",
     "file-loader": "^3.0.1",
@@ -47,6 +48,7 @@
   },
   "dependencies": {
     "node-loader": "^0.6.0",
+    "trash": "^4.3.0",
     "webpack-merge": "^4.2.1"
   }
 }
diff --git a/packages/ide/src/fill/electron.ts b/packages/ide/src/fill/electron.ts
@@ -1,12 +1,13 @@
 /// <reference path="../../../../lib/vscode/src/typings/electron.d.ts" />
-import { exec } from "child_process";
 import { EventEmitter } from "events";
 import * as fs from "fs";
-import { promisify } from "util";
 import { logger, field } from "@coder/logger";
-import { escapePath } from "@coder/protocol";
 import { IKey, Dialog as DialogBox } from "./dialog";
 import { clipboard } from "./clipboard";
+import { client } from "./client";
+
+// Use this to get around Webpack inserting our fills.
+declare var _require: typeof require;
 
 // tslint:disable-next-line no-any
 (global as any).getOpenUrls = (): string[] => {
@@ -97,9 +98,11 @@ class Clipboard {
 
 class Shell {
 	public async moveItemToTrash(path: string): Promise<void> {
-		await promisify(exec)(
-			`trash-put --trash-dir ${escapePath("~/.Trash")} ${escapePath(path)}`,
-		);
+		await client.evaluate((path) => {
+			const trash = _require("trash") as typeof import("trash");
+
+			return trash(path);
+		}, path);
 	}
 }
 
diff --git a/packages/protocol/src/node/evaluate.ts b/packages/protocol/src/node/evaluate.ts
@@ -79,11 +79,10 @@ export const evaluate = (connection: SendableConnection, message: NewEvalMessage
 			_Buffer: Buffer,
 			require: typeof __non_webpack_require__ !== "undefined" ? __non_webpack_require__ : require,
 			_require: typeof __non_webpack_require__ !== "undefined" ? __non_webpack_require__ : require,
-			tslib_1: require("tslib"), // TODO: is there a better way to do this?
 			setTimeout,
 		}, {
-				timeout: message.getTimeout() || 15000,
-			});
+			timeout: message.getTimeout() || 15000,
+		});
 		if (eventEmitter) {
 			// Is an active evaluation and should NOT be ended
 			eventEmitter.on("close", () => onDispose());
diff --git a/packages/server/webpack.config.js b/packages/server/webpack.config.js
@@ -48,7 +48,7 @@ module.exports = merge({
 		__dirname: false,
 		setImmediate: false
 	},
-	externals: ["spdlog", "tslib"],
+	externals: ["spdlog", "tslib", "trash"],
 	entry: "./packages/server/src/cli.ts",
 	target: "node",
 	plugins: [
diff --git a/yarn.lock b/yarn.lock
