update fire p2 APL, fix some prettier issues

darandin · Mar 12, 2024 · fdfbd8b · fdfbd8b
1 parent c4bbefe
commit fdfbd8b
Show file tree

Hide file tree

Showing 5 changed files with 349 additions and 219 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+*.json
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,8 +1,8 @@
 /**
- * @type {import("prettier").Options)}
+ * @type {import("prettier").Config}
  */
 module.exports = {
-	printWidth: 100,
+	printWidth: 160,
 	useTabs: true,
 	tabWidth: 4,
 	semi: true,

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,130 +2,96 @@
 	"eslint.validate": ["javascript", "typescript"],
 	"eslint.nodePath": "./node_modules",
 	"eslint.workingDirectories": ["."],
-	"[javascript]": {
+	"[javascript][javascriptreact][typescript][typescriptreact][html][scss]": {
 		"editor.codeActionsOnSave": {
-            "source.fixAll.eslint": "always"
+			// "source.fixAll.eslint": "explicit"
 		}
 	},
-	"[javascriptreact]": {
-		"editor.codeActionsOnSave": {
-            "source.fixAll.eslint": "always"
-		}
-	},
-	"[typescript]": {
-		"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": "always"
-		}
-	},
-	"[typescriptreact]": {
-		"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": "always"
+	"json.schemas": [
+		{
+			"fileMatch": ["*.apl.json"],
+			"url": "./schemas/apl_rotation.schema.json"
+		},
+		{
+			"fileMatch": ["*.gear.json"],
+			"url": "./schemas/gear.schema.json"
 		}
-	},
-	"[scss]": {
-		"editor.codeActionsOnSave": {
-            "source.fixAll.eslint": "always"
-		}
-	},
-	"[html]": {
-		"editor.codeActionsOnSave": {
-            "source.fixAll.eslint": "always"
-        }
-	},
-    "json.schemas": [
-        {
-            "fileMatch": [
-                "*.apl.json"
-            ],
-            "url": "./schemas/apl_rotation.schema.json"
-        },
-        {
-            "fileMatch": [
-                "*.gear.json"
-            ],
-            "url": "./schemas/gear.schema.json"
-        }
-    ],
-    "Lua.diagnostics.globals": [
-        "FONT_COLOR_CODE_CLOSE",
-        "SELECTED_CHAT_FRAME",
-        "DEFAULT_CHAT_FRAME",
-        "InterfaceOptions_AddCategory",
-        "NORMAL_FONT_COLOR",
-        "GameFontNormal",
-        "GameFontHighlight",
-        "ACCEPT",
-        "CANCEL",
-        "GameFontHighlightLarge",
-        "GameFontHighlightSmall",
-        "SlashCmdList",
-        "hash_SlashCmdList",
-        "NORMAL_FONT_COLOR_CODE",
-        "CLOSE",
-        "PanelTemplates_TabResize",
-        "PanelTemplates_SetDisabledTabState",
-        "PanelTemplates_SelectTab",
-        "PanelTemplates_DeselectTab",
-        "SetDesaturation",
-        "ColorPickerFrame",
-        "OpacitySliderFrame",
-        "ChatFontNormal",
-        "OKAY",
-        "NOT_BOUND",
-        "NUM_BAG_SLOTS",
-        "NUM_BANKBAGSLOTS",
-        "InterfaceOptionsFrame_OpenToCategory",
-        "BANK_CONTAINER",
-        "CreateFrame",
-        "geterrorhandler",
-        "IsLoggedIn",
-        "PlaySound",
-        "GetRealmName",
-        "UnitName",
-        "UnitClass",
-        "UnitRace",
-        "UnitFactionGroup",
-        "GetCurrentRegion",
-        "GetLocale",
-        "C_Container",
-        "GetTalentInfo",
-        "UnitFullName",
-        "GetPlayerInfoByGUID",
-        "UnitLevel",
-        "tInvert",
-        "GetItemInfo",
-        "IsEquippableItem",
-        "UnitGUID",
-        "GetSpellInfo",
-        "GetInventorySlotInfo",
-        "GetInventoryItemLink",
-        "max",
-        "min",
-        "ceil",
-        "BackdropTemplateMixin",
-        "floor",
-        "GetCursorInfo",
-        "ClearCursor",
-        "hooksecurefunc",
-        "GetMacroInfo",
-        "IsShiftKeyDown",
-        "IsControlKeyDown",
-        "IsAltKeyDown",
-        "issecurevariable",
-        "GetTime",
-        "C_Timer",
-        "format",
-        "gsub",
-        "strfind",
-        "strsub",
-        "strchar",
-        "strbyte",
-        "tinsert",
-        "UIParent"
-    ],
-    "[javascript][scss][typescript]": {
-        "editor.codeActionsOnSave": {
-            "source.fixAll.eslint": "explicit"
-        }
-    }
+	],
+	"Lua.diagnostics.globals": [
+		"FONT_COLOR_CODE_CLOSE",
+		"SELECTED_CHAT_FRAME",
+		"DEFAULT_CHAT_FRAME",
+		"InterfaceOptions_AddCategory",
+		"NORMAL_FONT_COLOR",
+		"GameFontNormal",
+		"GameFontHighlight",
+		"ACCEPT",
+		"CANCEL",
+		"GameFontHighlightLarge",
+		"GameFontHighlightSmall",
+		"SlashCmdList",
+		"hash_SlashCmdList",
+		"NORMAL_FONT_COLOR_CODE",
+		"CLOSE",
+		"PanelTemplates_TabResize",
+		"PanelTemplates_SetDisabledTabState",
+		"PanelTemplates_SelectTab",
+		"PanelTemplates_DeselectTab",
+		"SetDesaturation",
+		"ColorPickerFrame",
+		"OpacitySliderFrame",
+		"ChatFontNormal",
+		"OKAY",
+		"NOT_BOUND",
+		"NUM_BAG_SLOTS",
+		"NUM_BANKBAGSLOTS",
+		"InterfaceOptionsFrame_OpenToCategory",
+		"BANK_CONTAINER",
+		"CreateFrame",
+		"geterrorhandler",
+		"IsLoggedIn",
+		"PlaySound",
+		"GetRealmName",
+		"UnitName",
+		"UnitClass",
+		"UnitRace",
+		"UnitFactionGroup",
+		"GetCurrentRegion",
+		"GetLocale",
+		"C_Container",
+		"GetTalentInfo",
+		"UnitFullName",
+		"GetPlayerInfoByGUID",
+		"UnitLevel",
+		"tInvert",
+		"GetItemInfo",
+		"IsEquippableItem",
+		"UnitGUID",
+		"GetSpellInfo",
+		"GetInventorySlotInfo",
+		"GetInventoryItemLink",
+		"max",
+		"min",
+		"ceil",
+		"BackdropTemplateMixin",
+		"floor",
+		"GetCursorInfo",
+		"ClearCursor",
+		"hooksecurefunc",
+		"GetMacroInfo",
+		"IsShiftKeyDown",
+		"IsControlKeyDown",
+		"IsAltKeyDown",
+		"issecurevariable",
+		"GetTime",
+		"C_Timer",
+		"format",
+		"gsub",
+		"strfind",
+		"strsub",
+		"strchar",
+		"strbyte",
+		"tinsert",
+		"UIParent"
+	]
 }