diff --git a/.prettierignore b/.prettierignore index 2c0e30b971f..9ab0849d504 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,4 +2,5 @@ .next node_modules package-lock.json -docker* \ No newline at end of file +docker* +apps/**/out \ No newline at end of file diff --git a/.prettierrc b/.prettierrc index 8df6df7757c..76c3f65353b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,5 +3,6 @@ "tabWidth": 2, "semi": false, "singleQuote": true, - "printWidth": 100 + "printWidth": 100, + "endOfLine": "lf" } diff --git a/apps/docs/.eslintrc.js b/apps/docs/.eslintrc.js index dc369e9a848..e0b422e408e 100644 --- a/apps/docs/.eslintrc.js +++ b/apps/docs/.eslintrc.js @@ -1 +1 @@ -module.exports = require("config/eslint-preset"); +module.exports = require('config/eslint-preset') diff --git a/apps/docs/src/styles/tailwind.css b/apps/docs/src/styles/tailwind.css index bd6213e1dfe..b5c61c95671 100644 --- a/apps/docs/src/styles/tailwind.css +++ b/apps/docs/src/styles/tailwind.css @@ -1,3 +1,3 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; diff --git a/apps/temp-community-forum/.eslintrc.js b/apps/temp-community-forum/.eslintrc.js index dc369e9a848..e0b422e408e 100644 --- a/apps/temp-community-forum/.eslintrc.js +++ b/apps/temp-community-forum/.eslintrc.js @@ -1 +1 @@ -module.exports = require("config/eslint-preset"); +module.exports = require('config/eslint-preset') diff --git a/apps/temp-community-forum/next.config.js b/apps/temp-community-forum/next.config.js index 53e0a424874..834bc1820e9 100644 --- a/apps/temp-community-forum/next.config.js +++ b/apps/temp-community-forum/next.config.js @@ -1,5 +1,5 @@ -const withTM = require("next-transpile-modules")(["ui"]); +const withTM = require('next-transpile-modules')(['ui']) module.exports = withTM({ reactStrictMode: true, -}); +}) diff --git a/apps/temp-community-forum/src/styles/tailwind.css b/apps/temp-community-forum/src/styles/tailwind.css index bd6213e1dfe..b5c61c95671 100644 --- a/apps/temp-community-forum/src/styles/tailwind.css +++ b/apps/temp-community-forum/src/styles/tailwind.css @@ -1,3 +1,3 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; diff --git a/apps/temp-community-tutorials/.eslintrc.js b/apps/temp-community-tutorials/.eslintrc.js index dc369e9a848..e0b422e408e 100644 --- a/apps/temp-community-tutorials/.eslintrc.js +++ b/apps/temp-community-tutorials/.eslintrc.js @@ -1 +1 @@ -module.exports = require("config/eslint-preset"); +module.exports = require('config/eslint-preset') diff --git a/apps/temp-community-tutorials/next.config.js b/apps/temp-community-tutorials/next.config.js index 53e0a424874..834bc1820e9 100644 --- a/apps/temp-community-tutorials/next.config.js +++ b/apps/temp-community-tutorials/next.config.js @@ -1,5 +1,5 @@ -const withTM = require("next-transpile-modules")(["ui"]); +const withTM = require('next-transpile-modules')(['ui']) module.exports = withTM({ reactStrictMode: true, -}); +}) diff --git a/apps/temp-community-tutorials/src/styles/tailwind.css b/apps/temp-community-tutorials/src/styles/tailwind.css index bd6213e1dfe..b5c61c95671 100644 --- a/apps/temp-community-tutorials/src/styles/tailwind.css +++ b/apps/temp-community-tutorials/src/styles/tailwind.css @@ -1,3 +1,3 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; diff --git a/apps/www/components/CodeBlock/CodeBlock.module.css b/apps/www/components/CodeBlock/CodeBlock.module.css index 364e15058e9..fdf6fa2cc28 100644 --- a/apps/www/components/CodeBlock/CodeBlock.module.css +++ b/apps/www/components/CodeBlock/CodeBlock.module.css @@ -9,7 +9,7 @@ } .code-block .code-line:first-of-type { - @apply flex items-end h-8; + @apply flex h-8 items-end; } .code-block .code-line:first-of-type :global(.linenumber) { @@ -21,7 +21,7 @@ } .code-block .code-line:last-of-type { - @apply flex items-start h-8; + @apply flex h-8 items-start; } .code-block .code-line:last-of-type :global(.linenumber) { diff --git a/apps/www/components/FloatingIcons/FloatingIcons.module.css b/apps/www/components/FloatingIcons/FloatingIcons.module.css index 9c8c30e4398..7345dcc4a98 100644 --- a/apps/www/components/FloatingIcons/FloatingIcons.module.css +++ b/apps/www/components/FloatingIcons/FloatingIcons.module.css @@ -1,35 +1,35 @@ .icon-react-one { - @apply absolute w-20 z-10; + @apply absolute z-10 w-20; right: 13%; top: 8%; } .icon-electron { - @apply absolute w-16 z-0; + @apply absolute z-0 w-16; left: 17%; top: 25%; } .icon-vue { - @apply absolute w-16 z-10; + @apply absolute z-10 w-16; right: 33%; top: 3%; } .icon-angular { - @apply absolute w-12 z-10; + @apply absolute z-10 w-12; right: 21%; top: 28%; } .icon-flutter { - @apply absolute w-16 z-10; + @apply absolute z-10 w-16; left: 5%; top: 15%; } .icon-nuxt { - @apply absolute w-12 z-10; + @apply absolute z-10 w-12; right: 5%; top: 28%; } .icon-redwood { - @apply absolute w-14 z-10; + @apply absolute z-10 w-14; /* background-color: yellow; */ left: 15%; top: 5%; diff --git a/apps/www/styles/index.css b/apps/www/styles/index.css index 8947bb54816..d770487d130 100644 --- a/apps/www/styles/index.css +++ b/apps/www/styles/index.css @@ -106,7 +106,7 @@ h6 { */ } .small:not(.prose *):not(.overwrite) { - @apply text-xs text-scale-900; + @apply text-scale-900 text-xs; } .sbui-border-fix select { @@ -165,7 +165,7 @@ h6 { */ } */ .sbui-tabs--alt div[role='tablist'] .sbui-btn-primary { - @apply text-white bg-gray-800 dark:bg-scale-300 dark:text-white; + @apply dark:bg-scale-300 bg-gray-800 text-white dark:text-white; text-shadow: none; font-weight: 400; } diff --git a/package-lock.json b/package-lock.json index 2ab77d4d6de..f22e91ef571 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "faker": "^5.5.3", "jest": "^27.3.1", "postcss": "^8.4.12", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "prettier-plugin-tailwindcss": "^0.1.8", "tailwindcss": "^3.0.24", "ts-jest": "^27.0.7", diff --git a/package.json b/package.json index 58174515ed8..625af3578f0 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "build": "turbo run build", "dev": "turbo run dev --parallel", "lint": "turbo run lint", - "format": "prettier --write \"apps/**/*.{ts,tsx,md}\"", + "format": "prettier --write \"apps/**/*.{js,jsx,ts,tsx,css,md,json}\"", "docker:dev": "cd docker && docker-compose -f docker-compose.yml -f ./dev/docker-compose.dev.yml up --renew-anon-volumes", "docker:up": "cd docker && docker-compose up", "docker:down": "cd docker && docker-compose -f docker-compose.yml -f ./dev/docker-compose.dev.yml down --remove-orphans", @@ -36,7 +36,7 @@ "faker": "^5.5.3", "jest": "^27.3.1", "postcss": "^8.4.12", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "prettier-plugin-tailwindcss": "^0.1.8", "tailwindcss": "^3.0.24", "ts-jest": "^27.0.7",