Skip to content

Fix compilation #15

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Apr 1, 2018
Merged

Fix compilation #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97f51b6
Make sure to clean build folder
skovhus Apr 1, 2018
73f1a6e
Fix build after introducing tests
skovhus Apr 1, 2018
37a0592
Add helper command for working on server
skovhus Apr 1, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions docs/development-guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,7 @@ whenever you've made a change, and then reload you vscode window to re-launch
the server.

```
cd server
npm run compile
npm i -g .
npm run reinstall-server
# Reload vscode window.
```

Expand Down
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"test:coverage": "npm run test -- --coverage",
"test:watch": "npm run test -- --watch",
"check": "npm run lint && npm run test",
"check:bail": "npm run lint:bail && npm run test"
"check:bail": "npm run lint:bail && npm run test",
"reinstall-server": "npm run compile && npm i -g ./server"
},
"devDependencies": {
"@types/jest": "^22.2.2",
Expand Down Expand Up @@ -63,5 +64,6 @@
"text-summary",
"html"
]
}
},
"dependencies": {}
}
2 changes: 1 addition & 1 deletion server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"vscode-languageserver": "^3.5.0"
},
"scripts": {
"compile": "tsc -p ./",
"compile": "rm -rf out && tsc -p ./",
"compile:watch": "tsc -w -p ./"
}
}
5 changes: 4 additions & 1 deletion tsconfig.base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
"sourceMap": true
},
"exclude": [
"node_modules"
"node_modules",
"**/__tests__/*",
Copy link
Collaborator Author

@skovhus skovhus Apr 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By adding these the compilation path is as before server/out/server.js
"server/setupJest.ts",
"testing"
]
}
4 changes: 2 additions & 2 deletions vscode-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"main": "./out/src/extension",
"contributes": {},
"scripts": {
"vscode:prepublish": "tsc -p ./",
"compile": "tsc -p ./",
"vscode:prepublish": "npm run compile",
"compile": "rm -rf out && tsc -p ./",
"compile:watch": "tsc -w -p ./",
"update-vscode": "node ./node_modules/vscode/bin/install",
"postinstall": "node ./node_modules/vscode/bin/install"
Expand Down