Merge branch 'release/1.3.0' into main

Serhioromano · Mar 27, 2022 · 1a305a1 · 1a305a1
2 parents 6febfe7 + 71b636b
commit 1a305a1
Show file tree

Hide file tree

Showing 10 changed files with 152 additions and 94 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -30,6 +30,7 @@
     "[typescript]": {
         "editor.defaultFormatter": "vscode.typescript-language-features"
     },
+    "peacock.remoteColor": "#1857a4",
     "workbench.colorCustomizations": {
         "activityBar.activeBackground": "#1f6fd0",
         "activityBar.activeBorder": "#ee90bb",
@@ -48,6 +49,5 @@
         "titleBar.activeForeground": "#e7e7e7",
         "titleBar.inactiveBackground": "#1857a499",
         "titleBar.inactiveForeground": "#e7e7e799"
-    },
-    "peacock.remoteColor": "#1857a4"
+    }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,32 +2,37 @@
 
 All notable changes to the "gitflow" extension will be documented in this file.
 
+## [1.3.0] 02/27/2022
+
+- add - use `git.path` settings.
+- enhance - better find git executable path on windows.
+
 ## [1.2.9] 02/07/2022
 
 - security - fix string sanitization
 
-## [1.2.8] 03/07/22
+## [1.2.8] 03/07/2022
 
 - fix - stop command on ESC.
 - fix - run version bump only when released or hotfix is started
 - enhance - `CHANGELOG.md` update conditions
 
-## [1.2.7] 03/04/22
+## [1.2.7] 03/04/2022
 
 - fix -  changelog update `mm` not to be replaced in a word like co**mm**and.
 - fix - release message is undefined
 
-## [1.2.0] 03/04/22
+## [1.2.0] 03/04/2022
 
 - change - Now version bump happens on hotfix or release start rather than finish
 - add - update changelog automatically
 - enhance - Allow change finish message when finish hotfix or release
 
-## [1.1.0] 02/21/22
+## [1.1.0] 02/21/2022
 
 - optimize - performance improvement using memoization technique.
 
-## [1.0.1] 02/07/22
+## [1.0.1] 02/07/2022
 
 Finlay I have all features I planned in this extension. This is still preview but final extension.
 
@@ -36,60 +41,60 @@ Finlay I have all features I planned in this extension. This is still preview bu
 - fix - Readme was not visible in marketplace.
 - optimize - code refactor.
 
-## [0.5.11] 02/05/22
+## [0.5.11] 02/05/2022
 
 - add - Status bar button to call Quick Pick menu
 - add - Groups in Quick Pick (require VS Code >=1.64.0)
 
-## [0.5.9] 02/04/22
+## [0.5.9] 02/04/2022
 
 - add - Checkout support branch
 - add - Publish support branch
 - fix - Checkout release branch
 - add - Delete tags local and remote
 - fix - Release checkout
 
-## [0.5.6] 02/03/22
+## [0.5.6] 02/03/2022
 
 - fix - If error tags shows error as tags
 - fix - important to update. Fix some release issues.
 
-## [0.5.2] 02/03/22
+## [0.5.2] 02/03/2022
 
 - change - use different bundler for extension
 - add - Quick Pick popup
 - optimize - Code was refactored and optimized. 1800 lines to 580.
 
-## [0.4.3] 02/02/22
+## [0.4.3] 02/02/2022
 
 - add - Support for multiple folder workspaces
 - fix - Progress notification not resolving
 
-## [0.3.0] 02/02/22
+## [0.3.0] 02/02/2022
 
 - add - Support (Start, Checkout, Rebase, Delete)
 - add - Release checkout
 - add - Hotfix checkout
 
-## [0.2.14] 01/31/22
+## [0.2.14] 01/31/2022
 
 - enhance - Order and group context menu elements.
 - enhance -  use VS Code theme icons instead of SVG. This will apply Product icons theme to this extension too.
 - enhance - not related to features of this extension, but CI flow was created for fast delivery of new versions.
 - enhance - README overview updated with new features and new picture.
 
-## [0.2.11] 01/30/22
+## [0.2.11] 01/30/2022
 
 - fix - take name of flow branches from configuration
 - fix - ui buttons
 
-## [0.2.9] 01/28/22
+## [0.2.9] 01/28/2022
 
 - add - single command to sync all root branches (develop and master ot main)
 - add - command to checkout root branches
 - enhance - better icons
 
-## [0.2.5] - 01/27/22
+## [0.2.5] - 01/27/2022
 
 - fix - Git authenticated commands to remote
 - add - icons to menu elements
@@ -98,6 +103,6 @@ Finlay I have all features I planned in this extension. This is still preview bu
 - add - progress notification during process
 - Update `README.md` with important instructions
 
-## [0.1.5] - 01/26/22
+## [0.1.5] - 01/26/2022
 
 - Initial release
diff --git a/README.md b/README.md
@@ -163,7 +163,16 @@ GitHub CLI will automatically store your Git credentials for you when you choose
 
 ## Changelog
 
-- 1.2.0
+- 1.3.0
+  - add - use `git.path` settings.
+  - enhance - better find git executable path on windows.
+- 1.2.9
+  - security - fix string sanitization
+  - fix - stop command on ESC.
+  - fix - run version bump only when released or hotfix is started
+  - enhance - `CHANGELOG.md` update conditions
+  - fix -  changelog update `mm` not to be replaced in a word like co**mm**and.
+  - fix - release message is undefined
   - change - Now version bump happens on hotfix or release start rather than finish
   - add - update changelog automatically
   - enhance - Allow change finish message when finish hotfix or release

diff --git a/SECURITY.md b/SECURITY.md
@@ -6,8 +6,8 @@ Versions are currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.x.x   | :white_check_mark: |
+| 1.2.9   | :white_check_mark: |
 
 ## Reporting a Vulnerability
 
-To report a vulnerabilty, please open an issue.
+To report a vulnerability, please open an issue.
diff --git a/package-lock.json b/package-lock.json
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.2.9",
+    "version": "1.3.0",
     "engines": {
         "vscode": "^1.64.0"
     },
@@ -39,7 +39,8 @@
         "onView:gitflowTags"
     ],
     "extensionDependencies": [
-        "vscode.git"
+        "vscode.git",
+        "vscode.git-base"
     ],
     "repository": {
         "type": "git",
@@ -724,15 +725,15 @@
             ]
         }
     },
-    "main": "./out/main.js",
+    "main": "./out/extension.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",
@@ -751,7 +752,7 @@
         "eslint": "^8.6.0",
         "glob": "^7.2.0",
         "mocha": "^9.1.3",
-        "typescript": "^4.5.4",
+        "typescript": "^4.6.3",
         "vsce": "^2.6.4"
     },
     "dependencies": {