Merge from upstream

Author: SebastianMC

esbuild.config.mjs

@@ -1,6 +1,6 @@
 import esbuild from "esbuild";
 import process from "process";
-import builtins from 'builtin-modules'
+import { builtinModules } from 'node:module';
 
 const banner =
 `/*
@@ -15,25 +15,25 @@ const context = await esbuild.context({
 	banner: {
 		js: banner,
 	},
-	entryPoints: ['src/main.ts'],
+	entryPoints: ["src/main.ts"],
 	bundle: true,
 	external: [
-		'obsidian',
-		'electron',
-		'@codemirror/autocomplete',
-		'@codemirror/collab',
-		'@codemirror/commands',
-		'@codemirror/language',
-		'@codemirror/lint',
-		'@codemirror/search',
-		'@codemirror/state',
-		'@codemirror/view',
-		'@lezer/common',
-		'@lezer/highlight',
-		'@lezer/lr',
-		...builtins],
-	format: 'cjs',
-	target: 'es2018',
+		"obsidian",
+		"electron",
+		"@codemirror/autocomplete",
+		"@codemirror/collab",
+		"@codemirror/commands",
+		"@codemirror/language",
+		"@codemirror/lint",
+		"@codemirror/search",
+		"@codemirror/state",
+		"@codemirror/view",
+		"@lezer/common",
+		"@lezer/highlight",
+		"@lezer/lr",
+		...builtinModules],
+	format: "cjs",
+	target: "es2018",
 	logLevel: "info",
 	sourcemap: prod ? false : 'inline',
 	minify: prod,

package.json

@@ -7,8 +7,8 @@
 		"dev": "node esbuild.config.mjs",
 		"build": "tsc -noEmit -skipLibCheck && node esbuild.config.mjs production",
 		"version": "node version-bump.mjs && git add manifest.json versions.json",
-		"test": "jest"
-	},
+        "test": "jest"
+    },
 	"keywords": [
 		"obsidian",
 		"custom sorting"
@@ -17,18 +17,20 @@
 	"repository": "https://github.com/SebastianMC/obsidian-custom-sort",
 	"license": "MIT",
 	"devDependencies": {
-		"@types/jest": "^28.1.2",
 		"@types/node": "^16.11.6",
-		"@typescript-eslint/eslint-plugin": "5.29.0",
-		"@typescript-eslint/parser": "5.29.0",
-		"builtin-modules": "3.3.0",
-		"esbuild": "0.17.3",
+         "eslint-plugin-obsidianmd": "0.1.9",
+         "globals": "14.0.0",
+         "tslib": "2.8.1",
+         "typescript": "^5.8.3",
+         "typescript-eslint": "8.35.1",
+		"esbuild": "0.25.5",
 		"eslint": "^8.29.0",
+        "@eslint/js": "9.30.1",
+        "jiti": "2.6.1",
 		"jest": "^29.7.0",
 		"monkey-around": "^3.0.0",
 		"obsidian": "^1.7.2",
 		"ts-jest": "^29.2.5",
-		"tslib": "2.8.1",
-		"typescript": "5.7.2"
-	}
+        "@types/jest": "^28.1.2"
+    }
 }

version-bump.mjs

@@ -3,12 +3,15 @@ import { readFileSync, writeFileSync } from "fs";
 const targetVersion = process.env.npm_package_version;
 
 // read minAppVersion from manifest.json and bump version to target version
-let manifest = JSON.parse(readFileSync("manifest.json", "utf8"));
+const manifest = JSON.parse(readFileSync("manifest.json", "utf8"));
 const { minAppVersion } = manifest;
 manifest.version = targetVersion;
 writeFileSync("manifest.json", JSON.stringify(manifest, null, "\t"));
 
 // update versions.json with target version and minAppVersion from manifest.json
-let versions = JSON.parse(readFileSync("versions.json", "utf8"));
-versions[targetVersion] = minAppVersion;
-writeFileSync("versions.json", JSON.stringify(versions, null, "\t"));
+// but only if the target version is not already in versions.json
+const versions = JSON.parse(readFileSync('versions.json', 'utf8'));
+if (!Object.values(versions).includes(minAppVersion)) {
+    versions[targetVersion] = minAppVersion;
+    writeFileSync('versions.json', JSON.stringify(versions, null, '\t'));
+}