Skip to content

Commit 5d46c0b

Browse files
committed
switch to using yarn
Use yarn which makes it consisten with the LSP
1 parent c805abd commit 5d46c0b

File tree

6 files changed

+1890
-5799
lines changed

6 files changed

+1890
-5799
lines changed

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// the command is a shell script
1010
"type": "shell",
1111
// we run the custom npm script "compile" as defined in package.json
12-
"command": "npm run compile --loglevel silent",
12+
"command": "yarn run compile --loglevel silent",
1313
// show the output window only if unrecognized errors occur.
1414
"presentation": {
1515
"reveal": "silent"

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ All contributions are welcome!
4646
├──── yaml-language-server/
4747
```
4848

49-
3. Run `npm install` in both directories to initialize `node_modules` dependencies.
49+
3. Run `yarn install` in both directories to initialize `node_modules` dependencies.
5050

5151
4. In `vscode-yaml/src/extension.ts` set the `serverModule` variable to:
5252

@@ -59,7 +59,7 @@ All contributions are welcome!
5959
5. In BOTH directories run:
6060

6161
```bash
62-
npm run compile
62+
yarn run compile
6363
```
6464

6565
6. To run the language server in VSCode, click `View -> Debug`, then from the drop down menu beside the green arrow select `Launch Extension (vscode-yaml)`, click the arrow, and a new VSCode window should load with the YAML LS running.

Jenkinsfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
def installBuildRequirements(){
44
def nodeHome = tool 'nodejs-12.20.0'
55
env.PATH="${env.PATH}:${nodeHome}/bin"
6-
sh "npm install -g typescript"
7-
sh "npm install -g vsce"
6+
sh "yarn install -g typescript"
7+
sh "yarn install -g vsce"
88
}
99

1010
def buildVscodeExtension(){
11-
sh "npm install"
12-
sh "npm run vscode:prepublish"
11+
sh "yarn install"
12+
sh "yarn run vscode:prepublish"
1313
}
1414

1515
node('rhel8'){
@@ -22,13 +22,13 @@ node('rhel8'){
2222
installBuildRequirements()
2323

2424
stage 'Build vscode-yaml'
25-
sh "npm install"
26-
sh "npm run build"
27-
sh "npm run check-dependencies"
25+
sh "yarn install"
26+
sh "yarn run build"
27+
sh "yarn run check-dependencies"
2828

2929
stage 'Test vscode-yaml for staging'
3030
wrap([$class: 'Xvnc']) {
31-
sh "npm test --silent"
31+
sh "yarn test --silent"
3232
}
3333

3434
stage "Package vscode-yaml"
@@ -56,7 +56,7 @@ node('rhel8'){
5656
}
5757

5858
// Open-vsx Marketplace
59-
sh "npm install -g ovsx"
59+
sh "yarn install -g ovsx"
6060
withCredentials([[$class: 'StringBinding', credentialsId: 'open-vsx-access-token', variable: 'OVSX_TOKEN']]) {
6161
sh 'ovsx publish -p ${OVSX_TOKEN}' + " ${vsix[0].path}"
6262
}

0 commit comments

Comments
 (0)