bump

CHANGES.md

@@ -1,5 +1,8 @@
 # Changes
 
+## 4.2.1:
+* chore: updated dependencies, cleared security issues
+
 ## 4.2.0:
 * minor: added new option `ignoreaccents` to ignore accented characters.
 

karma.conf.js

@@ -53,11 +53,13 @@ module.exports = function(config) {
 				}
 			},
 			plugins: [
-				new CopyWebpackPlugin([{
+                new CopyWebpackPlugin({
+                    patterns: [{
                         from: 'src/mergely.css',
                         to: 'mergely.css',
                         toType: 'file'
-				}])
+                    }]
+                })
 			]
 		},
 		webpackServer: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mergely",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "A javascript UI for diff/merge",
   "directories": {
     "doc": "doc",
@@ -36,34 +36,33 @@
   "devDependencies": {
     "@babel/core": "^7.1.6",
     "@babel/preset-env": "^7.1.6",
-    "@webpack-cli/init": "^0.1.2",
+    "@webpack-cli/init": "^1.0.1",
     "babel-loader": "^8.0.4",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "chai": "^4.1.2",
     "codemirror": "^5.50.2",
-    "copy-webpack-plugin": "^4.6.0",
+    "copy-webpack-plugin": "^6.2.1",
-    "css-loader": "^0.28.11",
+    "css-loader": "^5.0.0",
-    "file-loader": "^1.1.5",
+    "file-loader": "^6.1.1",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.5.0",
-    "image-webpack-loader": "^3.4.2",
+    "image-webpack-loader": "^7.0.1",
-    "jquery": "^3.2.1",
+    "jquery": "^3.5.1",
-    "karma": "^3.1.1",
+    "karma": "^5.2.3",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-coverage-istanbul-reporter": "^1.3.0",
-    "karma-mocha": "^1.3.0",
+    "karma-mocha": "^2.0.1",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-webpack": "^2.0.9",
+    "karma-webpack": "^4.0.2",
-    "mocha": "^4.0.1",
+    "mocha": "^8.1.3",
-    "style-loader": "^0.23.0",
+    "style-loader": "^2.0.0",
-    "uglifyjs-webpack-plugin": "^2.0.1",
+    "webpack": "^4.44.2",
-    "webpack": "^4.20.2",
+    "webpack-cli": "^4.0.0",
-    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.11.0"
-    "webpack-dev-server": "^3.1.9"
   },
   "scripts": {
     "build": "rm -rf lib && webpack --config ./webpack.prod.js",
-    "start": "webpack-dev-server -w --debug --progress --colors --config ./webpack.dev.js --content-base ./dist --inline --hot --host 0.0.0.0",
+    "start": "webpack serve --config webpack.dev.js",
     "test": "karma start",
     "test:chrome": "karma start --browsers Chrome --singleRun=false"
   }

tests/mergely.spec.js

@@ -586,6 +586,7 @@ describe('mergely', function () {
 				done();
 			});
 		});
+	});
 
 	it('should not be vulnerable to XSS', function (done) {
 		function initXSS(options) {
@@ -611,5 +612,24 @@ describe('mergely', function () {
 			done();
 		});
 	});
+
+	it('should ignore accented characters', function (done) {
+		$(document).ready(() => {
+			const editor = init({
+				height: 100,
+				license: 'lgpl-separate-notice',
+				ignoreaccents: true,
+				lhs: (setValue) => setValue('comunicação'),
+				rhs: (setValue) => setValue('comunicacao')
+			});
+			const { mergely } = $('#mergely');
+
+			$('#mergely').on('updated', () => {
+				console.log('updated');
+				const diff = $('#mergely').mergely('diff');;
+				expect(diff).to.equal('');
+				done();
+			});
+		});
 	});
 });

webpack.dev.js

@@ -19,10 +19,7 @@ module.exports = {
 		}, {
 			test: /\.css$/,
 			use: [{
-				loader: 'style-loader',
+				loader: 'style-loader'
-				options: {
-					sourceMap: true
-				}
 			}, {
 				loader: 'css-loader'
 			}]
@@ -69,11 +66,9 @@ module.exports = {
 					test: /[\\/]node_modules[\\/]/
 				}
 			},
-
 			chunks: 'async',
 			minChunks: 1,
-			minSize: 30000,
+			minSize: 30000
-			name: true
 		}
 	}
 }

webpack.prod.js

@@ -29,10 +29,12 @@ module.exports = {
 		CodeMirror: 'CodeMirror'
 	},
 	plugins: [
-		new CopyWebpackPlugin([{
+		new CopyWebpackPlugin({
+			patterns: [{
 				from: 'src/mergely.css',
 				to: 'mergely.css',
 				toType: 'file'
-		}])
+			}]
+		})
 	]
 };