Skip to content

Commit

Permalink
adds bundling for server and removes node modules from vsix package
Browse files Browse the repository at this point in the history
  • Loading branch information
ArquintL committed Jul 5, 2021
1 parent eae0b98 commit 0698d0a
Show file tree
Hide file tree
Showing 11 changed files with 1,923 additions and 1,854 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
git config --global url."https://github.com/".insteadOf
ssh://[email protected]/
- run: npm ci --prefer-offline
- run: npm ci --cache ../client/.npm --prefer-offline # server uses same cache as the client
working-directory: server

- run: npm ci --cache .npm --prefer-offline
Expand Down
3 changes: 2 additions & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.DS_Store
dist/
server/
node_modules/
out/
npm-debug.log
npm-debug.log
4 changes: 4 additions & 0 deletions client/.vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ src/**
.gitignore
tsconfig.json
vsc-extension-quickstart.md
server/server.key
server/server.pub
node_modules/**
logs/**
2,043 changes: 292 additions & 1,751 deletions client/package-lock.json

Large diffs are not rendered by default.

16 changes: 2 additions & 14 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,17 @@
"automatic deduction"
],
"dependencies": {
"@octokit/rest": "^18.5.3",
"extract-zip": "^2.0.1",
"fs-extra": "^10.0.0",
"glob-to-regexp": "^0.4.1",
"got": "^11.8.2",
"locate-java-home": "git+https://github.com/viperproject/locate-java-home.git",
"node-ipc": "^9.1.4",
"request": "^2.88.2",
"rimraf": "^3.0.2",
"sound-play": "^1.1.0",
"stream-json": "^1.7.1",
"strip-json-comments": "3.0.1",
"sudo-prompt": "8.2.5",
"tree-kill": "^1.2.2",
"unused-filename": "^2.1.0",
"viz.js": "^2.1.2",
"vscode-debugadapter": "^1.34.0",
"vscode-debugprotocol": "^1.34.0",
"vscode-languageclient": "^5.2.1",
"vscode-languageserver": "^5.2.1",
"vscode-test": "^1.3.0",
"vscode-uri": "^3.0.2",
"yargs": "^16.0.3"
"vscode-uri": "^3.0.2"
},
"devDependencies": {
"@types/glob-to-regexp": "^0.4.0",
Expand All @@ -66,7 +54,6 @@
"@types/rimraf": "^3.0.0",
"@types/tmp": "^0.2.0",
"@types/vscode": "^1.43.0",
"@types/yargs": "^15.0.8",
"@typescript-eslint/eslint-plugin": "^4.26.1",
"@typescript-eslint/parser": "^4.26.1",
"eslint": "^7.28.0",
Expand All @@ -77,6 +64,7 @@
"ts-loader": "^9.2.2",
"typescript": "^4.2.4",
"vsce": "^1.88.0",
"vscode-test": "^1.3.0",
"webpack": "^5.38.1",
"webpack-cli": "^4.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion client/src/ExtensionState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export class State {

public static startLanguageServer(context: vscode.ExtensionContext, fileSystemWatcher: vscode.FileSystemWatcher, brk: boolean): Promise<void> {
// The server is implemented in node
let serverModule = State.context.asAbsolutePath(path.join('server', 'server.js'));
const serverModule = State.context.asAbsolutePath(path.join('server', 'index.js'));

if (!fs.existsSync(serverModule)) {
Log.log(serverModule + " does not exist. Reinstall the Extension", LogLevel.Debug);
Expand Down
Loading

0 comments on commit 0698d0a

Please sign in to comment.