From a38945c1787330186603e8ac2b3f286f8c1d58e4 Mon Sep 17 00:00:00 2001 From: Dirk Baeumer Date: Thu, 5 Apr 2018 12:40:43 +0200 Subject: [PATCH] Fixes #331: terminateProcess.sh is not shipped in dist package --- README.md | 3 ++- client/package-lock.json | 58 ++++++++++++++++++++++++++++++++++++++++ client/package.json | 3 ++- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0d8168d62..a5e8dc653 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,12 @@ language servers for [VSCode](https://code.visualstudio.com/). ### 4.0.2 Client * [Initialisation exceptions swallowed](https://github.com/Microsoft/vscode-languageserver-node/issues/330) +* [Errors from rename still not shown in VSCode](https://github.com/Microsoft/vscode-languageserver-node/issues/329) +* [terminateProcess.sh is not shipped in dist package](https://github.com/Microsoft/vscode-languageserver-node/issues/331) ### 4.0.1 Client * removed unnecessary console log statement. -* [Errors from rename still not shown in VSCode](https://github.com/Microsoft/vscode-languageserver-node/issues/329) ### 4.0.0 Server and Client diff --git a/client/package-lock.json b/client/package-lock.json index 10df13028..21f40f904 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -421,6 +421,12 @@ "once": "1.4.0" } }, + "es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=", + "dev": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -1180,6 +1186,12 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, + "interpret": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", + "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "dev": true + }, "is": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", @@ -1789,6 +1801,12 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -1920,6 +1938,15 @@ "util-deprecate": "1.0.2" } }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "1.6.0" + } + }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", @@ -2112,6 +2139,15 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resolve": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.6.0.tgz", + "integrity": "sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", @@ -2133,6 +2169,28 @@ "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=", "dev": true }, + "shelljs": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", + "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", + "dev": true, + "requires": { + "glob": "7.1.2", + "interpret": "1.1.0", + "rechoir": "0.6.2" + } + }, + "shx": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/shx/-/shx-0.2.2.tgz", + "integrity": "sha1-CjBNAgsO3xMGrYFXDoDwNG31ijk=", + "dev": true, + "requires": { + "es6-object-assign": "1.1.0", + "minimist": "1.2.0", + "shelljs": "0.7.8" + } + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", diff --git a/client/package.json b/client/package.json index 97fcea00e..b49a8f321 100644 --- a/client/package.json +++ b/client/package.json @@ -17,6 +17,7 @@ "main": "./lib/main.js", "typings": "./lib/main", "devDependencies": { + "shx": "^0.2.2", "vscode": "^1.1.5" }, "dependencies": { @@ -25,7 +26,7 @@ "scripts": { "prepublish": "npm run update-vscode && npm run compile && npm test", "postpublish": "node ../build/npm/post-publish.js", - "compile": "node ../build/bin/tsc -p ./tsconfig.json", + "compile": "node ../build/bin/tsc -p ./tsconfig.json && shx cp src/utils/terminateProcess.sh lib/utils/terminateProcess.sh", "watch": "node ../build/bin/tsc -w -p ./tsconfig.json", "update-vscode": "node ./node_modules/vscode/bin/install", "test": "cd lib && node ../node_modules/vscode/bin/test"