From 2ce83f9ae56cae3151f49a78d0809cb00401bbeb Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paul.lol>
Date: Fri, 28 Jul 2023 12:06:47 -0500
Subject: [PATCH] fix lingering eslint errors

---
 .eslintrc.cjs             | 17 ++++++++++++++---
 src/components/Amount.tsx | 10 +++++-----
 tailwind.config.cjs       | 22 ++++++++--------------
 tsconfig.json             |  5 ++++-
 4 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 0e6bb18..f5d3303 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,7 +1,8 @@
 module.exports = {
     env: {
         browser: true,
-        es2021: true
+        es2021: true,
+        node: true
     },
     extends: [
         "eslint:recommended",
@@ -10,11 +11,21 @@ module.exports = {
         "plugin:import/typescript",
         "plugin:import/recommended"
     ],
-    overrides: [],
+    overrides: [
+        {
+            files: ["**/*.cjs"], // Specify the file pattern for CJS files
+            parserOptions: {
+                sourceType: "script" // Treat the CJS files as CommonJS modules
+            },
+            rules: {
+                "@typescript-eslint/no-var-requires": "off" // Disable this specific rule for CJS files
+            }
+        }
+    ],
     parser: "@typescript-eslint/parser",
     parserOptions: {
         tsconfigRootDir: "./",
-        project: ["./tsconfig.json"],
+        project: "tsconfig.json",
         ecmaVersion: "latest",
         sourceType: "module",
         ecmaFeatures: {
diff --git a/src/components/Amount.tsx b/src/components/Amount.tsx
index 892494b..bccd95e 100644
--- a/src/components/Amount.tsx
+++ b/src/components/Amount.tsx
@@ -58,10 +58,10 @@ export function AmountSats(props: {
                             props.amountSats && Number(props.amountSats) === 1
                         }
                     >
-                            {i18n.t("common.sat")}
-                        </Show>
-                    </span>
-                </h1>
+                        {i18n.t("common.sat")}
+                    </Show>
+                </span>
+            </h1>
         </div>
     );
 }
@@ -71,7 +71,7 @@ export function AmountFiat(props: {
     loading?: boolean;
     denominationSize?: "sm" | "lg" | "xl";
 }) {
-    const i18n = useI18n()
+    const i18n = useI18n();
     const [state, _] = useMegaStore();
 
     const amountInUsd = () =>
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 90af3fa..23d406c 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -1,4 +1,4 @@
-const plugin = require('tailwindcss/plugin')
+const plugin = require("tailwindcss/plugin");
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
@@ -35,9 +35,7 @@ module.exports = {
                 "m-grey-700": "hsla(0, 0%, 25%, 1)",
                 "m-grey-750": "hsla(0, 0%, 17%, 1)",
                 "m-grey-800": "hsla(0, 0%, 12%, 1)",
-                "m-grey-900": "hsla(0, 0%, 9%, 1)",
-                "m-grey-750": "hsla(0, 0%, 17%, 1)",
-                "m-grey-400": "hsla(0, 0%, 64%, 1)"
+                "m-grey-900": "hsla(0, 0%, 9%, 1)"
             },
             backgroundImage: {
                 "fade-to-blue":
@@ -56,9 +54,9 @@ module.exports = {
                 "inner-button-disabled":
                     "2px 2px 4px rgba(0, 0, 0, 0.05), inset 2px 2px 4px rgba(255, 255, 255, 0.05), inset -2px -2px 6px rgba(0, 0, 0, 0.1)",
                 "fancy-card": "0px 4px 4px rgba(0, 0, 0, 0.1)",
-                "subtle-bevel": 
+                "subtle-bevel":
                     "inset -4px -4px 6px 0 rgba(0, 0, 0, 0.10), inset 4px 4px 4px 0 rgba(255, 255, 255, 0.10)",
-                above: "0px -4px 10px rgba(0, 0, 0, 0.25)",
+                above: "0px -4px 10px rgba(0, 0, 0, 0.25)"
             },
             textShadow: {
                 button: "1px 1px 0px rgba(0, 0, 0, 0.4)"
@@ -71,20 +69,16 @@ module.exports = {
         plugin(function ({ addUtilities }) {
             const newUtilities = {
                 ".safe-top": {
-                    paddingTop: "constant(safe-area-inset-top)",
-                    paddingTop: "env(safe-area-inset-top)"
+                    paddingTop: "constant(safe-area-inset-top)"
                 },
                 ".safe-left": {
-                    paddingLeft: "constant(safe-area-inset-left)",
-                    paddingLeft: "env(safe-area-inset-left)"
+                    paddingLeft: "constant(safe-area-inset-left)"
                 },
                 ".safe-right": {
-                    paddingRight: "constant(safe-area-inset-right)",
-                    paddingRight: "env(safe-area-inset-right)"
+                    paddingRight: "constant(safe-area-inset-right)"
                 },
                 ".safe-bottom": {
-                    paddingBottom: "constant(safe-area-inset-bottom)",
-                    paddingBottom: "env(safe-area-inset-bottom)"
+                    paddingBottom: "constant(safe-area-inset-bottom)"
                 },
                 ".disable-scrollbars": {
                     scrollbarWidth: "none",
diff --git a/tsconfig.json b/tsconfig.json
index 84672c3..f957600 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,10 @@
         "src/**/*",
         "src/routes/**/*",
         "tailwind.config.cjs",
-        ".eslintrc.cjs"
+        "playwright.config.ts",
+        "vite.config.ts",
+        ".eslintrc.cjs",
+        "e2e/**/*"
     ],
     "exclude": [
         "node_modules",