Skip to content

Commit

Permalink
Merge pull request #390 from TypeFox/align-tsconfigs
Browse files Browse the repository at this point in the history
Align all tsconfigs and vscode-ws-jsonrpc provides esm/cjs
  • Loading branch information
kaisalmen committed Jun 22, 2022
2 parents 73c4f8e + 31bd60b commit 756c30f
Show file tree
Hide file tree
Showing 24 changed files with 393 additions and 258 deletions.
6 changes: 5 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,9 @@ module.exports = {
'dot-notation': 'off',
'@typescript-eslint/dot-notation': ['error']
},
ignorePatterns: ['.eslintrc.js', './packages/examples/browser-lsp/src/serverWorker.ts']
ignorePatterns: [
'.eslintrc.js',
'vite.config.ts',
'packages/examples/browser-lsp/src/serverWorker.ts'
]
};
33 changes: 14 additions & 19 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,22 @@
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Sample Server",
"program": "${workspaceRoot}/packages/examples/node/lib/server.js",
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/packages/examples/node/lib/**/*.js"
]
"name": "Launch Sample Server",
"type": "node",
"request": "launch",
"args": ["${workspaceRoot}/packages/examples/node/src/server.ts"],
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
"cwd": "${workspaceRoot}/packages/examples/node",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "node",
"request": "launch",
"name": "Launch Sample Server (external)",
"program": "${workspaceRoot}/packages/examples/node/lib/server.js",
"args": [
"--external"
],
"sourceMaps": true,
"outFiles": [
"${workspaceRoot}/packages/examples/node/lib/**/*.js"
]
"name": "Launch Sample Server (external)",
"type": "node",
"request": "launch",
"args": ["${workspaceRoot}/packages/examples/node/dist/server.js", "--external"],
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
"cwd": "${workspaceRoot}/packages/examples/node",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "pwa-chrome",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Or you use a fresh dev environment in [Gitpod](https://www.gitpod.io) which is a

### Scripts Overview

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).
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).

For example if you want to rebuild the library you can do it in different ways. From CLI run one of:
```bash
Expand Down
122 changes: 77 additions & 45 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"npm": "8.11.0"
},
"scripts": {
"clean": "npm run clean --workspaces && npm run clean:amd --workspace packages/client && npm run webpack:clean --workspace packages/examples/client",
"clean": "npm run clean --workspaces && npm run webpack:clean --workspace packages/examples/client",
"compile": "npm run compile --workspaces",
"lint": "npm run lint --workspaces",
"dev": "vite --debug --force",
Expand Down
Loading

0 comments on commit 756c30f

Please sign in to comment.