From dd859fb4169d1b2d4c6069418e3c285af4e03f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20L=C3=BCdtke?= Date: Wed, 12 Aug 2020 22:38:15 +0200 Subject: [PATCH] do not pass vsce command path --- client/package.json | 4 ++-- client/src/constants.ts | 3 --- client/src/services/generatorService.ts | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/client/package.json b/client/package.json index 5d6f770..aeae7bb 100644 --- a/client/package.json +++ b/client/package.json @@ -201,8 +201,8 @@ } }, "scripts": { - "postinstall": "node ./node_modules/vscode/bin/install && npm --prefix libs install vsce", - "vscode:prepublish": "webpack --mode production && chmod +x ./bin/copy-wheels.sh && sh ./bin/copy-wheels.sh && npm --prefix libs install vsce", + "postinstall": "node ./node_modules/vscode/bin/install", + "vscode:prepublish": "webpack --mode production && chmod +x ./bin/copy-wheels.sh && sh ./bin/copy-wheels.sh", "webpack": "webpack --mode development", "webpack-dev": "webpack --mode development --watch" }, diff --git a/client/src/constants.ts b/client/src/constants.ts index d730937..2030570 100644 --- a/client/src/constants.ts +++ b/client/src/constants.ts @@ -18,9 +18,6 @@ export const LS_VENV_PATH = join(EXTENSION_PATH, LS_VENV_NAME); export const LS_WHEELS_DIR = "wheels"; export const TEXTX_LS_CORE = "textx_ls_core"; export const TEXTX_LS_SERVER = "textx_ls_server"; -export const VSCE_COMMAND_PATH = IS_WIN ? - join(EXTENSION_PATH, "libs", "vsce") : - join(EXTENSION_PATH, "libs", "node_modules", "vsce", "out", "vsce"); // Commands // TextX-LS diff --git a/client/src/services/generatorService.ts b/client/src/services/generatorService.ts index 58b97bc..2f67bcd 100644 --- a/client/src/services/generatorService.ts +++ b/client/src/services/generatorService.ts @@ -4,7 +4,7 @@ import { commands, window } from "vscode"; import { IExtensionService, ISyntaxHighlightService } from "."; import { CMD_GENERATE_EXTENSION, CMD_GENERATE_SYNTAXES, CMD_GENERATOR_LIST, EXTENSION_GENERATOR_TARGET, - EXTENSION_SYNTAX_HIGHLIGHT_TARGET, VS_CMD_WINDOW_RELOAD, VSCE_COMMAND_PATH, + EXTENSION_SYNTAX_HIGHLIGHT_TARGET, VS_CMD_WINDOW_RELOAD, } from "../constants"; import { ITextXExtensionInstall, ITextXGenerator } from "../interfaces"; import TYPES from "../types"; @@ -36,7 +36,6 @@ export class GeneratorService implements IGeneratorService { project_name: projectName, skip_keywords: editableMode, version: projectVersion, - vsce: VSCE_COMMAND_PATH, vsix: 1, };