Merge pull request #960 from eyelidlessness/fix/draw-widget-scaling

Fix: preserve high fidelity image data when resizing draw-widget canvas
enketo · Mar 20, 2023 · 1330cd0 · 1330cd0
2 parents f92ac93 + 86ee154
commit 1330cd0
Show file tree

Hide file tree

Showing 16 changed files with 2,433 additions and 759 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -12,7 +12,7 @@
     "plugins": ["chai-friendly", "jsdoc", "prettier", "unicorn"],
     "parserOptions": {
         "sourceType": "module",
-        "ecmaVersion": 2020
+        "ecmaVersion": 2022
     },
     "settings": {
         "jsdoc": {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,9 +1,6 @@
 {
     // Formatting
     "eslint.enable": true,
-    "eslint.options": {
-        "extends": ["../.eslintrc.json"]
-    },
     "eslint.nodePath": "../node_modules/.bin",
     "eslint.validate": ["markdown", "md"],
     "prettier.configPath": ".prettierrc.json",

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -21,6 +21,17 @@ module.exports = (grunt) => {
         '!test/mock/forms.js',
     ];
 
+    const karmaWatchOptions = {
+        autoWatch: true,
+        client: {
+            mocha: {
+                timeout: Number.MAX_SAFE_INTEGER,
+            },
+        },
+        reporters: ['dots'],
+        singleRun: false,
+    };
+
     // Project configuration.
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
@@ -127,16 +138,11 @@ module.exports = (grunt) => {
             },
             watch: {
                 browsers: ['ChromeHeadlessDebug'],
-                options: {
-                    autoWatch: true,
-                    client: {
-                        mocha: {
-                            timeout: Number.MAX_SAFE_INTEGER,
-                        },
-                    },
-                    reporters: ['dots'],
-                    singleRun: false,
-                },
+                options: karmaWatchOptions,
+            },
+            watchBrowsers: {
+                browsers: ['Chrome', 'Firefox', 'Safari'],
+                options: karmaWatchOptions,
             },
         },
         sass: {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,6 +49,9 @@
         "beautify": "npx prettier --write . && grunt eslint:fix"
     },
     "devDependencies": {
+        "@types/chai": "^4.3.4",
+        "@types/mocha": "^10.0.1",
+        "@types/sinon": "^10.0.13",
         "chai": "^4.3.7",
         "chai-as-promised": "^7.1.1",
         "cross-env": "^7.0.3",
@@ -64,12 +67,12 @@
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-react": "^7.32.2",
         "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-unicorn": "^36.0.0",
+        "eslint-plugin-unicorn": "^40.0.0",
         "grunt": "^1.6.1",
         "grunt-concurrent": "^3.0.0",
         "grunt-contrib-connect": "^3.0.0",
         "grunt-contrib-watch": "^1.1.0",
-        "grunt-eslint": "^23.0.0",
+        "grunt-eslint": "^24.0.1",
         "grunt-karma": "^4.0.2",
         "grunt-mocha-test": "^0.13.3",
         "grunt-sass": "^3.1.0",
@@ -111,7 +114,7 @@
         "mergexml": "1.2.3",
         "node-forge": "^1.3.1",
         "openrosa-xpath-evaluator": "^2.0.13",
-        "signature_pad": "2.3.x"
+        "signature_pad": "^4.1.5"
     },
     "volta": {
         "node": "16.5.0",