Merge branch 'dev'

Author: PEZ

CHANGELOG.md

@@ -3,7 +3,12 @@ Changes to Calva.
 
 ## [Unreleased]
 
-## [2.0.47] - 10.10.2019
+## [2.0.49] - 10.11.2019
+- [Fix bugs in comment form selection](https://github.com/BetterThanTomorrow/calva/issues/374)
+- [Use of undeclared var in REPL window resets the namespace](https://github.com/BetterThanTomorrow/calva/issues/257)
+- [Remove warning that extensions use the `vscode-resource:` scheme directly](https://github.com/BetterThanTomorrow/calva/issues/391)
+
+## [2.0.48] - 10.11.2019
 - [Support Jack-in without file open for single-rooted workspace](https://github.com/BetterThanTomorrow/calva/issues/366)
 - [Show argument list of fn](https://github.com/BetterThanTomorrow/calva/issues/238)
 - [Make code more robust in case Jack-in task fails](https://github.com/BetterThanTomorrow/calva/issues/367)

package-lock.json

@@ -3,7 +3,7 @@
     "displayName": "Calva: Clojure & Clojurescript Interactive Programming",
     "description": "Integrated REPL, formatter, Paredit, and more. Powered by nREPL.",
     "icon": "assets/calva.png",
-    "version": "2.0.48",
+    "version": "2.0.49",
     "publisher": "betterthantomorrow",
     "author": {
         "name": "Better Than Tomorrow",
@@ -1391,8 +1391,7 @@
         "release": "npm i && npm run clean && npm run update-grammar && npm run release-cljs && webpack --mode production",
         "postrelease": "rimraf ./out/cljs-lib",
         "vscode:prepublish": "npm run release",
-        "bump-version": "npm set git-tag-version false && npm version patch",
-        "postinstall": "node ./node_modules/vscode/bin/install"
+        "bump-version": "npm set git-tag-version false && npm version patch"
     },
     "dependencies": {
         "@types/escape-html": "0.0.20",
@@ -1444,7 +1443,7 @@
         "typescript": "^3.5.1",
         "url-loader": "^1.1.2",
         "vsce": "^1.67.1",
-        "vscode": "^1.1.34",
+        "@types/vscode": "^1.30.0",
         "webpack": "^4.33.0",
         "webpack-cli": "^3.3.5"
     }