From 650daaff63503f6426f64b12d8b33cfca6ef7185 Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Wed, 19 Jan 2022 21:46:43 +0000 Subject: [PATCH 1/2] fix(#161): Fixed issue with `options.ignorews` (#162) --- CONTRIBUTING.md | 2 +- git-conventional-commits.json | 2 ++ src/lcs.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab78fef..4b0dd6c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,4 +8,4 @@ npm run test ## Conventional commits -Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0). +Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0), and [standard-version](https://www.npmjs.com/package/standard-version). diff --git a/git-conventional-commits.json b/git-conventional-commits.json index 1ef7b7a..43c39ae 100644 --- a/git-conventional-commits.json +++ b/git-conventional-commits.json @@ -4,6 +4,8 @@ "build", "chore", "ci", + "feat", + "fix", "docs", "style", "refactor", diff --git a/src/lcs.js b/src/lcs.js index a8fa9b4..5205fe9 100644 --- a/src/lcs.js +++ b/src/lcs.js @@ -3,7 +3,7 @@ const DiffParser = require('./diff-parser'); function LCS(x, y, options) { function getPositionOfWords(text, options) { - var exp = new RegExp(/\w+/g); + var exp = new RegExp(/[^\s]/g); var map = {}; var match; var item = 0; From f3e90b7588675ab7056d8b0f9ac74d6ab9abb29f Mon Sep 17 00:00:00 2001 From: Jamie Peabody Date: Wed, 19 Jan 2022 21:49:12 +0000 Subject: [PATCH 2/2] chore(release): 4.3.9 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da3f42d..ebf5823 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### 4.3.9 (2022-01-19) + + +### Bug Fixes + +* **#161:** Fixed issue with `options.ignorews` ([#162](https://github.com/wickedest/Mergely/issues/162)) ([650daaf](https://github.com/wickedest/Mergely/commit/650daaff63503f6426f64b12d8b33cfca6ef7185)) + ### 4.3.8 (2021-11-21) diff --git a/package.json b/package.json index c31cfd2..5465af4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mergely", - "version": "4.3.8", + "version": "4.3.9", "description": "A javascript UI for diff/merge", "directories": { "doc": "doc",