From 7b6929c010671fe991164e4885fa8a3ea24e3318 Mon Sep 17 00:00:00 2001
From: Jack Wilburn <jackwilburn@tutanota.com>
Date: Thu, 13 Feb 2025 14:19:34 -0700
Subject: [PATCH 1/2] Fix issues with eslint

---
 .eslintrc.js => .eslintrc.cjs |  0
 packages/app/.eslintrc.js     | 72 -----------------------------------
 2 files changed, 72 deletions(-)
 rename .eslintrc.js => .eslintrc.cjs (100%)
 delete mode 100644 packages/app/.eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.cjs
similarity index 100%
rename from .eslintrc.js
rename to .eslintrc.cjs
diff --git a/packages/app/.eslintrc.js b/packages/app/.eslintrc.js
deleted file mode 100644
index 04cf3aa1..00000000
--- a/packages/app/.eslintrc.js
+++ /dev/null
@@ -1,72 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-  },
-  extends: [
-    'plugin:react/recommended',
-    'plugin:import/recommended',
-    'plugin:@typescript-eslint/recommended',
-    'airbnb',
-    'plugin:import/typescript',
-  ],
-  parser: '@typescript-eslint/parser',
-  parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-    },
-    ecmaVersion: 13,
-    sourceType: 'module',
-  },
-  plugins: ['react', '@typescript-eslint'],
-  root: true,
-  rules: {
-    'react/jsx-filename-extension': [
-      2,
-      { extensions: ['.js', '.jsx', '.ts', '.tsx'] },
-    ],
-    'import/prefer-default-export': 'off',
-    'import/no-extraneous-dependencies': [
-      'error',
-      {
-        devDependencies: ['.storybook/**', '**/stories/**'],
-      },
-    ],
-    'react/function-component-definition': 'off',
-    'no-plusplus': ['warn', { allowForLoopAfterthoughts: true }],
-    'dot-notation': 'off',
-    'import/extensions': [
-      'error',
-      'ignorePackages',
-      {
-        js: 'never',
-        jsx: 'never',
-        ts: 'never',
-        tsx: 'never',
-      },
-    ],
-    'react/jsx-props-no-spreading': 'off',
-    'react/require-default-props': 'off',
-    'react/react-in-jsx-scope': 'off',
-    'react/jsx-wrap-multilines': 'off',
-    'react/no-unknown-property': 'off',
-    'operator-linebreak': 'off',
-    '@typescript-eslint/no-unused-vars': [
-      'warn', // or "error"
-      {
-        argsIgnorePattern: '^_',
-        varsIgnorePattern: '^_',
-        caughtErrorsIgnorePattern: '^_',
-      },
-    ],
-    '@typescript-eslint/no-explicit-any': 'off',
-    'max-len': 'off',
-    'no-unused-vars': 'off',
-    'no-param-reassign': 'off',
-    'import/no-cycle': 'off',
-    'no-underscore-dangle': 'off',
-    'no-nested-ternary': 'off',
-    'jsx-a11y/tabindex-no-positive': 'off',
-    'no-bitwise': 'warn',
-  },
-};

From 4da4cea9229523403f28e2777ad826ab8e7efeef Mon Sep 17 00:00:00 2001
From: Jack Wilburn <jackwilburn@tutanota.com>
Date: Thu, 13 Feb 2025 14:25:52 -0700
Subject: [PATCH 2/2] Fix issue with clearing out the outDir and with resolving
 mui

---
 packages/upset/vite.config.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/upset/vite.config.js b/packages/upset/vite.config.js
index 51746d13..312e4e98 100644
--- a/packages/upset/vite.config.js
+++ b/packages/upset/vite.config.js
@@ -13,14 +13,17 @@ export default defineConfig({
     }),
     react(),
   ],
+  resolve: {
+    alias: {
+      '@mui/system': '@mui/system/esm', // Force ESM usage
+    },
+  },
   server: { hmr: process.env.NODE_TESTING !== 'true' },
-
   // Configuration for building your library.
   // See: https://vitejs.dev/guide/build.html#library-mode
   build: {
     sourcemap: true,
-    emptyOutDir: true,
-    outDir: './dist/',
+    emptyOutDir: false,
     lib: {
       // Could also be a dictionary or array of multiple entry points.
       entry: 'src/index.tsx',