diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 00000000..0c670739 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,7 @@ +{ + "semi": true, + "trailingComma": "all", + "singleQuote": true, + "printWidth": 120, + "tabWidth": 2 +} diff --git a/apps/interactor/.prettierrc b/apps/interactor/.prettierrc deleted file mode 100644 index 36301bc5..00000000 --- a/apps/interactor/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "semi": false, - "singleQuote": true, - "trailingComma": "es5" -} diff --git a/apps/interactor/package.json b/apps/interactor/package.json index a39d4081..3f8431cc 100644 --- a/apps/interactor/package.json +++ b/apps/interactor/package.json @@ -6,7 +6,6 @@ "start": "vite --force", "build": "tsc && vite build", "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", - "format": "prettier --write .", "preview": "vite preview", "test": "jest" }, diff --git a/package.json b/package.json index 4391365b..0f5c2534 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,8 @@ "start:no-services": "lerna run start --parallel --ignore @mikugg/docs --ignore @mikugg/services", "run-services": "cd apps/services && node --loader ts-node/esm src/server.mts", "test": "lerna run test --scope=@mikugg/extensions --scope=@mikugg/ui-kit", + "format": "prettier --write --loglevel warn '**/src/**/*.{js,jsx,ts,tsx,json,md,scss}'", + "format:check": "prettier --check '**/src/**/*.{js,jsx,ts,tsx,json,md,scss}'", "pull": "git reset --hard HEAD && git pull origin master && pnpm install", "build": "npx lerna run build" }, diff --git a/packages/ui-kit/.prettierrc.json b/packages/ui-kit/.prettierrc.json deleted file mode 100644 index c1a6f667..00000000 --- a/packages/ui-kit/.prettierrc.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "singleQuote": true, - "trailingComma": "es5" -} diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json index 1dbfd917..954964bb 100644 --- a/packages/ui-kit/package.json +++ b/packages/ui-kit/package.json @@ -24,8 +24,6 @@ "lint:ts": "tslint 'src/**/*.{ts,tsx}'", "lint:es": "eslint 'src/**/*.{js,jsx,ts,tsx}'", "lint:scss": "stylelint 'src/**/*.scss'", - "format": "prettier --write --loglevel warn 'src/**/*.{js,jsx,ts,tsx,json,md,scss}'", - "format:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx,json,md,scss}'", "_test": "npm run lint:ts && npm run lint:es && npm run lint:scss && npm run format:check" }, "keywords": [],