OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Convert to node-pty-prebuilt

Browse Source
This commit is contained in:
Kyle Carberry
2019-02-27 22:16:31 -06:00
parent 6038744ca3
commit 83b64365ba
7 changed files with 446 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/src/modules.ts
View File

@ -37,7 +37,7 @@ export const setup = (dataDirectory: string): void => {
unpackModule("pty.node");
unpackModule("spdlog.node");
unpackModule("rg");
const nodePtyUtils = require("../../protocol/node_modules/node-pty/lib/utils") as typeof import("../../protocol/node_modules/node-pty/src/utils");
const nodePtyUtils = require("../../protocol/node_modules/node-pty-prebuilt/lib/utils") as typeof import("../../protocol/node_modules/node-pty-prebuilt/src/utils");
// tslint:disable-next-line:no-any
nodePtyUtils.loadNative = (modName: string): any => {
return (typeof __non_webpack_require__ !== "undefined" ? __non_webpack_require__ : require)(path.join(dataDirectory, "dependencies", modName + ".node"));
@ -46,5 +46,5 @@ export const setup = (dataDirectory: string): void => {
// tslint:disable-next-line:no-any
(<any>global).SPDLOG_LOCATION = path.join(dataDirectory, "dependencies", "spdlog.node");
// tslint:disable-next-line:no-unused-expression
require("../../protocol/node_modules/node-pty/lib/index") as typeof import("../../protocol/node_modules/node-pty/src/index");
require("../../protocol/node_modules/node-pty-prebuilt/lib/index") as typeof import("../../protocol/node_modules/node-pty-prebuilt/src/index");
};

5
packages/server/webpack.config.js
View File

@ -22,6 +22,11 @@ module.exports = merge(
__dirname: false,
setImmediate: false
},
resolve: {
alias: {
"node-pty": "node-pty-prebuilt",
},
},
externals: ["tslib", "trash"],
entry: "./packages/server/src/cli.ts",
plugins: [