eslint-config-isaacscript 1.0.52 → 1.0.55

package/.gitattributes

@@ -1,2 +1,9 @@
 # Prevent Windows systems from cloning this repository with "\r\n" line endings
 core.autocrlf=false
+
+# Prevent people from making merge commits
+# https://www.endoflineblog.com/gitflow-considered-harmful
+pull.rebase=true
+
+# Convert all files to use "\n" line endings
+* text=auto eol=lf

package/.vscode/extensions.json

@@ -3,6 +3,7 @@
 // https://go.microsoft.com/fwlink/?LinkId=827846
 {
   "recommendations": [
+    "esbenp.prettier-vscode", // The TypeScript formatter
     "streetsidesoftware.code-spell-checker", // A spell-checker extension based on cspell
   ]
 }

package/.vscode/settings.json

@@ -20,9 +20,11 @@
 
   // Automatically run the formatter when a JavaScript file is saved
   "[javascript]": {
-    "editor.codeActionsOnSave": [
-      "source.fixAll.eslint",
-    ],
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": true,
+    },
     "editor.tabSize": 2,
   },
 }

package/base.js

@@ -47,11 +47,9 @@ module.exports = {
     // https://github.com/Zamiell/eslint-plugin-no-void-return-type
     "plugin:no-void-return-type/recommended",
 
-    // We use Prettier to automatically format TypeScript files
-    // We want to run Prettier as an ESLint rule so that we can detect non-formatted files in CI
-    // https://github.com/prettier/eslint-plugin-prettier
-    // https://silvenon.com/blog/integrating-and-enforcing-prettier-and-eslint
-    "plugin:prettier/recommended",
+    // This prevents declaring variables without a type
+    // https://github.com/Zamiell/eslint-plugin-no-let-any
+    "plugin:no-let-any/recommended",
 
     // Disable any ESLint rules that conflict with Prettier
     // (otherwise, we will have unfixable ESLint errors)
@@ -226,6 +224,7 @@ module.exports = {
         definedTags: [
           "category", // Used in TypeDoc
           "hidden", // Used in TypeDoc
+          "internal", // Used by TypeScript
           "noResolution", // Used in TypeScriptToLua as a compiler annotation
           "noSelf", // Used in TypeScriptToLua as a compiler annotation
         ],

package/lint.sh

@@ -6,14 +6,6 @@ set -e # Exit on any errors
 # https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-# The latest version of some ESLint plugins require Node.js v16
-NODE_VERSION=$(node --version | cut -c 2-3)
-if (($NODE_VERSION < 16)); then
-  echo "error: requires Node.js version 16"
-  exit 1
-fi
-
 cd "$DIR"
-npx eslint --max-warnings 0 base.js
-npx eslint --max-warnings 0 mod.js
+npx prettier --check base.js mod.js
 echo "Success!"

package/mod.js

@@ -17,6 +17,7 @@ module.exports = {
     // https://github.com/iamturns/eslint-config-airbnb-typescript/blob/master/lib/shared.js
     // This rule throws false positives with API functions
     // It can be worked around by supplying lists of globals to ESLint, but this is ugly
+    // See: https://github.com/typescript-eslint/typescript-eslint/issues/2780
     "@typescript-eslint/no-loop-func": "off",
 
     // Documentation:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-isaacscript",
-  "version": "1.0.52",
+  "version": "1.0.55",
   "description": "An ESLint config for IsaacScript projects.",
   "repository": {
     "type": "git",
@@ -9,8 +9,6 @@
   "license": "GPL-3.0",
   "author": "Zamiell",
   "devDependencies": {
-    "eslint": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "prettier": "^2.5.0"
+    "prettier": "^2.5.1"
   }
 }