Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
fax1ty committed Nov 17, 2024
2 parents bc4d20b + 94f28d6 commit 8a9722b
Show file tree
Hide file tree
Showing 34 changed files with 778 additions and 338 deletions.
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"endOfLine": "auto",
"singleQuote": false,
"trailingComma": "es5",
"plugins": ["prettier-plugin-tailwindcss"]
}
Binary file modified bun.lockb
Binary file not shown.
85 changes: 85 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import eslintPluginTypeScript from "@typescript-eslint/eslint-plugin";
import eslintParserTypeScript from "@typescript-eslint/parser";
import eslintConfigPrettier from "eslint-config-prettier";
import eslintPluginImport from "eslint-plugin-import";
import eslintPluginPrettier from "eslint-plugin-prettier";
import eslintPluginReact from "eslint-plugin-react";
import eslintPluginReactHooks from "eslint-plugin-react-hooks";
import eslintPluginSimpleImportSort from "eslint-plugin-simple-import-sort";
import eslintPluginTailwind from "eslint-plugin-tailwindcss";

export default [
{
ignores: [
"node_modules/**",
"**/dist/**",
"**/.prettierrc.*",
"src-tauri/**",
],
},
{
files: ["**/*.{js,jsx,ts,tsx}"],
languageOptions: {
ecmaVersion: "latest",
sourceType: "module",
parser: eslintParserTypeScript,
parserOptions: {
ecmaFeatures: {
jsx: true,
},
},
},
plugins: {
react: eslintPluginReact,
"@typescript-eslint": eslintPluginTypeScript,
prettier: eslintPluginPrettier,
import: eslintPluginImport,
"simple-import-sort": eslintPluginSimpleImportSort,
"react-hooks": eslintPluginReactHooks,
},
rules: {
...eslintPluginReact.configs.recommended.rules,
...eslintPluginTypeScript.configs.recommended.rules,

"prettier/prettier": ["error"],

"react/react-in-jsx-scope": "off",
"no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": ["error"],
"@typescript-eslint/no-unused-expressions": "off",
"import/named": "off",
"import/no-extraneous-dependencies": "off",
"import/no-unresolved": "off",
"simple-import-sort/imports": [
"error",
{
groups: [
["^react", "^@?\\w"],
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
["^.+\\.s?css$"],
],
},
],
"simple-import-sort/exports": "error",
"react/jsx-indent": ["error", 2],
"react/jsx-indent-props": ["error", 2],
"no-multiple-empty-lines": ["error", { max: 1, maxEOF: 1 }],
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
},
settings: {
react: {
version: "detect",
},
"import/resolver": {
typescript: {
alwaysTryTypes: true,
project: "./tsconfig.json",
},
},
},
},
eslintConfigPrettier,
...eslintPluginTailwind.configs["flat/recommended"],
];
20 changes: 19 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "emu",
"private": true,
"version": "0.2.0",
"version": "0.2.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -13,13 +13,18 @@
"@fontsource-variable/inter": "^5.1.0",
"@fontsource-variable/martian-mono": "^5.1.0",
"@phosphor-icons/react": "^2.1.7",
"@radix-ui/react-switch": "^1.1.1",
"@tauri-apps/api": "^2",
"@tauri-apps/plugin-os": "~2",
"@tauri-apps/plugin-process": "~2",
"@tauri-apps/plugin-shell": "~2",
"clsx": "^2.1.1",
"i18next": "^23.16.5",
"i18next-browser-languagedetector": "^8.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^15.1.1",
"react-router-dom": "^6.28.0",
"swr": "^2.2.5",
"tailwind-merge": "^2.5.4",
"vaul": "^1.1.1",
Expand All @@ -32,9 +37,22 @@
"@types/react-dom": "^18.2.7",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.20",
"babel-plugin-macros": "^3.1.0",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-tailwindcss": "^3.17.5",
"postcss": "^8.4.48",
"prettier": "^3.3.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"tailwindcss": "^3.4.14",
"typescript": "^5.2.2",
"typescript-eslint": "^8.14.0",
"vite": "^5.3.1"
}
}
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export default {
tailwindcss: {},
autoprefixer: {},
},
}
};
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "emu"
version = "0.2.0"
version = "0.2.1"
description = "Manage emulators with ease"
authors = ["fax1ty"]
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "emu",
"version": "0.2.0",
"version": "0.2.1",
"identifier": "emu.app",
"build": {
"beforeDevCommand": "bun run dev",
Expand Down
99 changes: 0 additions & 99 deletions src/app.tsx

This file was deleted.

Loading

0 comments on commit 8a9722b

Please sign in to comment.