Merge branch 'release/1.3.1' into main

Serhioromano · Mar 27, 2022 · 512b2d1 · 512b2d1
2 parents 1a305a1 + 79266b6
commit 512b2d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-gitflow",
     "displayName": "Git Flow",
     "description": "Git-Flow support for VS Code",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "engines": {
         "vscode": "^1.64.0"
     },
@@ -725,15 +725,15 @@
             ]
         }
     },
-    "main": "./out/extension.js",
+    "main": "./out/main.js",
     "scripts": {
-        "_vscode:prepublish": "npm run esbuild-base -- --minify",
+        "vscode:prepublish": "npm run esbuild-base -- --minify",
         "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
         "esbuild": "npm run esbuild-base -- --sourcemap",
         "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
         "watch": "tsc -watch -p ./",
         "publish": "vsce package && gh release create $(node -pe \"require('./package.json')['version']\") --generate-notes \"./vscode-gitflow-$(node -pe \"require('./package.json')['version']\").vsix\" && vsce publish",
-        "vscode:prepublish": "npm run compile",
+        "_vscode:prepublish": "npm run compile",
         "compile": "tsc -p ./",
         "pretest": "npm run compile && npm run lint",
         "lint": "eslint src --ext ts",

diff --git a/src/ViewBranches.ts b/src/ViewBranches.ts
@@ -466,7 +466,7 @@ export class TreeViewBranches implements vscode.TreeDataProvider<Flow> {
                 ? " --showcommands "
                 : " ";
         let cmd = `"${this.util.path}" flow ${feature} ${what}${command}${option} ${name} ${base}`;
-        console.log(cmd);
+        //console.log(cmd);
 
         this.util.exec(cmd, progress, (s) => {
             this._onDidChangeTreeData.fire();