Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not pass vsce command path #42

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
3 changes: 0 additions & 3 deletions client/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions client/src/services/generatorService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -36,7 +36,6 @@ export class GeneratorService implements IGeneratorService {
project_name: projectName,
skip_keywords: editableMode,
version: projectVersion,
vsce: VSCE_COMMAND_PATH,
vsix: 1,
};

Expand Down