chore(release): 4.3.6

.git-hooks/commit-msg

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+npx git-conventional-commits commit-msg-hook "$1"

.github/workflows/npm-publish.yaml

@@ -0,0 +1,48 @@
+name: Publish to npm
+
+on: 
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'NPM Tag'
+        required: false
+        default: 'next'
+
+jobs:
+  tag-and-publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14
+          registry-url: https://registry.npmjs.org
+
+      - name: Git checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: npm install
+        env:
+          CI: true
+
+      - name: Test
+        run: npm run test
+
+      - name: Build
+        run: npm run build:dist
+
+      - name: Release
+        uses: oleksiyrudenko/gha-git-credentials@v2.1
+        with:
+          token: '${{ secrets.CI_TOKEN }}'
+          name: 'Jamie Peabody'
+          email: 'jamie.peabody@gmail.com'
+      - run: npm run release
+      - run: git push --follow-tags origin master
+
+      - name: Publish
+        run: npm publish --access public --tag ${{ github.event.inputs.tag }}
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/npm-release.yaml

@@ -0,0 +1,34 @@
+name: Release latest on npm
+
+on: 
+  workflow_dispatch:
+    inputs:
+
+jobs:
+  tag-and-publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10
+          registry-url: https://registry.npmjs.org
+
+      - name: Git checkout
+        uses: actions/checkout@v2
+
+      - name: Get package version
+        run: |
+          export VERSION=`cat package.json | grep '"version"' | sed -E 's/\s+"version": "(.*)",/\1/'`
+          echo "PKG_VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Update dist-tag
+        run: npm dist-tag add mergely@${PKG_VERSION} latest
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Remove 'next' dist-tag
+        run: npm dist-tag rm mergely next
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/run-tests.yaml

@@ -0,0 +1,41 @@
+name: Run tests
+
+# on: [push, pull_request]
+
+on:
+  push:
+    branches-ignore:
+      - 'master'
+    tags-ignore:
+      - 'v*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x] #, 12.x, 14.x, 15.x
+
+    name: Node.js ${{ matrix.node-version }}
+
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install dependencies
+        run: npm install
+        env:
+          CI: true
+
+      - name: Test
+        run: npm run test
+
+      - name: Build
+        run: npm run build:dist

.versionrc

@@ -0,0 +1,46 @@
+{
+	"types": [
+		{
+			"type": "feat",
+			"section": "Features"
+		},
+		{
+			"type": "fix",
+			"section": "Bug Fixes"
+		},
+		{
+			"type": "chore",
+			"section": "General",
+			"hidden": false
+		},
+		{
+			"type": "style",
+			"section": "General",
+			"hidden": false
+		},
+		{
+			"type": "refactor",
+			"section": "General",
+			"hidden": false
+		},
+		{
+			"type": "perf",
+			"section": "General",
+			"hidden": false
+		},
+		{
+			"type": "test",
+			"section": "General",
+			"hidden": false
+		},
+		{
+			"type": "docs",
+			"section": "Documentation",
+			"hidden": false
+		},
+		{
+			"type": "ci",
+			"hidden": true
+		}
+	]
+}

CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+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.6 (2021-11-21)
+
+### [4.3.5](https://github.com/wickedest/Mergely/compare/v4.0.13...v4.3.5) (2021-11-21)
+
+
+### Features
+
+* **#132:** added option to ignore accented characters ([#136](https://github.com/wickedest/Mergely/issues/136)) ([5a0cd15](https://github.com/wickedest/Mergely/commit/5a0cd15ddd54fdd60b42247e6f373a6a8e47d25d)), closes [#132](https://github.com/wickedest/Mergely/issues/132) [#132](https://github.com/wickedest/Mergely/issues/132)
+* **#137:** added 'summary' method ([4610ed3](https://github.com/wickedest/Mergely/commit/4610ed353557300e45d98e31cf384bc996dbac58)), closes [#137](https://github.com/wickedest/Mergely/issues/137)
+
+
+### General
+
+* updated dependencies ([85b02ad](https://github.com/wickedest/Mergely/commit/85b02add899b90e4d6ced4474cfdee98838d272a))

CHANGES.md

@@ -1,5 +1,8 @@
 # Changes
 
+## 4.3.5
+* patch: fixed issue with build
+
 ## 4.3.4
 * patch: Fixes inline diff rendering issue with whitespace [#139](https://github.com/wickedest/Mergely/issues/139).
 

CONTRIBUTING.md

@@ -0,0 +1,11 @@
+# Contributing to Mergely
+
+## Testing
+
+```bash
+npm run test
+```
+
+## Conventional commits
+
+Mergely is using [conventional commits](https://www.conventionalcommits.org/en/v1.0.0).

bower.json

@@ -1,36 +0,0 @@
-{
-  "name": "Mergely",
-  "version": "4.0.0",
-  "homepage": "https://github.com/wickedest/Mergely",
-  "description": "Merge and diff documents online",
-  "main": [
-    "lib/mergely.js",
-    "lib/mergely.css"
-  ],
-  "keywords": [
-    "merge",
-    "diff"
-  ],
-  "ignore": [
-    "LICENSE.html",
-    "README.md",
-    "doc",
-    "editor",
-    "examples",
-    "test"
-  ],
-  "license": [
-    "GPL",
-    "LGPL",
-    "MPL"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/wickedest/Mergely"
-  },
-  "dependencies": {
-    "mergely": "https://github.com/wickedest/Mergely.git#3.4.3",
-    "jquery": "<=2.1.3",
-    "codemirror": "<=5.11.0"
-  }
-}

commitlint.config.js

@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']};

git-conventional-commits.json

@@ -0,0 +1,38 @@
+{
+  "convention" : {
+    "commitTypes": [
+      "build",
+      "chore",
+      "ci",
+      "docs",
+      "style",
+      "refactor",
+      "perf",
+      "test"
+    ],
+    "commitScopes": [],
+    "releaseTagGlobPattern": "v[0-9].*",
+    "issueRegexPattern": "(^|\\s)#\\d+(\\s|$)"
+  },
+
+  "changelog" : {
+    "commitTypes": [
+      "feat",
+      "fix",
+      "perf",
+      "merge"
+    ],
+    "commitIgnoreRegexPattern": "^WIP ",
+    "headlines": {
+      "feat": "Features",
+      "fix": "Bug Fixes",
+      "perf": "Performance Improvements",
+      "merge": "Merged Branches",
+      "breakingChange": "BREAKING CHANGES"
+    },
+
+    "commitUrl": "https://github.com/wickedest/Mergely/commit/%commit%",
+    "commitRangeUrl": "https://github.com/wickedest/Mergely/compare/%from%...%to%?diff=split",
+    "issueUrl": "https://github.com/wickedest/Mergely/issues/%issue%"
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergely",
-  "version": "4.3.4",
+  "version": "4.3.6",
   "description": "A javascript UI for diff/merge",
   "directories": {
     "doc": "doc",
@@ -36,6 +36,8 @@
   "devDependencies": {
     "@babel/core": "^7.1.6",
     "@babel/preset-env": "^7.1.6",
+    "@commitlint/config-conventional": "^15.0.0",
+    "@commitlint/prompt-cli": "^15.0.0",
     "@webpack-cli/init": "^1.0.1",
     "babel-loader": "^8.0.4",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -44,6 +46,7 @@
     "copy-webpack-plugin": "^6.2.1",
     "css-loader": "^5.0.0",
     "file-loader": "^6.1.1",
+    "git-conventional-commits": "^1.1.0",
     "html-webpack-plugin": "^4.5.0",
     "image-webpack-loader": "^7.0.1",
     "jquery": "^3.5.1",
@@ -55,15 +58,18 @@
     "karma-mocha-reporter": "^2.2.5",
     "karma-webpack": "^4.0.2",
     "mocha": "^8.1.3",
+    "standard-version": "^9.3.2",
     "style-loader": "^2.0.0",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.0.0",
     "webpack-dev-server": "^3.11.0"
   },
   "scripts": {
-    "build": "rm -rf lib && webpack --config ./webpack.prod.js",
+    "build": "npm run test && npm run build:dist",
+    "build:dist": "rm -rf lib && webpack --config ./webpack.prod.js",
     "start": "webpack serve --config webpack.dev.js",
     "test": "karma start",
-    "test:chrome": "karma start --browsers Chrome --singleRun=false"
+    "test:chrome": "karma start --browsers Chrome --singleRun=false",
+    "release": "standard-version -a"
   }
 }