Skip to content

Commit dc63dc4

Browse files
committed
GLSP-1320: Update dev config
- Updates to latest version of @eclipse-glsp/dev - Add generate:index utility script - Regenerate index files - Fix codeActionsOnSave in vscode settings - Refactor upgrade:next script - Reformat code base with prettier - Fix copyright headers (by running a full check with glsp checkHeaders . -t full) - Add resolutions for snabbdom to fix eclipse-sprotty/sprotty#429 Can be removed once eclipse-glsp/glsp#1253 is resolved Part of eclipse-glsp/glsp#1320 Fixes eclipse-glsp/glsp#1286
1 parent 43b1470 commit dc63dc4

File tree

47 files changed

+2055
-1269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2055
-1269
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ to learn how to report vulnerabilities.
2525

2626
<!-- Please check, when if it applies to your change. -->
2727

28-
- [ ] This PR should be mentioned in the changelog
29-
- [ ] This PR introduces a breaking change (if yes, provide more details below for the changelog and the migration guide)
28+
- [ ] This PR should be mentioned in the changelog
29+
- [ ] This PR introduces a breaking change (if yes, provide more details below for the changelog and the migration guide)

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
{
77
"editor.formatOnSave": true,
88
"editor.codeActionsOnSave": {
9-
"source.fixAll.eslint": "explicit",
10-
"source.organizeImports": "explicit"
9+
"source.fixAll.eslint": "always",
10+
"source.organizeImports": "always"
1111
},
1212
"eslint.validate": ["javascript", "typescript"],
1313
"search.exclude": {

examples/workflow-glsp/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@
3030
"files": [
3131
"lib",
3232
"src",
33-
"build",
34-
"css",
35-
"scripts"
33+
"css"
3634
],
3735
"scripts": {
3836
"build": "tsc -b",
3937
"clean": "rimraf *.tsbuildinfo lib",
38+
"generate:index": "glsp generateIndex src -f",
4039
"lint": "eslint --ext .ts,.tsx ./src",
4140
"watch": "tsc -w"
4241
},
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/********************************************************************************
2+
* Copyright (c) 2024 EclipseSource and others.
3+
*
4+
* This program and the accompanying materials are made available under the
5+
* terms of the Eclipse Public License v. 2.0 which is available at
6+
* http://www.eclipse.org/legal/epl-2.0.
7+
*
8+
* This Source Code may also be made available under the following Secondary
9+
* Licenses when the conditions for such availability set forth in the Eclipse
10+
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
11+
* with the GNU Classpath Exception which is available at
12+
* https://www.gnu.org/software/classpath/license.html.
13+
*
14+
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15+
********************************************************************************/
16+
export * from './di.config';
17+
export * from './direct-task-editor';

examples/workflow-glsp/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************************
2-
* Copyright (c) 2019-2023 EclipseSource and others.
2+
* Copyright (c) 2019-2024 EclipseSource and others.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
1313
*
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
********************************************************************************/
16-
export * from './direct-task-editing/direct-task-editor';
16+
export * from './direct-task-editing';
1717
export * from './model';
1818
export * from './workflow-diagram-module';
1919
export * from './workflow-views';

examples/workflow-standalone/css/diagram.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ polygon.sprotty-node {
8282

8383
.projection-scroll-bar {
8484
background-color: #555555;
85-
}
85+
}

package.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,28 @@
1414
"check:pr": "yarn all && yarn check:headers",
1515
"clean": "lerna run clean && rimraf coverage .nyc_output",
1616
"compile": "tsc -b",
17+
"generate:index": "lerna run generate:index && yarn lint:fix",
1718
"lint": "eslint --ext .ts,.tsx .",
18-
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
19+
"lint:ci": "yarn lint --output-file eslint_report.json --format json",
20+
"lint:fix": " yarn lint --fix",
1921
"prepare": "yarn build",
2022
"publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-push",
2123
"publish:next": "lerna publish preminor --exact --canary --preid next --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes",
2224
"publish:prepare": "lerna version --ignore-scripts --yes --no-push",
2325
"standalone": "yarn --cwd ./examples/workflow-standalone",
2426
"start:exampleServer": "yarn standalone start:exampleServer",
25-
"test": "lerna run test",
26-
"test:ci": "lerna run test:ci",
27+
"test": "lerna run test --no-bail",
28+
"test:ci": "lerna run test:ci --no-bail",
2729
"test:coverage": "lerna run test:coverage",
2830
"test:coverage:ci": "yarn glsp coverageReport .",
29-
"upgrade:next": "yarn upgrade -p \"@eclipse-glsp.*|sprotty.*\" --next ",
31+
"upgrade:next": "glsp updateNext",
3032
"watch": "concurrently --kill-others -n tsc,standalone -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s standalone watch:bundle\""
3133
},
34+
"resolutions": {
35+
"snabbdom": "~3.5.1"
36+
},
3237
"devDependencies": {
33-
"@eclipse-glsp/dev": "~2.0.0",
38+
"@eclipse-glsp/dev": "next",
3439
"@types/lodash": "4.14.191",
3540
"@types/node": "16.x",
3641
"concurrently": "^8.2.2",

packages/client/css/command-palette.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
.command-palette {
1818
transition: opacity 0.3s linear;
19-
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
19+
box-shadow:
20+
0 4px 8px 0 rgba(0, 0, 0, 0.2),
21+
0 6px 20px 0 rgba(0, 0, 0, 0.19);
2022
}
2123

2224
.command-palette-suggestions {
@@ -25,7 +27,9 @@
2527
overflow: auto;
2628
box-sizing: border-box;
2729
border: 1px solid rgba(60, 60, 60, 0.6);
28-
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
30+
box-shadow:
31+
0 4px 8px 0 rgba(0, 0, 0, 0.2),
32+
0 6px 20px 0 rgba(0, 0, 0, 0.19);
2933
}
3034

3135
.command-palette-suggestions .icon {

packages/client/css/key-shortcut.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
z-index: 9999;
3131
width: 400px;
3232
max-height: 512px;
33-
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
33+
box-shadow:
34+
0 4px 8px 0 rgba(0, 0, 0, 0.2),
35+
0 6px 20px 0 rgba(0, 0, 0, 0.19);
3436
}
3537

3638
.keyboard-shortcuts-menu h3 {
@@ -45,7 +47,9 @@
4547
background-color: #e4e1e1;
4648
border: 1px solid #ccc;
4749
border-radius: 3px;
48-
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(255, 255, 255, 0.5);
50+
box-shadow:
51+
0 1px 0 rgba(0, 0, 0, 0.2),
52+
inset 0 0 0 1px rgba(255, 255, 255, 0.5);
4953
color: #333;
5054
display: inline-block;
5155
font-size: 0.85em;

packages/client/css/keyboard-tool-palette.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
color: black;
4040
text-align: center;
4141

42-
font: bold 0.8rem Arial, sans-serif;
42+
font:
43+
bold 0.8rem Arial,
44+
sans-serif;
4345
line-height: 0.5rem;
4446
}
4547

0 commit comments

Comments
 (0)