Skip to content

Commit 756c30f

Browse files
authored
Merge pull request #390 from TypeFox/align-tsconfigs
Align all tsconfigs and vscode-ws-jsonrpc provides esm/cjs
2 parents 73c4f8e + 31bd60b commit 756c30f

24 files changed

Lines changed: 393 additions & 258 deletions

.eslintrc.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,9 @@ module.exports = {
4545
'dot-notation': 'off',
4646
'@typescript-eslint/dot-notation': ['error']
4747
},
48-
ignorePatterns: ['.eslintrc.js', './packages/examples/browser-lsp/src/serverWorker.ts']
48+
ignorePatterns: [
49+
'.eslintrc.js',
50+
'vite.config.ts',
51+
'packages/examples/browser-lsp/src/serverWorker.ts'
52+
]
4953
};

.vscode/launch.json

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,22 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8-
"type": "node",
9-
"request": "launch",
10-
"name": "Launch Sample Server",
11-
"program": "${workspaceRoot}/packages/examples/node/lib/server.js",
12-
"sourceMaps": true,
13-
"outFiles": [
14-
"${workspaceRoot}/packages/examples/node/lib/**/*.js"
15-
]
8+
"name": "Launch Sample Server",
9+
"type": "node",
10+
"request": "launch",
11+
"args": ["${workspaceRoot}/packages/examples/node/src/server.ts"],
12+
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
13+
"cwd": "${workspaceRoot}/packages/examples/node",
14+
"internalConsoleOptions": "openOnSessionStart"
1615
},
1716
{
18-
"type": "node",
19-
"request": "launch",
20-
"name": "Launch Sample Server (external)",
21-
"program": "${workspaceRoot}/packages/examples/node/lib/server.js",
22-
"args": [
23-
"--external"
24-
],
25-
"sourceMaps": true,
26-
"outFiles": [
27-
"${workspaceRoot}/packages/examples/node/lib/**/*.js"
28-
]
17+
"name": "Launch Sample Server (external)",
18+
"type": "node",
19+
"request": "launch",
20+
"args": ["${workspaceRoot}/packages/examples/node/dist/server.js", "--external"],
21+
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
22+
"cwd": "${workspaceRoot}/packages/examples/node",
23+
"internalConsoleOptions": "openOnSessionStart"
2924
},
3025
{
3126
"type": "pwa-chrome",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Or you use a fresh dev environment in [Gitpod](https://www.gitpod.io) which is a
5050

5151
### Scripts Overview
5252

53-
The main [package.json](./package.json) contains script entries applicable to the whole workspace like `clean` amd `compile`, but it also has entries for launching script from the packages (lib and examples).
53+
The main [package.json](./package.json) contains script entries applicable to the whole workspace like `clean` and `compile`, but it also has entries for launching script from the packages (lib and examples).
5454

5555
For example if you want to rebuild the library you can do it in different ways. From CLI run one of:
5656
```bash

package-lock.json

Lines changed: 77 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"npm": "8.11.0"
2828
},
2929
"scripts": {
30-
"clean": "npm run clean --workspaces && npm run clean:amd --workspace packages/client && npm run webpack:clean --workspace packages/examples/client",
30+
"clean": "npm run clean --workspaces && npm run webpack:clean --workspace packages/examples/client",
3131
"compile": "npm run compile --workspaces",
3232
"lint": "npm run lint --workspaces",
3333
"dev": "vite --debug --force",

0 commit comments

Comments
 (0)