Skip to content

Commit

Permalink
Update to vscode-jsonrpc 8.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-fleck-at committed Dec 19, 2022
1 parent 01e58c0 commit ed96e07
Show file tree
Hide file tree
Showing 7 changed files with 1,253 additions and 2,466 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Eclipse GLSP VSCode Integration Changelog

## [1.1.0 - Upcoming]()

### Changes

- [protocol] Update to vscode-jsonrpc 8.0.2 [#31](https://github.com/eclipse-glsp/glsp-vscode-integration/pull/31)

## [v1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-client/releases/tag/v1.0.0)

### Changes
Expand Down
15 changes: 7 additions & 8 deletions example/workflow/webview/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,17 @@
"@eclipse-glsp/vscode-integration-webview": "1.1.0-next",
"@vscode/codicons": "^0.0.25",
"circular-dependency-plugin": "^5.2.2",
"css-loader": "^2.1.0",
"css-loader": "^6.7.1",
"ignore-loader": "^0.1.2",
"reflect-metadata": "^0.1.13",
"source-map-loader": "^1.0.2",
"style-loader": "^2.0.0",
"ts-loader": "^8.1.0",
"webpack": "^4.46.0",
"webpack-cli": "^4.9.1",
"yargs": "^12.0.5"
"source-map-loader": "^4.0.1",
"style-loader": "^3.3.1",
"ts-loader": "^9.4.2",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1"
},
"scripts": {
"build": "tsc -b",
"build": "tsc -b && webpack --mode=development",
"clean": "rimraf lib tsconfig.tsbuildinfo ",
"lint": "eslint --ext .ts,.tsx ./src",
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
Expand Down
11 changes: 6 additions & 5 deletions example/workflow/webview/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ const config = {
filename: 'webview.js',
path: outputPath
},
devtool: 'source-map-eval',
devtool: 'eval-source-map',
mode: 'development',

resolve: {
fallback: {
fs: false,
net: false,
},
extensions: ['.ts', '.tsx', '.js']
},
module: {
Expand All @@ -40,10 +44,7 @@ const config = {
}
]
},
node: { fs: 'empty', net: 'empty' },
stats: {
warningsFilter: [/Failed to parse source map/]
}
ignoreWarnings: [/Failed to parse source map/, /Can't resolve .* in '.*ws\/lib'/],
};

module.exports = config;
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@
"watch": "lerna run --parallel watch"
},
"devDependencies": {
"@eclipse-glsp/config": "1.1.0-next.d03ad9f.112",
"@eclipse-glsp/config": "1.1.0-next.e31f2e5.119",
"@eclipse-glsp/config-test": "1.1.0-next.e31f2e5.119",
"@types/node": "16",
"@types/vscode": "^1.54.0",
"@types/node": "14",
"lerna": "^6.1.0",
"mvn-artifact-download": "5.1.0",
"rimraf": "^2.6.3",
"typescript": "^4.9.3"
"mvn-artifact-download": "5.1.0"
},
"resolutions": {
"**/sprotty": "0.13.0-next.1c4343c.328"
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-integration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"dependencies": {
"@eclipse-glsp/protocol": "next",
"vscode-jsonrpc": "^4.0.0"
"vscode-jsonrpc": "^8.0.2"
},
"devDependencies": {
"@types/node": "^12.12.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import {
} from '@eclipse-glsp/protocol';
import * as net from 'net';
import * as vscode from 'vscode';
import { createMessageConnection, SocketMessageReader, SocketMessageWriter } from 'vscode-jsonrpc';
import { createMessageConnection } from 'vscode-jsonrpc';
import { SocketMessageReader, SocketMessageWriter } from 'vscode-jsonrpc/node';
import { GlspVscodeServer } from '../types';

interface SocketGlspVscodeServerOptions {
Expand Down
Loading

0 comments on commit ed96e07

Please sign in to comment.