chore(ci): package-lock.json

chore(ci): test
chore(ci): alpha, beta, next branches
2025-12-12 09:23:21 +08:00 · 2023-04-22 16:01:38 +01:00 · 2023-04-22 15:59:44 +01:00 · 2023-04-22 15:57:48 +01:00 · 2023-04-22 14:41:21 +01:00 · 2023-04-22 14:40:58 +01:00
16 changed files with 110 additions and 361 deletions
--- a/.github/workflows/branch.yaml
+++ b/.github/workflows/branch.yaml
@@ -3,10 +3,7 @@ name: Run tests (branch)
 on:
  push:
    branches-ignore:
-      - master
-      - alpha
-      - beta
-      - next
+      - 'master'
    tags-ignore:
      - 'v*'

--- a/.releaserc.yaml
+++ b/.releaserc.yaml
@@ -1,11 +0,0 @@
-branches:
-  - master
-  - name: alpha
-    prerelease: true
-plugins:
-  - "@semantic-release/commit-analyzer"
-  - "@semantic-release/release-notes-generator"
-  - "@semantic-release/changelog"
-  - "@semantic-release/npm"
-  - "@semantic-release/git"
-  - "@semantic-release/github"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,69 +1,7 @@
-## [5.1.1](https://github.com/wickedest/Mergely/compare/v5.1.0...v5.1.1) (2024-03-11)
-
-
-### Bug Fixes
-
-* **#183:** fixes undefined 'k' due to scoped 'let' ([02e383d](https://github.com/wickedest/Mergely/commit/02e383d94d685e41cb68d945b9726bbcbfeb0ccf))
-
-# [5.1.0](https://github.com/wickedest/Mergely/compare/v5.0.4...v5.1.0) (2023-08-27)
-
-
-### Features
-
-* support CM modes: go, javascript, htmlmixed, markdown, python ([827487a](https://github.com/wickedest/Mergely/commit/827487a5983cb89ef41415435d44239e35983b9a))
-
-## [5.0.4](https://github.com/wickedest/Mergely/compare/v5.0.3...v5.0.4) (2023-08-27)
-
-
-### Bug Fixes
-
-* updated CDN example ([dec1e95](https://github.com/wickedest/Mergely/commit/dec1e9509d94811914e77cbc33dc1aaedf154f7c))
-
-## [5.0.3](https://github.com/wickedest/Mergely/compare/v5.0.2...v5.0.3) (2023-08-27)
-
-
-### Bug Fixes
-
-* Updated docs with CDN example ([254adf1](https://github.com/wickedest/Mergely/commit/254adf15ab09fe9c5c3dff542d0a7f62ce2c9782))
-
-## [5.0.2](https://github.com/wickedest/Mergely/compare/v5.0.1...v5.0.2) (2023-04-24)
-
-
-### Bug Fixes
-
-* **scroll:** fixed issue where first rhs scroll was unlinked ([7b2040c](https://github.com/wickedest/Mergely/commit/7b2040c6ad17ea70a09720f54d9a255cdc57cd67))
-
-## [5.0.1](https://github.com/wickedest/Mergely/compare/v5.0.0...v5.0.1) (2023-04-23)
-
-
-### Bug Fixes
-
-* update release ([a8b497b](https://github.com/wickedest/Mergely/commit/a8b497bc9b68beb5d8265106d9f010aa9489dd17))
-
 # 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.

-### [5.0.0](https://github.com/wickedest/Mergely/compare/v4.3.9...v5.0.0) (2023-04-23)
-
-
-### BREAKING CHANGES
-
- Mergely is no longer a jQuery plugin.
- Removed options.autoresize
- Removed options.editor_width
- Removed options.editor_height
- Removed options.fadein
- Removed options.fgcolor
- Removed options.resize
- Removed options.width
- Removed options.height
- Removed options.loaded callback
- Removed options.resized callback
- Removed styles .mergely-resizer, .mergely-full-screen-0, and .mergely-full-screen-8
- Changed default for options.change_timeout changed from 150 to 50.
- No longer automatically scrolls to first change.
-
 ### 4.3.9 (2022-01-19)


--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 https://mergely.com

-Mergely is a JavaScript component for differencing and merging files interactively in a browser (diff/merge). It provides a rich API that enables you to easily integrate Mergely into your existing web application. It is suitable for comparing text files online, such as .txt, .html, .xml, .c, .cpp, .java, .js, etc.
+Mergely is a JavaScript component for differencing and merging files interactively in a browser (diff/merge). It provides a rich API that enables you to easily integrate Mergely into your existing web application. It is suitable for comparing text files online, for example, .txt, .html, .xml, .c, .cpp, .java, etc.

 Mergely has a JavaScript implementation of the Longest Common Subsequence (LCS) diff algorithm, and a customizable markup engine. It computes the diff within the browser.

@@ -36,11 +36,11 @@ rm -rf .git

 ### Usage via CDN

-Add the following to the `<head>` of your target HTML source file. Note that `codemirror` is bundled.
+Unpack mergely.tgz into a folder, for example, `./lib`, and add the following to the `<head>` of your target HTML source file.

 ```html
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.min.js"></script>
-<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.css" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.css"></script>
 ```

 ### Synchronous initialization
@@ -82,16 +82,6 @@ Mergely will emit an `updated` event when the editor is first initialized, and e
 </body>
 ```

-### Visualization modes
-
-Mergely supports the following CodeMirror visualizations for [mode](codemirror.net/5/doc/manual.html#option_mode):
-
-* go
-* javascript
-* htmlmixed
-* markdown
-* python
-
 ## Options

 |Option|Type|Default value|Description|
--- a/examples/cdn.html
+++ b/examples/cdn.html
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Mergely - Example full page editor</title>
-	<meta http-equiv="X-UA-Compatible" content="chrome=1, IE=edge">
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
-	<meta name="description" content="" />
-	<meta name="keywords" content="mergely,diff,merge,compare" />
-	<meta name="author" content="Jamie Peabody" />
-	<link rel="icon" href="/favicon.svg" type="image/svg+xml">
-
-	<!-- Mergely -->
-	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.min.js"></script>
-	<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mergely/5.0.0/mergely.css" />
-
-	<style type="text/css">
-		html, body {
-			height: 100%;
-			margin: 0;
-		}
-		#compare {
-			height: inherit;
-		}
-	</style>
-</head>
-<body>
-	<div id="compare"></div>
-
-	<script>
-		const mergely = new Mergely('#compare');
-		mergely.once('updated', () => {
-			mergely.lhs('the quick red fox\njumped over the hairy dog');
-			mergely.rhs('the quick brown fox\njumped over the lazy dog');
-		});
-	</script>
-</body>
-</html>
--- a/examples/index.html
+++ b/examples/index.html
@@ -21,9 +21,6 @@ This example demonstrates the minimum amount of code required to use Mergely.
 	<h1>Examples</h1>

 	<dl>
-		<dt><a href="cdn.html">cdn.html</a></dt>
-		<dd>Demonstrates how to use Mergely with CDN.</dd>
-
 		<dt><a href="editor.html">editor.html</a></dt>
 		<dd>An example editor showcasing some of Mergely's API features.</dd>

--- a/git-conventional-commits.json
+++ b/git-conventional-commits.json
@@ -22,7 +22,6 @@

  "changelog" : {
    "commitTypes": [
-      "docs",
      "feat",
      "fix",
      "perf",
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "mergely",
-  "version": "5.1.1",
+  "version": "5.0.0-rc0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "mergely",
-      "version": "5.1.1",
+      "version": "5.0.0-rc0",
      "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
      "devDependencies": {
        "@babel/core": "^7.1.6",
@@ -14,8 +14,6 @@
        "@commitlint/cli": "^17.6.1",
        "@commitlint/config-conventional": "^15.0.0",
        "@commitlint/prompt-cli": "^15.0.0",
-        "@semantic-release/changelog": "^6.0.3",
-        "@semantic-release/git": "^10.0.1",
        "babel-loader": "^8.2.3",
        "babel-plugin-syntax-dynamic-import": "^6.18.0",
        "chai": "^4.3.4",
@@ -60,13 +58,12 @@
      }
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+      "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
      "dev": true,
      "dependencies": {
-        "@babel/highlight": "^7.22.13",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.18.6"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -112,12 +109,12 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-      "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz",
+      "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.23.0",
+        "@babel/types": "^7.21.4",
        "@jridgewell/gen-mapping": "^0.3.2",
        "@jridgewell/trace-mapping": "^0.3.17",
        "jsesc": "^2.5.1"
@@ -240,9 +237,9 @@
      }
    },
    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "version": "7.18.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
@@ -261,25 +258,25 @@
      }
    },
    "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-      "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
      "dev": true,
      "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.18.6"
      },
      "engines": {
        "node": ">=6.9.0"
@@ -409,30 +406,30 @@
      }
    },
    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
      "dev": true,
      "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.18.6"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.19.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.19.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
      "dev": true,
      "engines": {
        "node": ">=6.9.0"
@@ -477,13 +474,13 @@
      }
    },
    "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
+        "@babel/helper-validator-identifier": "^7.18.6",
+        "chalk": "^2.0.0",
        "js-tokens": "^4.0.0"
      },
      "engines": {
@@ -491,9 +488,9 @@
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-      "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz",
+      "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==",
      "dev": true,
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -1612,33 +1609,33 @@
      "dev": true
    },
    "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
      "dev": true,
      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.18.6",
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz",
+      "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==",
      "dev": true,
      "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.23.0",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.23.0",
-        "@babel/types": "^7.23.0",
+        "@babel/code-frame": "^7.21.4",
+        "@babel/generator": "^7.21.4",
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-hoist-variables": "^7.18.6",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/parser": "^7.21.4",
+        "@babel/types": "^7.21.4",
        "debug": "^4.1.0",
        "globals": "^11.1.0"
      },
@@ -1647,13 +1644,13 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-      "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz",
+      "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==",
      "dev": true,
      "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.19.4",
+        "@babel/helper-validator-identifier": "^7.19.1",
        "to-fast-properties": "^2.0.0"
      },
      "engines": {
@@ -3499,59 +3496,6 @@
        "node": ">=12"
      }
    },
-    "node_modules/@semantic-release/changelog": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-6.0.3.tgz",
-      "integrity": "sha512-dZuR5qByyfe3Y03TpmCvAxCyTnp7r5XwtHRf/8vD9EAn4ZWbavUX8adMtXYzE86EVh0gyLA7lm5yW4IV30XUag==",
-      "dev": true,
-      "dependencies": {
-        "@semantic-release/error": "^3.0.0",
-        "aggregate-error": "^3.0.0",
-        "fs-extra": "^11.0.0",
-        "lodash": "^4.17.4"
-      },
-      "engines": {
-        "node": ">=14.17"
-      },
-      "peerDependencies": {
-        "semantic-release": ">=18.0.0"
-      }
-    },
-    "node_modules/@semantic-release/changelog/node_modules/fs-extra": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@semantic-release/changelog/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@semantic-release/changelog/node_modules/universalify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
    "node_modules/@semantic-release/commit-analyzer": {
      "version": "9.0.2",
      "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-9.0.2.tgz",
@@ -3582,37 +3526,6 @@
        "node": ">=14.17"
      }
    },
-    "node_modules/@semantic-release/git": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/@semantic-release/git/-/git-10.0.1.tgz",
-      "integrity": "sha512-eWrx5KguUcU2wUPaO6sfvZI0wPafUKAMNC18aXY4EnNcrZL86dEmpNVnC9uMpGZkmZJ9EfCVJBQx4pV4EMGT1w==",
-      "dev": true,
-      "dependencies": {
-        "@semantic-release/error": "^3.0.0",
-        "aggregate-error": "^3.0.0",
-        "debug": "^4.0.0",
-        "dir-glob": "^3.0.0",
-        "execa": "^5.0.0",
-        "lodash": "^4.17.4",
-        "micromatch": "^4.0.0",
-        "p-reduce": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.17"
-      },
-      "peerDependencies": {
-        "semantic-release": ">=18.0.0"
-      }
-    },
-    "node_modules/@semantic-release/git/node_modules/p-reduce": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz",
-      "integrity": "sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
    "node_modules/@semantic-release/github": {
      "version": "8.0.7",
      "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-8.0.7.tgz",
@@ -6900,9 +6813,9 @@
      }
    },
    "node_modules/engine.io": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz",
-      "integrity": "sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.4.1.tgz",
+      "integrity": "sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw==",
      "dev": true,
      "dependencies": {
        "@types/cookie": "^0.4.1",
@@ -14878,9 +14791,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
+      "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
      "dev": true,
      "funding": [
        {
@@ -14890,14 +14803,10 @@
        {
          "type": "tidelift",
          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
        }
      ],
      "dependencies": {
-        "nanoid": "^3.3.6",
+        "nanoid": "^3.3.4",
        "picocolors": "^1.0.0",
        "source-map-js": "^1.0.2"
      },
@@ -16569,9 +16478,9 @@
      }
    },
    "node_modules/socket.io-parser": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.3.tgz",
-      "integrity": "sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz",
+      "integrity": "sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw==",
      "dev": true,
      "dependencies": {
        "@socket.io/component-emitter": "~3.1.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "mergely",
-  "version": "5.1.1",
+  "version": "5.0.0-rc0",
  "description": "A javascript UI for diff/merge",
  "license": "(GPL-3.0 OR LGPL-3.0 OR MPL-1.1 OR SEE LICENSE IN LICENSE)",
  "author": {
@@ -14,7 +14,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "git@github.com:wickedest/Mergely.git"
+    "url": "git+https://github.com/wickedest/Mergely.git"
  },
  "main": "lib/mergely.js",
  "files": [
@@ -36,8 +36,6 @@
    "@commitlint/cli": "^17.6.1",
    "@commitlint/config-conventional": "^15.0.0",
    "@commitlint/prompt-cli": "^15.0.0",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
    "babel-loader": "^8.2.3",
    "babel-plugin-syntax-dynamic-import": "^6.18.0",
    "chai": "^4.3.4",
--- a/src/diff-view.js
+++ b/src/diff-view.js
@@ -2,12 +2,6 @@ const CodeMirror = require('codemirror');
 require('codemirror/addon/search/searchcursor.js');
 require('codemirror/addon/selection/mark-selection.js');
 require('codemirror/lib/codemirror.css');
-require('codemirror/mode/go/go.js');
-require('codemirror/mode/javascript/javascript.js');
-require('codemirror/mode/htmlmixed/htmlmixed.js');
-require('codemirror/mode/markdown/markdown.js');
-require('codemirror/mode/python/python.js');
-
 const dom = require('./dom.js');
 const VDoc = require('./vdoc');

@@ -50,8 +44,7 @@ CodeMirrorDiffView.prototype.init = function(el, options = {}) {
 		lineNumbers: this.settings.line_numbers,
 		gutters: (this.settings.line_numbers && [ 'merge', 'CodeMirror-linenumbers' ]) || [],
 	};
-	this._vdoc = new VDoc({ _debug: this.settings._debug });
-	this._linkedScrollTimeout = {};
+	this._vdoc = new VDoc();
 };

 CodeMirrorDiffView.prototype.unbind = function() {
@@ -297,6 +290,11 @@ CodeMirrorDiffView.prototype.bind = function(container) {
 		className: container.className
 	};
 	const el = dom.getMergelyContainer({ clazz: container.className });
+	// const found = document.getElementById(container.id);
+	// if (!found) {
+	// 	console.error(`Failed to find mergely: #${container.id}`);
+	// 	return;
+	// }
 	const computedStyle = window.getComputedStyle(container);
 	if (!computedStyle.height || computedStyle.height === '0px') {
 		throw new Error(
@@ -442,10 +440,7 @@ CodeMirrorDiffView.prototype.bind = function(container) {
 				trace('event#lhs-scroll');
 			}
 		}
-		// firefox scroll-linked effect render issue
-		setTimeout(() => {
-			this._scrolling({ side: 'lhs' });
-		}, 1);
+		this._scrolling({ side: 'lhs' });
 	});
 	this.editor.rhs.on('change', (instance, ev) => {
 		if (this.settings._debug) {
@@ -464,10 +459,7 @@ CodeMirrorDiffView.prototype.bind = function(container) {
 				trace('event#rhs-scroll');
 			}
 		}
-		// firefox scroll-linked effect render issue
-		setTimeout(() => {
-			this._scrolling({ side: 'rhs' });
-		}, 1);
+		this._scrolling({ side: 'rhs' });
 	});

 	// resize event handeler
@@ -568,7 +560,7 @@ CodeMirrorDiffView.prototype._clearMarkup = function () {
 		traceTimeStart('draw#_clearMarkup');
 	}
 	this._vdoc.clear();
-	this._vdoc = new VDoc({ _debug: this.settings._debug });
+	this._vdoc = new VDoc();
 	if (this.settings._debug) {
 		traceTimeEnd('draw#_clearMarkup');
 	}
@@ -642,10 +634,7 @@ CodeMirrorDiffView.prototype._scrolling = function({ side }) {
 	const scroller = this.editor[side].getScrollerElement();
 	const { top } = scroller.getBoundingClientRect();
 	let height;
-	if (scroller.offsetParent === null) {
-		return;
-	}
-	if (this.midway == undefined) {
+	if (true || this.midway == undefined) {
 		height = scroller.clientHeight
 			- (scroller.offsetHeight - scroller.offsetParent.offsetHeight);
 		this.midway = (height / 2.0 + top).toFixed(2);
@@ -708,14 +697,11 @@ CodeMirrorDiffView.prototype._scrolling = function({ side }) {
 		// coming in 2s, so this will "link" scrolling the other editor to
 		// this editor until this editor stops scrolling and times out.
 		this._skipscroll[oside] = true;
-		trace('scroll#set oside skip set:', oside, this._skipscroll);
-		if (this._linkedScrollTimeout[oside]) {
-			clearTimeout(this._linkedScrollTimeout[oside]);
-			trace('scroll#clearing timeout:', this._skipscroll);
+		if (this._linkedScrollTimeout) {
+			clearTimeout(this._linkedScrollTimeout);
 		}
-		this._linkedScrollTimeout[oside] = setTimeout(() => {
+		this._linkedScrollTimeout = setTimeout(() => {
 			this._skipscroll[oside] = false;
-			trace('scroll#set oside skip unset:', oside, this._skipscroll);
 		}, 100);

 		const top = top_to - top_adjust;
@@ -1005,10 +991,14 @@ CodeMirrorDiffView.prototype._markupLineChanges = function (changes) {
 		}
 	}
 	led.operation(() => {
-		vdoc.update('lhs', led, lhsvp);
+		for (let i = 0; i < changes.length; ++i) {
+			vdoc.update('lhs', i, led, lhsvp);
+		}
 	});
 	red.operation(() => {
-		vdoc.update('rhs', red, rhsvp);
+		for (let i = 0; i < changes.length; ++i) {
+			vdoc.update('rhs', i, red, rhsvp);
+		}
 	});
 	if (this.settings._debug) {
 		traceTimeEnd('draw#_markupLineChanges');
--- a/src/diff.js
+++ b/src/diff.js
@@ -146,7 +146,7 @@ diff.prototype._sms = function(lhs_ctx, lhs_lower, lhs_upper, rhs_ctx, rhs_lower
 			}
 		}
 		// Extend the reverse path.
-		for (let k = kup - d; k <= kup + d; k += 2) {
+		for (k = kup - d; k <= kup + d; k += 2) {
 			// find the only or better starting point
 			if (k === kup + d) {
 				x = vector_u[offset_up + k - 1]; // up
--- a/src/dom.js
+++ b/src/dom.js
@@ -67,7 +67,7 @@ function getColors(el) {
 function getMergelyContainer({ clazz = '' }) {
 	const classes = [ 'mergely-editor', clazz ]
 	return htmlToElement(`\
-<div class="${classes.join(' ')}" style="display:flex;height:100%;position:relative;overflow:hidden;"></div>`);
+<div class="${classes.join(' ')}" style="display:flex;height:100%;position:relative;"></div>`);
 }

 function getMarginTemplate({ id }) {
--- a/src/mergely.css
+++ b/src/mergely.css
@@ -17,7 +17,7 @@
 }

 .mergely-editor .CodeMirror-selected {
-	background: #0f73ff47;
+    background: #ffcb0f;
 }

 .mergely-splash {
@@ -52,6 +52,8 @@
 .mergely-editor .merge-button {
 	height: 18px;
 	cursor: pointer;
+	width: 26px;
+	padding-left: 3px;
 }

 /* common stles */
--- a/src/mergely.js
+++ b/src/mergely.js
@@ -23,8 +23,7 @@ const defaultOptions = {
 	vpcolor: 'rgba(0, 0, 200, 0.5)',
 	license: 'lgpl',
 	cmsettings: {
-		styleSelectedText: true,
-		mode: null
+		styleSelectedText: true
 	},
 	lhs_cmsettings: {},
 	rhs_cmsettings: {},
@@ -115,7 +114,7 @@ class Mergely {

 	_setOptions(options) {
 		if (this._options && this._options._debug) {
-			trace('api#options');
+			trace('api#options', opts);
 		}
 		const colors = dom.getColors(this.el);
 		this._options = {
@@ -187,7 +186,7 @@ class Mergely {

 	diff() {
 		if (this._options._debug) {
-			trace('api#diff');
+			trace('api#diff', side);
 		}
 		const lhs_text = this.get('lhs');
 		const rhs_text = this.get('rhs');
--- a/src/vdoc.js
+++ b/src/vdoc.js
@@ -1,10 +1,7 @@
 const diff = require('./diff');

-const trace = console.log;
-
 class VDoc {
-	constructor(options) {
-		this.options = options;
+	constructor() {
 		this._lines = {
 			lhs: {},
 			rhs: {}
@@ -16,9 +13,6 @@ class VDoc {
 	}

 	addRender(side, change, changeId, options) {
-		if (this.options._debug) {
-			trace('vdoc#addRender', side, changeId, change);
-		}
 		const {
 			isCurrent,
 			lineDiff,
@@ -29,9 +23,6 @@ class VDoc {
 		const alreadyRendered = !!this._rendered[side][changeId];

 		if (alreadyRendered) {
-			if (this.options._debug) {
-				trace('vdoc#addRender (already rendered)', side, changeId, change);
-			}
 			return;
 		}

@@ -125,9 +116,6 @@ class VDoc {
 	}

 	addInlineDiff(change, changeId, { getText, ignorews, ignoreaccents, ignorecase }) {
-		if (this.options._debug) {
-			trace('vdoc#addInlineDiff', changeId, change);
-		}
 		const { lf, lt, olf, olt } = getExtents('lhs', change);
 		const vdoc = this;

@@ -181,9 +169,6 @@ class VDoc {
 	}

 	_setRenderedChange(side, changeId) {
-		if (this.options._debug) {
-			trace('vdoc#_setRenderedChange', side, changeId);
-		}
 		return this._rendered[side][changeId] = true;
 	}

@@ -197,10 +182,8 @@ class VDoc {
 		return line;
 	}

-	update(side, editor, viewport) {
-		if (this.options._debug) {
-			trace('vdoc#update', side, editor, viewport);
-		}
+	update(side, changeId, editor, viewport) {
+		this._setRenderedChange(side, changeId);
 		const lines = Object.keys(this._lines[side]);
 		for (let i = 0; i < lines.length; ++i) {
 			const id = lines[i];
@@ -217,9 +200,6 @@ class VDoc {
 	}

 	clear() {
-		if (this.options._debug) {
-			trace('vdoc#clear');
-		}
 		for (const lineId in this._lines.lhs) {
 			this._lines.lhs[lineId].clear();
 		}
--- a/test/mergely.spec.js
+++ b/test/mergely.spec.js
@@ -22,8 +22,7 @@ const defaultOptions = {
 	vpcolor: 'rgba(0, 0, 200, 0.5)',
 	license: 'lgpl',
 	cmsettings: {
-		styleSelectedText: true,
-		mode: null
+		styleSelectedText: true
 	},
 	_debug: false
 };
Author	SHA1	Message	Date
Jamie Peabody	88f21e2bc7	chore(ci): package-lock.json	2023-04-22 16:01:38 +01:00
Jamie Peabody	4160ab4f6e	chore(ci): test	2023-04-22 15:59:44 +01:00
Jamie Peabody	16f1d2016d	chore(ci): alpha, beta, next branches	2023-04-22 15:57:48 +01:00
Jamie Peabody	347a3f56ff	chore(ci): updated webpack	2023-04-22 14:41:21 +01:00
Jamie Peabody	88d4a62a04	chore: updated examples	2023-04-22 14:40:58 +01:00
Jamie Peabody	b3e7b48d11	feat: dark mode	2023-04-22 14:13:30 +01:00
Jamie Peabody	fcea4efe2f	chore: tweaked no-start/end styles	2023-04-22 13:44:33 +01:00
Jamie Peabody	080b8fd7b5	feat: v5 BREAKING CHANGE: Mergely is no longer a jQuery plugin. BREAKING CHANGE: Removed `options.autoresize` BREAKING CHANGE: Removed `options.editor_width` BREAKING CHANGE: Removed `options.editor_height` BREAKING CHANGE: Removed `options.fadein` BREAKING CHANGE: Removed `options.fgcolor` BREAKING CHANGE: Removed `options.resize` BREAKING CHANGE: Removed `options.width` BREAKING CHANGE: Removed `options.height` BREAKING CHANGE: Removed `options.loaded` callback BREAKING CHANGE: Removed `options.resized` callback BREAKING CHANGE: Removed styles `.mergely-resizer`, `.mergely-full-screen-0`, and `.mergely-full-screen-8` BREAKING CHANGE: Changed default for `options.change_timeout` changed from `150` to `50`. BREAKING CHANGE: No longer automatically scrolls to first change. feat: CodeMirror is now an explicit dependency. feat: No longer necessary to separately require codemirror/addon/search/searchcursor feat: No longer necessary to separately require codemirror/addon/selection/mark-selection feat: `mergely.js` is now unminimized, and added new minimized version `mergely.min.js` feat: Gutter click now scrolls to any line feat: Mergely now emits `resize` event on resize feat: The UI is now non-blocking as diff now runs in background feat: Added support to provide `options.lhs` and `options.rhs` as strings feat: #16 added titles to editor.mergely.com fix: #165 block of changes at end of file are now distinguishable fix: #140 fixed performance issue with large files fix: Fixed issue where canvas markup was not rendered when `viewport` enabled fix: Fixed timing issue where swap sides may not work as expected. fix: Fixed issue where unmarkup did not emit an updated event. fix: Fixed documentation issue where `merge` incorrectly stated: from the specified `side` to the opposite side. fix: Fixed performance issue scrolling fix: Fixed issue where initial render scrolled to first change, showing it at the bottom (as opposed to middle as expected) fix: Fixed issue where line-diffs failed to diff non-alphanumeric characters	2023-04-22 12:41:12 +01:00