37fedd05c8
* 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 * chore: tweaked no-start/end styles * feat: dark mode * chore: updated examples * chore(ci): updated webpack * chore(ci): alpha, beta, next branches * chore(ci): test * chore(ci): package-lock.json * chore(ci): ignore alpha, beta, next on branch * fix: fixes firefox scroll-linked effect issue * fix: fixes firefox scroll-linked effect issue * chore: fix css * chore: debug
79 lines
2.3 KiB
JSON
79 lines
2.3 KiB
JSON
{
|
|
"name": "mergely",
|
|
"version": "5.0.0-alpha.2",
|
|
"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": {
|
|
"name": "Jamie Peabody",
|
|
"email": "jamie.peabody@gmail.com",
|
|
"url": "https://mergely.com"
|
|
},
|
|
"homepage": "https://github.com/wickedest/Mergely#readme",
|
|
"bugs": {
|
|
"url": "https://github.com/wickedest/Mergely/issues"
|
|
},
|
|
"repository": {
|
|
"type": "git",
|
|
"url": "git+https://github.com/wickedest/Mergely.git"
|
|
},
|
|
"main": "lib/mergely.js",
|
|
"files": [
|
|
"lib/mergely.js",
|
|
"lib/mergely.min.js",
|
|
"lib/mergely.css",
|
|
"examples",
|
|
"README.md",
|
|
"LICENSE"
|
|
],
|
|
"keywords": [
|
|
"merge",
|
|
"diff",
|
|
"myers"
|
|
],
|
|
"devDependencies": {
|
|
"@babel/core": "^7.1.6",
|
|
"@babel/preset-env": "^7.1.6",
|
|
"@commitlint/cli": "^17.6.1",
|
|
"@commitlint/config-conventional": "^15.0.0",
|
|
"@commitlint/prompt-cli": "^15.0.0",
|
|
"babel-loader": "^8.2.3",
|
|
"babel-plugin-syntax-dynamic-import": "^6.18.0",
|
|
"chai": "^4.3.4",
|
|
"codemirror": "^5.65.12",
|
|
"copy-webpack-plugin": "^6.2.1",
|
|
"css-loader": "^6.5.1",
|
|
"git-conventional-commits": "^1.1.0",
|
|
"html-webpack-plugin": "^4.5.0",
|
|
"http-server": "^14.0.0",
|
|
"husky": "^8.0.3",
|
|
"karma": "^6.3.11",
|
|
"karma-chai": "^0.1.0",
|
|
"karma-chrome-launcher": "^3.1.0",
|
|
"karma-coverage-istanbul-reporter": "^3.0.3",
|
|
"karma-mocha": "^2.0.1",
|
|
"karma-mocha-reporter": "^2.2.5",
|
|
"karma-sourcemap-loader": "^0.4.0",
|
|
"karma-webpack": "^5.0.0",
|
|
"mocha": "^9.1.4",
|
|
"semantic-release": "^21.0.1",
|
|
"simple-mock": "^0.8.0",
|
|
"standard-version": "^9.3.2",
|
|
"style-loader": "^3.3.1",
|
|
"terser-webpack-plugin": "^5.3.7",
|
|
"webpack": "^5.66.0",
|
|
"webpack-cli": "^4.9.1",
|
|
"webpack-dev-server": "^4.7.3",
|
|
"worker-loader": "^3.0.8"
|
|
},
|
|
"scripts": {
|
|
"prepare": "husky install",
|
|
"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",
|
|
"examples": "http-server ./ -p 3000 -o examples/index.html",
|
|
"debug": "karma start --timeout=28000 --no-browsers --single-run=false",
|
|
"test": "karma start",
|
|
"release": "standard-version -a"
|
|
}
|
|
}
|