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

Improve styling and simplify workflow example #49

Merged
merged 1 commit into from
Mar 15, 2022
Merged
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
1 change: 1 addition & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ lib

*.log
*.ttf
tsconfig.tsbuildinfo
25 changes: 0 additions & 25 deletions client/configs/base.eslintrc.json

This file was deleted.

22 changes: 0 additions & 22 deletions client/configs/base.tsconfig.json

This file was deleted.

103 changes: 0 additions & 103 deletions client/configs/errors.eslintrc.json

This file was deleted.

50 changes: 0 additions & 50 deletions client/configs/warnings.eslintrc.json

This file was deleted.

5 changes: 2 additions & 3 deletions client/examples/workflow-webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.9.0",
"description": "GLSP-based webapp for the Workflow example",
"dependencies": {
"@eclipse-glsp-examples/workflow-glsp": "0.9.0",
"@eclipse-glsp-examples/workflow-glsp": "next",
"@eclipse-glsp/ide": "0.9.0"
},
"devDependencies": {
Expand All @@ -16,13 +16,12 @@
"source-map-loader": "^1.0.2",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.6",
"typescript": "^3.9.2",
"webpack": "^4.46.0",
"webpack-cli": "^4.9.1"
},
"scripts": {
"prepare": "yarn clean && yarn build && yarn lint",
"clean": "rimraf lib app/bundle.js app/bundle.js.map",
"clean": "rimraf lib tsconfig.tsbuildinfo app/bundle.js app/bundle.js.map",
"build": "tsc && webpack",
"lint": "eslint -c ./.eslintrc.js --ext .ts ./src",
"watch": "tsc -w"
Expand Down
13 changes: 8 additions & 5 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
{
"private": true,
"name": "parent",
"version": "0.8.0",
"version": "0.9.0",
"engines": {
"yarn": ">=1.7.0 <2.x.x"
},
"devDependencies": {
"@eclipse-glsp/config": "0.9.0",
"@eclipse-glsp/config": "next",
"copyfiles": "^2.4.1",
"lerna": "^4.0.0",
"rimraf": "^2.6.1",
"typescript": "^3.9.2"
"@types/node": "12.x",
"rimraf": "^3.0.2",
"typescript": "^4.4.5",
"reflect-metadata": "^0.1.13"
},
"scripts": {
"prepare": "lerna run prepare && yarn copyClient",
"install:only": "yarn install --ignore-scripts",
"watch": "lerna run --parallel watch",
"build": "yarn install --ignore-scripts && lerna run build",
"build": "lerna run build",
"lint": "lerna run lint --",
"copyClient": "copyfiles -f ./examples/workflow-webapp/app/* ../server/example/org.eclipse.glsp.ide.workflow.editor/diagram",
"publish:prepare": "lerna version minor --exact --ignore-scripts --yes --no-push",
Expand Down
14 changes: 5 additions & 9 deletions client/packages/ide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"bugs": "https://github.com/eclipse-glsp/glsp/issues",
"contributors": [
{
"name": "Nina Doschek",
"email": "ndoschek@eclipsesource.com",
"url": "https://www.eclipsesource.com"
"name": "Eclipse GLSP Project",
"email": "glsp-dev@eclipse.org",
"url": "https://projects.eclipse.org/projects/ecd.glsp"
}
],
"files": [
Expand All @@ -28,15 +28,11 @@
"css"
],
"dependencies": {
"@eclipse-glsp/client": "0.9.0"
},
"devDependencies": {
"rimraf": "^2.6.1",
"typescript": "^3.9.2"
"@eclipse-glsp/client": "next"
},
"scripts": {
"prepare": "yarn clean && yarn build && yarn lint",
"clean": "rimraf lib",
"clean": "rimraf lib tsconfig.tsbuildinfo ",
"build": "tsc",
"lint": "eslint -c ./.eslintrc.js --ext .ts ./src",
"watch": "tsc -w"
Expand Down
6 changes: 3 additions & 3 deletions client/packages/ide/src/base/eclipse-glsp-diagram-server.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************************
* Copyright (c) 2019-2021 EclipseSource and others.
* Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
Expand All @@ -22,7 +22,7 @@ export class EclipseGLSPDiagramServer extends GLSPDiagramServer {
return ServerStatusAction.KIND === action.kind && 'severity' in action && 'message' in action;
}

handleLocally(action: Action): boolean {
override handleLocally(action: Action): boolean {
if (this.isServerStatusAction(action)) {
return this.handleServerStatusAction(action);
}
Expand All @@ -34,7 +34,7 @@ export class EclipseGLSPDiagramServer extends GLSPDiagramServer {
return true;
}

protected handleServerMessageAction(_action: ServerMessageAction): boolean {
protected override handleServerMessageAction(_action: ServerMessageAction): boolean {
/* send to server */
return true;
}
Expand Down
Loading