From 5ea87ddacc99ce29f9beeba92632964f635b4dec Mon Sep 17 00:00:00 2001 From: Inian Date: Thu, 11 Nov 2021 17:17:26 +0800 Subject: [PATCH] Fix prettier (#3850) * move prettier action to check on pr * run prettier --- .github/workflows/prettier.yml | 28 +++++++--------------- .prettierrc | 8 ++----- examples/nextjs-auth-tailwind/.prettierrc | 6 +---- www/components/BuiltWithSupabase/index.tsx | 5 +--- www/components/Footer/index.tsx | 9 +++---- www/components/Sections/GithubExamples.tsx | 10 ++------ www/data/Press.ts | 22 +++++++---------- www/data/Team.tsx | 3 +-- www/pages/database/Database.tsx | 5 +--- www/tsconfig.json | 20 ++++------------ 10 files changed, 34 insertions(+), 82 deletions(-) diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 6df03d2ebbd..52368d51dea 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -1,28 +1,18 @@ name: Check Code with Prettier on: - push: + pull_request: branches: - - "master" + - 'master' jobs: - format: - runs-on: ubuntu-latest steps: - - name: Check out repo - uses: actions/checkout@v2 - - name: Run prettier - run: |- - npx prettier --write 'examples/**/*.{js,jsx,ts,tsx,css,md,json}' - npx prettier --write 'i18n/**/*.{js,jsx,ts,tsx,css,md,json}' - npx prettier --write 'www/**/*.{js,jsx,ts,tsx,css,md,json}' - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v2.3.0 - with: - commit_message: Apply Prettier changes - branch: master - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Check out repo + uses: actions/checkout@v2 + - name: Run prettier + run: |- + npx prettier -c 'examples/**/*.{js,jsx,ts,tsx,css,md,json}' + npx prettier -c 'i18n/**/*.{js,jsx,ts,tsx,css,md,json}' + npx prettier -c 'www/**/*.{js,jsx,ts,tsx,css,md,json}' diff --git a/.prettierrc b/.prettierrc index 0dee0cb6121..8df6df7757c 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,9 +3,5 @@ "tabWidth": 2, "semi": false, "singleQuote": true, - "printWidth": 100, - "svelteSortOrder" : "styles-scripts-markup", - "svelteStrictMode": true, - "svelteBracketNewLine": true, - "svelteAllowShorthand": false -} \ No newline at end of file + "printWidth": 100 +} diff --git a/examples/nextjs-auth-tailwind/.prettierrc b/examples/nextjs-auth-tailwind/.prettierrc index 1f7ddbc2236..44833a97ae8 100644 --- a/examples/nextjs-auth-tailwind/.prettierrc +++ b/examples/nextjs-auth-tailwind/.prettierrc @@ -3,9 +3,5 @@ "tabWidth": 2, "semi": false, "singleQuote": true, - "printWidth": 100, - "svelteSortOrder" : "styles-scripts-markup", - "svelteStrictMode": true, - "svelteBracketNewLine": true, - "svelteAllowShorthand": false + "printWidth": 100 } \ No newline at end of file diff --git a/www/components/BuiltWithSupabase/index.tsx b/www/components/BuiltWithSupabase/index.tsx index c0ac54af700..1683235d713 100644 --- a/www/components/BuiltWithSupabase/index.tsx +++ b/www/components/BuiltWithSupabase/index.tsx @@ -20,10 +20,7 @@ const BuiltExamples = () => { There are many example apps and starter projects to get going

- + diff --git a/www/components/Footer/index.tsx b/www/components/Footer/index.tsx index bb4600fbf53..3299114cb6e 100644 --- a/www/components/Footer/index.tsx +++ b/www/components/Footer/index.tsx @@ -74,10 +74,11 @@ const Footer = (props: Props) => {
  • {link.text} {!link.url && ( diff --git a/www/components/Sections/GithubExamples.tsx b/www/components/Sections/GithubExamples.tsx index efb168dbc1b..2a1f852238d 100644 --- a/www/components/Sections/GithubExamples.tsx +++ b/www/components/Sections/GithubExamples.tsx @@ -43,20 +43,14 @@ function GithubExamples() {

    - + - + diff --git a/www/data/Press.ts b/www/data/Press.ts index d017aaa0e6c..771acc990f7 100644 --- a/www/data/Press.ts +++ b/www/data/Press.ts @@ -1,9 +1,8 @@ - type PressItem = { - type: 'podcast' | 'video' | 'article' | 'blog' | 'news' | 'event' | 'other', - href: string, - title: string, - publisher: string, + type: 'podcast' | 'video' | 'article' | 'blog' | 'news' | 'event' | 'other' + href: string + title: string + publisher: string } const data: PressItem[] = [ @@ -15,15 +14,13 @@ const data: PressItem[] = [ }, { type: 'article', - href: - 'https://techcrunch.com/2020/12/15/supabase-raises-6m-for-its-open-source-firebase-alternative', + href: 'https://techcrunch.com/2020/12/15/supabase-raises-6m-for-its-open-source-firebase-alternative', title: 'Supabase raises $6M for its open-source Firebase alternative', publisher: 'TechCrunch', }, { type: 'podcast', - href: - 'https://softwareengineeringdaily.com/2020/10/15/supabase-open-source-firebase-with-paul-copplestone', + href: 'https://softwareengineeringdaily.com/2020/10/15/supabase-open-source-firebase-with-paul-copplestone', title: 'Software Engineering Daily', publisher: 'Software Engineering Daily', }, @@ -35,8 +32,7 @@ const data: PressItem[] = [ }, { type: 'podcast', - href: - 'https://www.heavybit.com/library/podcasts/jamstack-radio/ep-71-open-source-firebase-alternative-with-paul-copplestone-of-supabase', + href: 'https://www.heavybit.com/library/podcasts/jamstack-radio/ep-71-open-source-firebase-alternative-with-paul-copplestone-of-supabase', title: 'Jamstack Radio', publisher: 'Heavybit', }, @@ -48,6 +44,4 @@ const data: PressItem[] = [ }, ] -export default data; - - +export default data diff --git a/www/data/Team.tsx b/www/data/Team.tsx index 11b99b6b27d..8841282b2d7 100644 --- a/www/data/Team.tsx +++ b/www/data/Team.tsx @@ -15,8 +15,7 @@ type TeamMember = { const data: TeamMember[] = [ { name: 'Caryn Marooney', - img: - 'https://res.cloudinary.com/crunchbase-production/image/upload/c_thumb,h_256,w_256,f_auto,g_faces,z_0.7,q_auto:eco,dpr_1/iqltjymln82pxxcwr6kq.png', + img: 'https://res.cloudinary.com/crunchbase-production/image/upload/c_thumb,h_256,w_256,f_auto,g_faces,z_0.7,q_auto:eco,dpr_1/iqltjymln82pxxcwr6kq.png', department: 'Board member', twitter: 'https://twitter.com/carynm650', active: true, diff --git a/www/pages/database/Database.tsx b/www/pages/database/Database.tsx index f2b42f9f813..6fe834f0351 100644 --- a/www/pages/database/Database.tsx +++ b/www/pages/database/Database.tsx @@ -328,10 +328,7 @@ function Database() { title="40+ preinstalled extensions" text="We only show a few of the extensions supported by supabase here, but we preinstall many more that you can use right away." /> - +