Merge remote-tracking branch 'upstream/master' into merge-upstream-1

# Conflicts:
#	manifest.json
#	package.json
#	styles.css
#	tsconfig.json
#	versions.json

esbuild.config.mjs

@@ -21,30 +21,20 @@ esbuild.build({
 		'obsidian',
 		'electron',
 		'@codemirror/autocomplete',
-		'@codemirror/closebrackets',
 		'@codemirror/collab',
 		'@codemirror/commands',
-		'@codemirror/comment',
-		'@codemirror/fold',
-		'@codemirror/gutter',
-		'@codemirror/highlight',
-		'@codemirror/history',
 		'@codemirror/language',
 		'@codemirror/lint',
-		'@codemirror/matchbrackets',
-		'@codemirror/panel',
-		'@codemirror/rangeset',
-		'@codemirror/rectangular-selection',
 		'@codemirror/search',
 		'@codemirror/state',
-		'@codemirror/stream-parser',
-		'@codemirror/text',
-		'@codemirror/tooltip',
 		'@codemirror/view',
+		'@lezer/common',
+		'@lezer/highlight',
+		'@lezer/lr',
 		...builtins],
 	format: 'cjs',
 	watch: !prod,
-	target: 'es2016',
+	target: 'es2018',
 	logLevel: "info",
 	sourcemap: prod ? false : 'inline',
 	minify: prod,

package.json

@@ -18,15 +18,15 @@
 	"devDependencies": {
 		"@types/jest": "^28.1.2",
 		"@types/node": "^16.11.6",
-		"@typescript-eslint/eslint-plugin": "^5.2.0",
+		"@typescript-eslint/eslint-plugin": "5.29.0",
-		"@typescript-eslint/parser": "^5.2.0",
+		"@typescript-eslint/parser": "5.29.0",
-		"builtin-modules": "^3.2.0",
+		"builtin-modules": "3.3.0",
-		"esbuild": "0.13.12",
+		"esbuild": "0.14.47",
 		"jest": "^28.1.1",
 		"monkey-around": "^2.3.0",
 		"obsidian": "^0.15.4",
 		"ts-jest": "^28.0.5",
-		"tslib": "2.3.1",
+		"tslib": "2.4.0",
-		"typescript": "4.4.4"
+		"typescript": "4.7.4"
 	}
 }

tsconfig.json

@@ -11,6 +11,7 @@
 	  "moduleResolution": "node",
 	  "importHelpers": true,
 	  "isolatedModules": true,
+	  "strictNullChecks": true,
     "lib": [
 		  "DOM",
 		  "ES5",