Merge pull request #466 from foretagsplatsen/dependabot/npm_and_yarn/…

…foretagsplatsen/eslint-plugin-6.0.0

build(deps-dev): bump @foretagsplatsen/eslint-plugin from 5.0.0 to 6.0.0

.eslintrc.js

@@ -1,10 +1,6 @@
 module.exports = {
 	root: true,
 	extends: ["plugin:@foretagsplatsen/main"],
-	parserOptions: {
-		sourceType: "module",
-		ecmaVersion: 2022,
-	},
 	rules: {
 		"import/no-unused-modules": [
 			"error",

package.json

@@ -42,7 +42,7 @@
     "test": "jasmine-browser-runner runSpecs --config=jasmine-browser.json"
   },
   "devDependencies": {
-    "@foretagsplatsen/eslint-plugin": "^5.0.0",
+    "@foretagsplatsen/eslint-plugin": "^6.0.0",
     "eslint": "^8.56.0",
     "jasmine": "^5.1.0",
     "jasmine-browser-runner": "^2.3.0",

src/htmlCanvas.js

@@ -268,10 +268,10 @@ Array.prototype.appendToBrush = function (brush) {
  * @param {string|HTMLElement} child
  */
 TagBrushConstructor.prototype.appendChild = function (child) {
-	if (this.element.canHaveChildren !== false) {
-		this.element.appendChild(child);
-	} else {
+	if (this.element.canHaveChildren === false) {
 		this.element.text = this.element.text + child.innerHTML;
+	} else {
+		this.element.appendChild(child);
 	}
 };
 
@@ -343,8 +343,8 @@ TagBrushConstructor.prototype.getElement = function (object) {
  */
 TagBrushConstructor.prototype.render = function () {
 	let args = Array.prototype.slice.call(arguments);
-	for (let i = 0; i < args.length; i++) {
-		this.append(args[i]);
+	for (const arg of args) {
+		this.append(arg);
 	}
 	return this;
 };

src/router/hashLocation.js

@@ -154,7 +154,7 @@ const hashLocation = object.subclass((that, my) => {
 
 	function urlFromHash(aHash) {
 		// Remove hash/hash-bang and any leading /
-		return url({ rawUrl: aHash.replace(/^#!?[/]?/, "") });
+		return url({ rawUrl: aHash.replace(/^#!?\/?/, "") });
 	}
 
 	function setCurrentHash(newHash) {

src/router/routeFactory.js

@@ -52,8 +52,7 @@ function segmentFactory(segmentString, options) {
 	let segments = abstractSegment.allSubclasses();
 
 	// Find segment type from string
-	for (let i = 0; i < segments.length; i++) {
-		let segment = segments[i];
+	for (let segment of segments) {
 		if (segment.match(segmentString)) {
 			return segment({
 				segmentString,

src/router/router.js

@@ -443,9 +443,9 @@ const router = object.subclass((that, my) => {
 		}
 
 		// Merge current parameters with supplied parameters
-		let currentParameters = !excludeCurrentParameters
-			? that.getParameters()
-			: {};
+		let currentParameters = excludeCurrentParameters
+			? {}
+			: that.getParameters();
 		let allParameters = merge(currentParameters, suppliedParameters);
 
 		// Fill with defaults if needed

src/router/url.js

@@ -93,11 +93,7 @@ const url = object.subclass((that, my) => {
  * @returns {url}
  */
 url.build = function (path, query) {
-	if (
-		typeof path === "undefined" ||
-		path === null ||
-		typeof path !== "string"
-	) {
+	if (path === undefined || path === null || typeof path !== "string") {
 		throw "accepts only string paths";
 	}
 

src/test/htmlCanvasTest.js

@@ -467,7 +467,7 @@ describe("htmlCanvas", () => {
 	it("can render almost everything", () => {
 		withCanvas((html) => {
 			html.render(0); // toString()
-			html.render(3.14159265359); // toString()
+			html.render(3.141_592_653_59); // toString()
 			html.render("<div>test</div>"); // => DIV element
 			html.render({}); // as attributes but since it have no keys => nothing
 			html.render([]); // as array but since empty => nothing

webpack.aliases.js

@@ -1,4 +1,4 @@
-const path = require("path");
+const path = require("node:path");
 
 module.exports = {
 	klassified: path.resolve(

webpack.base.config.js

@@ -1,4 +1,4 @@
-const path = require("path");
+const path = require("node:path");
 const webpack = require("webpack");
 const aliases = require("./webpack.aliases.js");