Merge pull request #1237 from Patternslib/upgrade-dev

thet · web-flow · commit e2f51850c399 · 2025-02-14T13:23:14.000+01:00
Upgrade dev
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/commit-msg b/.husky/commit-msg
diff --git a/Makefile b/Makefile
@@ -27,18 +27,12 @@ PACKAGE_NAME = "patternslib"
 all:: bundle css
 
 
-.PHONY: install
-stamp-yarn install:
+yarn.lock install:
 	$(YARN) install
-	# Install pre commit hook
-	$(YARN) husky install
-	# We have checked in the .husky files, so no need to add the commitlint hook again.
-	# $(YARN) husky add .husky/commit-msg "npx yarn commitlint --edit $1"
-	touch stamp-yarn
 
 
 .PHONY: watch
-watch: stamp-yarn
+watch: install
 	$(YARN) watch
 
 
@@ -47,7 +41,7 @@ build: bundle css
 
 
 .PHONY: depends-parser
-depends-parser:  stamp-yarn
+depends-parser:  install
 	$(PEGJS) -O size -f es src/lib/depends_parse.pegjs
 
 
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,11 @@
+const config_eslint = require("@patternslib/dev/eslint.config.js");
+
+module.exports = [
+    ...config_eslint,
+    {
+        ignores: [
+            // Ignore auto-generated depends_parse.js file.
+            "src/lib/depends_parse.js",
+        ],
+    },
+]
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
         "tippy.js": "^6.3.7"
     },
     "devDependencies": {
-        "@patternslib/dev": "^3.6.0",
+        "@patternslib/dev": "^3.7.2",
         "@patternslib/pat-content-mirror": "^4.0.1",
         "@patternslib/pat-doclock": "^3.0.0",
         "@patternslib/pat-shopping-cart": "^3.0.0",
diff --git a/src/core/parser.js b/src/core/parser.js
@@ -322,7 +322,7 @@ class ArgumentParser {
         if (parameter.match(this.json_param_pattern)) {
             try {
                 return JSON.parse(parameter);
-            } catch (e) {
+            } catch {
                 this.log.warn(`Invalid JSON argument found: ${parameter}.`);
             }
         }
@@ -348,7 +348,7 @@ class ArgumentParser {
                 try {
                     result[name] = this.parameters[name].value($el, name);
                     this.parameters[name].type = typeof result[name];
-                } catch (e) {
+                } catch {
                     this.log.error(`Default function for ${name} failed.`);
                 }
             } else {
diff --git a/src/core/store.js b/src/core/store.js
@@ -125,7 +125,7 @@ var store = {
 // reported in #326
 try {
     store.supported = typeof window.sessionStorage !== "undefined";
-} catch (e) {
+} catch {
     // just ignore.
 }
 
diff --git a/src/core/utils.js b/src/core/utils.js
@@ -608,10 +608,12 @@ const debounce = (func, ms, timer = { timer: null }, postpone = true) => {
     };
 };
 
+// TODO: Remove in next major release.
 const isIE = () => {
     // See: https://stackoverflow.com/a/9851769/1337474
     // Internet Explorer 6-11
-    return /*@cc_on!@*/ false || !!document.documentMode;
+    // eslint-disable-next-line no-constant-binary-expression
+    return /*@cc_on!@*/false || !!document.documentMode;
 };
 
 const jqToNode = (el) => {
diff --git a/src/pat/auto-suggest/auto-suggest.js b/src/pat/auto-suggest/auto-suggest.js
@@ -77,10 +77,14 @@ export default Base.extend({
                     selectionClasses = JSON.parse(this.options.selectionClasses)[
                         obj.text
                     ];
-                } catch (SyntaxError) {
-                    log.error(
-                        "SyntaxError: non-JSON data given to pat-autosuggest (selection-classes)"
-                    );
+                } catch (e) {
+                    if (e instanceof SyntaxError) {
+                        log.error(
+                            "SyntaxError: non-JSON data given to pat-autosuggest (selection-classes)"
+                        );
+                    } else {
+                        throw e;
+                    }
                 }
                 if (selectionClasses) {
                     // According to Cornelis the classes need to be applied on
@@ -161,9 +165,13 @@ export default Base.extend({
         if (this.options.wordsJson?.length) {
             try {
                 words = JSON.parse(this.options.wordsJson);
-            } catch (SyntaxError) {
-                words = [];
-                log.error("SyntaxError: non-JSON data given to pat-autosuggest");
+            } catch (e) {
+                if (e instanceof SyntaxError) {
+                    words = [];
+                    log.error("SyntaxError: non-JSON data given to pat-autosuggest");
+                } else {
+                    throw e;
+                }
             }
             if (!Array.isArray(words)) {
                 words = words.map((v, k) => {
@@ -243,8 +251,12 @@ export default Base.extend({
                     }
                     callback(_data);
                 };
-            } catch (SyntaxError) {
-                log.error("SyntaxError: non-JSON data given to pat-autosuggest");
+            } catch (e) {
+                if (e instanceof SyntaxError) {
+                    log.error("SyntaxError: non-JSON data given to pat-autosuggest");
+                } else {
+                    throw e;
+                }
             }
         }
 
diff --git a/src/pat/auto-suggest/auto-suggest.test.js b/src/pat/auto-suggest/auto-suggest.test.js
@@ -30,7 +30,7 @@ var testutils = {
         var cfg = c || {};
         return $("<input/>", {
             "id": cfg.id || "select2",
-            "data-pat-autosuggest": "" || cfg.data,
+            "data-pat-autosuggest": cfg.data,
             "class": "pat-autosuggest",
             "type": "text",
         }).appendTo($("div#lab"));
diff --git a/src/pat/inject/inject.js b/src/pat/inject/inject.js
@@ -280,7 +280,7 @@ const inject = {
             if (cfg.delay) {
                 try {
                     cfg.delay = utils.parseTime(cfg.delay);
-                } catch (e) {
+                } catch {
                     log.warn("Invalid delay value: ", cfg.delay);
                     cfg.delay = null;
                 }
diff --git a/src/pat/masonry/masonry.js b/src/pat/masonry/masonry.js
@@ -96,7 +96,7 @@ export default Base.extend({
         var containerStyle;
         try {
             containerStyle = JSON.parse(this.options.containerStyle);
-        } catch (e) {
+        } catch {
             containerStyle = { position: "relative" };
             log.warn(
                 "Invalid value passed in as containerStyle. Needs to " +
diff --git a/src/pat/push/push.js b/src/pat/push/push.js
@@ -55,7 +55,7 @@ export default Base.extend({
         try {
             const response = await fetch(this.options.url);
             data = await response.text();
-        } catch (e) {
+        } catch {
             logger.error(
                 `Could not fetch from ${this.options.url} on push-id ${this.options.pushId}.`
             );
@@ -110,7 +110,7 @@ export default Base.extend({
         try {
             const response = await fetch(this.options.url);
             data = await response.json();
-        } catch (e) {
+        } catch {
             logger.error(
                 `Could not fetch from ${this.options.url} on push-id ${this.options.pushId}.`
             );
diff --git a/src/pat/stacks/stacks.js b/src/pat/stacks/stacks.js
@@ -67,7 +67,7 @@ class Pattern extends BasePattern {
         if (selected) {
             try {
                 this.$active = $sheets.filter("#" + selected);
-            } catch (e) {
+            } catch {
                 selected = undefined;
             }
         }
diff --git a/src/pat/tooltip/tooltip.js b/src/pat/tooltip/tooltip.js
@@ -354,7 +354,7 @@ class Pattern extends BasePattern {
                 });
                 const text = await response.text();
                 content = await handler(text, url, selector);
-            } catch (e) {
+            } catch {
                 log.error("Error on ajax request. ${e}");
             }
         } else if (selector) {
diff --git a/src/pat/tooltip/tooltip.test.js b/src/pat/tooltip/tooltip.test.js
@@ -23,7 +23,7 @@ const testutils = {
             "id": cfg.id || "tooltip",
             "href": cfg.href || "#anchor",
             "title": cfg.title || "tooltip title attribute",
-            "data-pat-tooltip": "" || cfg.data,
+            "data-pat-tooltip": cfg.data,
             "class": "pat-tooltip",
         })
             .text(cfg.content)
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ class ArgumentParser {`
`322`	`322`	`if (parameter.match(this.json_param_pattern)) {`
`323`	`323`	`try {`
`324`	`324`	`return JSON.parse(parameter);`
`325`		`- } catch (e) {`
	`325`	`+ } catch {`
`326`	`326`	this.log.warn(`Invalid JSON argument found: ${parameter}.`);
`327`	`327`	`}`
`328`	`328`	`}`
`@@ -348,7 +348,7 @@ class ArgumentParser {`
`348`	`348`	`try {`
`349`	`349`	`result[name] = this.parameters[name].value($el, name);`
`350`	`350`	`this.parameters[name].type = typeof result[name];`
`351`		`- } catch (e) {`
	`351`	`+ } catch {`
`352`	`352`	this.log.error(`Default function for ${name} failed.`);
`353`	`353`	`}`
`354`	`354`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ var store = {`
`125`	`125`	`// reported in #326`
`126`	`126`	`try {`
`127`	`127`	`store.supported = typeof window.sessionStorage !== "undefined";`
`128`		`-} catch (e) {`
	`128`	`+} catch {`
`129`	`129`	`// just ignore.`
`130`	`130`	`}`
`131`	`131`