convert prettier to eslint plugin

defenseunicorns · Apr 26, 2024 · 7021fcf · 7021fcf
1 parent 03cdee8
commit 7021fcf
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 27 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -27,12 +27,10 @@ repos:
     rev: v8.56.0
     hooks:
       - id: eslint
-        files: \.(js|jsx|ts|tsx|svelte)$ # apply eslint to the provided filetypes
+        name: ESLint and Prettier
+        files: \.(js|jsx|ts|tsx|svelte|cjs|mjs)$ # *.js, *.jsx, *.ts, *.tsx and *.svelte
         types: [file]
-
-  # Prettier Code formatter
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.1.0"
-    hooks:
-      - id: prettier
-        files: \.(js|jsx|ts|tsx|svelte)$ # apply prettier to the provided filetypes
+        additional_dependencies:
+            - [email protected]
+            - [email protected]
+            - [email protected]
diff --git a/src/leapfrogai_ui/.eslintrc.cjs b/src/leapfrogai_ui/.eslintrc.cjs
@@ -5,10 +5,10 @@ module.exports = {
 		'eslint:recommended',
 		'plugin:@typescript-eslint/recommended',
 		'plugin:svelte/recommended',
-		'prettier'
+		'plugin:prettier/recommended'
 	],
 	parser: '@typescript-eslint/parser',
-	plugins: ['@typescript-eslint'],
+	plugins: ['@typescript-eslint', 'prettier', 'svelte'],
 	parserOptions: {
 		sourceType: 'module',
 		ecmaVersion: 2020,
@@ -29,6 +29,7 @@ module.exports = {
 		}
 	],
 	rules: {
-		'no-undef': 'off'
+		'no-undef': 'off',
+		'prettier/prettier': 'error'
 	}
 };
diff --git a/src/leapfrogai_ui/.prettierrc b/src/leapfrogai_ui/.prettierrc
@@ -4,6 +4,5 @@
 	"singleQuote": true,
 	"trailingComma": "none",
 	"printWidth": 100,
-	"plugins": ["prettier-plugin-svelte"],
 	"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
 }
diff --git a/src/leapfrogai_ui/Dockerfile b/src/leapfrogai_ui/Dockerfile
@@ -20,4 +20,4 @@ ENV NODE_ENV=production
 ENV BODY_SIZE_LIMIT=Infinity
 ENV PROTOCOL_HEADER=x-forwarded-proto
 ENV HOST_HEADER=x-forwarded-host
-CMD ["build"]
+CMD ["build"]
diff --git a/src/leapfrogai_ui/Makefile b/src/leapfrogai_ui/Makefile
@@ -4,4 +4,4 @@ docker-build:
 	docker build -t ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui:${VERSION} .
 
 zarf-build:
-	zarf package create . --confirm --set IMAGE_VERSION=${VERSION}
+	zarf package create . --confirm --set IMAGE_VERSION=${VERSION}
diff --git a/src/leapfrogai_ui/package-lock.json b/src/leapfrogai_ui/package-lock.json
diff --git a/src/leapfrogai_ui/package.json b/src/leapfrogai_ui/package.json
@@ -9,8 +9,8 @@
 		"test": "npm run test:integration && npm run test:unit",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-		"lint": "prettier --check . && eslint .",
-		"format": "prettier --write .",
+		"lint": "eslint .",
+		"format": "eslint . --fix",
 		"test:integration": "playwright test",
 		"test:integration:ui": "playwright test --ui",
 		"test:unit": "vitest run",
@@ -42,11 +42,10 @@
 		"eslint": "^8.56.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-svelte": "^2.35.1",
+		"eslint-plugin-prettier": "5.0.0",
 		"husky": "^9.0.11",
 		"jsdom": "^24.0.0",
 		"otpauth": "^9.2.2",
-		"prettier": "^3.1.1",
-		"prettier-plugin-svelte": "^3.1.2",
 		"sass": "^1.71.1",
 		"svelte": "^4.2.12",
 		"svelte-check": "^3.6.9",