Skip to content

Commit

Permalink
New workspace settings
Browse files Browse the repository at this point in the history
Fix #5
  • Loading branch information
Gamunu Balagalla committed Jan 24, 2018
1 parent e1b6c1f commit 3c9b8a2
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": [ "${workspaceRoot}/out/src/**/*.js" ],
"preLaunchTask": "npm"
"preLaunchTask": "npm: watch"
},
{
"name": "Launch Tests",
Expand All @@ -22,7 +22,7 @@
"stopOnEntry": false,
"sourceMaps": true,
"outFiles": [ "${workspaceRoot}/out/test/**/*.js" ],
"preLaunchTask": "npm"
"preLaunchTask": "npm: watch"
}
]
}
46 changes: 18 additions & 28 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
// Available variables which can be used inside of strings.
// ${workspaceRoot}: the root folder of the team
// ${file}: the current opened file
// ${fileBasename}: the current opened file's basename
// ${fileDirname}: the current opened file's dirname
// ${fileExtname}: the current opened file's extension
// ${cwd}: the current working directory of the spawned process

// A task runner that calls a custom npm script that compiles the extension.
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
{
"version": "0.1.0",

// we want to run npm
"command": "npm",

// the command is a shell script
"isShellCommand": true,

// show the output window only if unrecognized errors occur.
"showOutput": "silent",

// we run the custom script "compile" as defined in package.json
"args": ["run", "compile", "--loglevel", "silent"],

// The tsc compiler is started in watching mode
"isBackground": true,

// use the standard tsc in watch mode problem matcher to find compile problems in the output.
"problemMatcher": "$tsc-watch"
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "watch",
"problemMatcher": "$tsc-watch",
"isBackground": true,
"presentation": {
"reveal": "never"
},
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
7 changes: 7 additions & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
This file contains a list of people who have made contributions

Original vscode-yarn design and implementation:
Florian Knop
Gamunu Balagalla <[email protected]>

Nate Kilzer
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ It has different behaviors on Unix or Windows.
02. If above scenarios fail to satisfy. The extension will fallback to package.json in project root folder.

## Settings
- `yarn.runInTerminal` defines whether the command is run
in a terminal window or whether the output form the command is shown in the `Output` window. The default is to show the output in the output window.
- `yarn.runInTerminal` defines whether the command is run in a terminal window or whether the output form the command is shown in the `Output` window. The default is to show the output in the output window.
- `yarn.dontHideOutputOnSuccess` Keep the output panel visible when yarn execution is successful. No effect with runInTerminal.
- `yarn.bin` custom npm bin name, the default is `yarn`.
- `yarn.packageJson` default package json path. realtive to current project root

##### Example
```javascript
{
"yarn.runInTerminal": false
"yarn.runInTerminal": false,
"yarn.dontHideOutputOnSuccess": true
"yarn.packageJson": "src/package.json"
}
```
Expand Down
18 changes: 10 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "vscode-yarn",
"displayName": "yarn",
"description": "yarn commands for VSCode",
"version": "1.4.0",
"version": "1.3.0",
"publisher": "gamunu",
"icon": "yarn_icon.png",
"engines": {
"vscode": "^1.5.0"
"vscode": "^1.19.0"
},
"categories": [
"Other"
Expand Down Expand Up @@ -106,7 +106,7 @@
"properties": {
"yarn.runInTerminal": {
"type": "boolean",
"default": true,
"default": false,
"description": "Run yarn commands in a terminal, otherwise shows the output in the output panel"
},
"yarn.bin": {
Expand All @@ -122,14 +122,16 @@
}
},
"scripts": {
"vscode:prepublish": "tsc -p ./",
"compile": "tsc -watch -p ./",
"vscode:prepublish": "npm run compile",
"compile": "tsc -p ./",
"watch": "tsc -watch -p ./",
"postinstall": "node ./node_modules/vscode/bin/install"
},
"devDependencies": {
"@types/node": "*",
"typescript": "^2.5.2",
"vscode": "^1.1.5"
"typescript": "^2.6.1",
"vscode": "^1.1.6",
"@types/node": "^7.0.43",
"@types/mocha": "^2.2.42"
},
"dependencies": {
"global": "^4.3.2",
Expand Down

0 comments on commit 3c9b8a2

Please sign in to comment.