Skip to content

Commit f692ea4

Browse files
committed
GLSP-1026 Fix launch configs &scripts (#50)
Adapt launch configs and start scripts to use the new bundled workflow server package
1 parent c2655c8 commit f692ea4

File tree

5 files changed

+16
-30
lines changed

5 files changed

+16
-30
lines changed

.vscode/launch.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
"type": "node",
6666
"request": "launch",
6767
"name": "Debug Workflow Example Server",
68-
"program": "${workspaceFolder}/examples/workflow-server/bundle/wf-glsp-server-node.js",
68+
"program": "${workspaceFolder}/examples/workflow-server-bundled/wf-glsp-server-node.js",
6969
"args": ["--port", "5007"],
7070
"env": {
7171
"NODE_ENV": "development"
7272
},
7373
"sourceMaps": true,
7474
"outFiles": [
75-
"${workspaceRoot}/examples/workflow-server/bundle/**/*.js",
75+
"${workspaceRoot}/examples/workflow-server-bundled/*.js",
7676
"${workspaceRoot}/node_modules/@eclipse-glsp/*/lib/**/*.js",
7777
"${workspaceRoot}/examples/workflow-server/*/lib/**/*.js",
7878
"${workspaceRoot}/packages/**/*/lib/**/*.js"
@@ -88,14 +88,14 @@
8888
"type": "node",
8989
"request": "launch",
9090
"name": "Debug Workflow Example Server (Websocket)",
91-
"program": "${workspaceFolder}/examples/workflow-server/bundle/wf-glsp-server-node.js",
91+
"program": "${workspaceFolder}/examples/workflow-server-bundled/wf-glsp-server-node.js",
9292
"args": ["--webSocket", "--port", "8081"],
9393
"env": {
9494
"NODE_ENV": "development"
9595
},
9696
"sourceMaps": true,
9797
"outFiles": [
98-
"${workspaceRoot}/examples/workflow-server/bundle/**/*.js",
98+
"${workspaceRoot}/examples/workflow-server-bundled/*.js",
9999
"${workspaceRoot}/node_modules/@eclipse-glsp/*/lib/**/*.js",
100100
"${workspaceRoot}/examples/workflow-server/*/lib/**/*.js",
101101
"${workspaceRoot}/packages/**/*/lib/**/*.js"

.vscode/settings.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
"source.fixAll.eslint": true,
1010
"source.organizeImports": true
1111
},
12-
"eslint.validate": ["javascript", "typescript"],
12+
"eslint.validate": [
13+
"javascript",
14+
"typescript"
15+
],
1316
"prettier.prettierPath": "node_modules/prettier",
1417
"search.exclude": {
1518
"**/node_modules": true,
@@ -50,4 +53,4 @@
5053
"ul_multi": 3
5154
}
5255
}
53-
}
56+
}

examples/workflow-server-bundled/package.json

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,12 @@
4141
"wf-glsp-server-node.js.map"
4242
],
4343
"scripts": {
44-
"build": "tsc -b && yarn bundle",
45-
"bundle": "webpack",
46-
"bundle:browser": "webpack --env target=webworker ",
47-
"clean": "rimraf lib tsconfig.tsbuildinfo bundle",
48-
"lint": "eslint --ext .ts,.tsx ./src",
49-
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
50-
"prepare": "yarn clean && yarn build",
51-
"start": "node --enable-source-maps bundle/wf-glsp-server-node.js --port 5007",
52-
"start:websocket": "node --enable-source-maps bundle/wf-glsp-server-node.js -w --port 8081",
44+
"clean": "rimraf ./*.js./*.js.map",
45+
"prepare": "yarn clean",
46+
"start": "node --enable-source-maps ./wf-glsp-server-node.js --port 5007",
47+
"start:websocket": "node --enable-source-maps ./wf-glsp-server-node.js -w --port 8081",
5348
"watch": "tsc -w"
5449
},
55-
"dependencies": {
56-
"@eclipse-glsp/layout-elk": "1.1.0-next",
57-
"@eclipse-glsp/server": "1.1.0-next",
58-
"inversify": "^6.0.1"
59-
},
60-
"devDependencies": {
61-
"source-map-loader": "^4.0.1",
62-
"webpack": "^5.75.0",
63-
"webpack-cli": "^5.0.1"
64-
},
6550
"publishConfig": {
6651
"access": "public"
6752
}

examples/workflow-server/package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
"lint": "eslint --ext .ts,.tsx ./src",
5454
"lint:ci": "yarn lint -o eslint.xml -f checkstyle",
5555
"prepare": "yarn clean && yarn build",
56-
"start": "node --enable-source-maps bundle/wf-glsp-server-node.js --port 5007",
57-
"start:websocket": "node --enable-source-maps bundle/wf-glsp-server-node.js -w --port 8081",
5856
"watch": "tsc -w"
5957
},
6058
"dependencies": {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"workspaces": [
66
"packages/*",
7-
"examples/workflow-server"
7+
"examples/*"
88
],
99
"scripts": {
1010
"all": "yarn install && yarn lint && yarn test",
@@ -19,8 +19,8 @@
1919
"publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --no-push",
2020
"publish:next": "SHA=$(git rev-parse --short HEAD) && lerna publish preminor --exact --canary --preid next.${SHA} --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes --no-verify-access",
2121
"publish:prepare": "lerna version --ignore-scripts --yes --no-push",
22-
"start": "yarn --cwd examples/workflow-server start",
23-
"start:websocket": "yarn --cwd examples/workflow-server start:websocket",
22+
"start": "yarn --cwd examples/workflow-server-bundled start",
23+
"start:websocket": "yarn --cwd examples/workflow-server-bundled start:websocket",
2424
"test": "lerna run test",
2525
"test:ci": "lerna run test:ci",
2626
"test:coverage": "lerna run test:coverage",

0 commit comments

Comments
 (0)