Merge branch 'main' into pr/TheAfroOfDoom/1180

SpyglassMC · May 24, 2024 · fe4db37 · fe4db37
2 parents 0548d94 + a8431ea
commit fe4db37
Show file tree

Hide file tree

Showing 44 changed files with 3,501 additions and 1,105 deletions.
diff --git a/.dprint.jsonc b/.dprint.jsonc
@@ -13,10 +13,8 @@
   ],
   "excludes": [
     "**/node_modules",
-    // cannot format due to bug of dprint
-    "packages/java-edition/src/mcfunction/tree/patch.ts"
   ],
   "plugins": [
-    "https://plugins.dprint.dev/typescript-0.85.0.wasm"
+    "https://plugins.dprint.dev/typescript-0.90.5.wasm"
   ]
 }
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -12,7 +12,8 @@ module.exports = {
 		"project": "./packages/**/tsconfig.json"
 	},
 	"plugins": [
-		"@typescript-eslint"
+		"@typescript-eslint",
+		"import"
 	],
 	"ignorePatterns": [
 		"**/*.js",
@@ -38,6 +39,7 @@ module.exports = {
 		"@typescript-eslint/prefer-for-of": "warn",
 		"@typescript-eslint/prefer-readonly": "warn",
 		"@typescript-eslint/no-floating-promises": "error",
+		"import/no-duplicates": "error",
 		"indent": "off",
 		"no-fallthrough": "warn",
 		"no-restricted-syntax": [

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -26,6 +26,7 @@
 			"request": "launch",
 			"name": "Run Unit Tests",
 			"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+			"args": ["--timeout", "999999"],
 			"console": "integratedTerminal",
 			"internalConsoleOptions": "neverOpen"
 		}

diff --git a/__snapshots__/packages/core/test-out/parser/long.spec.js b/__snapshots__/packages/core/test-out/parser/long.spec.js