Prettier fixes

devhubapp · Dec 8, 2020 · 86724e1 · 86724e1
1 parent 9c950fd
commit 86724e1
Show file tree

Hide file tree

Showing 21 changed files with 158 additions and 175 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,12 @@
 *.jsbundle
 *.tsbuildinfo
 .DS_Store
+.eslintcache
 .history
 .jest
+.now
 .vscode
 Pods
 node_modules/
 npm-debug.log
 yarn-error.log
-.now
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,5 +1,4 @@
 module.exports = {
-  parser: 'typescript',
   semi: false,
   singleQuote: true,
   trailingComma: 'all',

diff --git a/landing/package.json b/landing/package.json
@@ -8,7 +8,7 @@
     "compile": "cd .",
     "deploy": "yarn compile && yarn now",
     "export": "yarn run-scripts && next build && next export",
-    "format": "prettier --write '{.,src/**,pages/**}/*.{js,jsx,ts,tsx}'",
+    "format": "prettier --write '{.,src,pages}/**/*.{js,jsx,ts,tsx,json}'",
     "lint": "eslint src",
     "now": "now",
     "postinstall": "yarn run-scripts",
@@ -58,4 +58,4 @@
   "engines": {
     "node": ">=12"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -62,9 +62,11 @@
     }
   },
   "lint-staged": {
-    "*.{ts,tsx}": [
-      "eslint --fix --quiet",
+    "*.{js,jsx,ts,tsx}": [
+      "eslint --fix --quiet"
+    ],
+    "*.{js,jsx,ts,tsx,json}": [
       "prettier --write"
     ]
   }
-}
+}
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "compile": "tsc -b --incremental",
     "clean": "shx rm -f *.tsbuildinfo && shx rm -rf dist/*",
-    "format": "prettier --write '{.,src}/**.{js,jsx,ts,tsx}'",
+    "format": "prettier --write '{.,src}/**/*.{js,jsx,ts,tsx,json}'",
     "lint": "eslint src",
     "prepare": "cd .. && yarn patch-package"
   },
@@ -72,4 +72,4 @@
   "peerDependencies": {
     "eslint": "*"
   }
-}
+}
diff --git a/packages/components/src/components/modals/AddColumnDetailsModal.tsx b/packages/components/src/components/modals/AddColumnDetailsModal.tsx
@@ -825,24 +825,24 @@ function getNewColumnAndSubscriptions(
       switch (subtype) {
         case 'REPO_NOTIFICATIONS':
         default: {
-          newSubscription = createSubscriptionObjectWithId<
-            NotificationColumnSubscriptionCreation
-          >({
-            params: {
-              ...(defaultParams as any),
-              all: true,
-              participating: formValues.inbox === 'participating',
-              ...(!!(repoOwnerAndRepo.owner && repoOwnerAndRepo.repo) && {
-                owner: repoOwnerAndRepo.owner,
-                repo: repoOwnerAndRepo.repo,
-              }),
+          newSubscription = createSubscriptionObjectWithId<NotificationColumnSubscriptionCreation>(
+            {
+              params: {
+                ...(defaultParams as any),
+                all: true,
+                participating: formValues.inbox === 'participating',
+                ...(!!(repoOwnerAndRepo.owner && repoOwnerAndRepo.repo) && {
+                  owner: repoOwnerAndRepo.owner,
+                  repo: repoOwnerAndRepo.repo,
+                }),
+              },
+              type,
+              subtype:
+                repoOwnerAndRepo.owner && repoOwnerAndRepo.repo
+                  ? 'REPO_NOTIFICATIONS'
+                  : undefined,
             },
-            type,
-            subtype:
-              repoOwnerAndRepo.owner && repoOwnerAndRepo.repo
-                ? 'REPO_NOTIFICATIONS'
-                : undefined,
-          })
+          )
           _newColumnFilters.notifications =
             _newColumnFilters.notifications || {}
           _newColumnFilters.notifications.participating =
@@ -865,44 +865,44 @@ function getNewColumnAndSubscriptions(
         case 'ISSUES':
         case 'PULLS':
         default: {
-          newSubscription = createSubscriptionObjectWithId<
-            IssueOrPullRequestColumnSubscriptionCreation
-          >({
-            params: {
-              ...(defaultParams as any),
-              owners: {
-                ...(!!formValues.owner && {
-                  [formValues.owner]: {
-                    value: true,
-                    repos: {},
-                  },
-                }),
-
-                ...(!!repoOwnerAndRepo.owner &&
-                  !!repoOwnerAndRepo.repo && {
-                    [repoOwnerAndRepo.owner]: {
+          newSubscription = createSubscriptionObjectWithId<IssueOrPullRequestColumnSubscriptionCreation>(
+            {
+              params: {
+                ...(defaultParams as any),
+                owners: {
+                  ...(!!formValues.owner && {
+                    [formValues.owner]: {
                       value: true,
-                      repos: {
-                        [repoOwnerAndRepo.repo]: true,
-                      },
+                      repos: {},
                     },
                   }),
-              },
-              involves: formValues.user
-                ? {
-                    [formValues.user]: true,
-                  }
-                : undefined,
-              subjectType:
-                subtype === 'ISSUES'
-                  ? 'Issue'
-                  : subtype === 'PULLS'
-                  ? 'PullRequest'
+
+                  ...(!!repoOwnerAndRepo.owner &&
+                    !!repoOwnerAndRepo.repo && {
+                      [repoOwnerAndRepo.owner]: {
+                        value: true,
+                        repos: {
+                          [repoOwnerAndRepo.repo]: true,
+                        },
+                      },
+                    }),
+                },
+                involves: formValues.user
+                  ? {
+                      [formValues.user]: true,
+                    }
                   : undefined,
+                subjectType:
+                  subtype === 'ISSUES'
+                    ? 'Issue'
+                    : subtype === 'PULLS'
+                    ? 'PullRequest'
+                    : undefined,
+              },
+              type,
+              subtype,
             },
-            type,
-            subtype,
-          })
+          )
 
           _newColumnFilters.involves = newSubscription.params.involves
           _newColumnFilters.subjectTypes = newSubscription.params.subjectType
@@ -936,32 +936,32 @@ function getNewColumnAndSubscriptions(
       switch (subtype) {
         case 'ORG_PUBLIC_EVENTS':
         case 'USER_ORG_EVENTS': {
-          newSubscription = createSubscriptionObjectWithId<
-            ActivityColumnSubscriptionCreation
-          >({
-            params: {
-              ...(defaultParams as any),
-              org: formValues.org,
-              username: subtype === 'USER_ORG_EVENTS' ? loggedUsername : '',
+          newSubscription = createSubscriptionObjectWithId<ActivityColumnSubscriptionCreation>(
+            {
+              params: {
+                ...(defaultParams as any),
+                org: formValues.org,
+                username: subtype === 'USER_ORG_EVENTS' ? loggedUsername : '',
+              },
+              type,
+              subtype,
             },
-            type,
-            subtype,
-          })
+          )
           filterBotsForksAndStarsOut()
 
           break
         }
 
         case 'PUBLIC_EVENTS': {
-          newSubscription = createSubscriptionObjectWithId<
-            ActivityColumnSubscriptionCreation
-          >({
-            params: {
-              ...(defaultParams as any),
+          newSubscription = createSubscriptionObjectWithId<ActivityColumnSubscriptionCreation>(
+            {
+              params: {
+                ...(defaultParams as any),
+              },
+              type,
+              subtype,
             },
-            type,
-            subtype,
-          })
+          )
           filterBotsForksAndStarsOut()
 
           break
@@ -971,17 +971,17 @@ function getNewColumnAndSubscriptions(
         case 'REPO_NETWORK_EVENTS': {
           if (!(repoOwnerAndRepo.owner && repoOwnerAndRepo.repo)) return null
 
-          newSubscription = createSubscriptionObjectWithId<
-            ActivityColumnSubscriptionCreation
-          >({
-            params: {
-              ...(defaultParams as any),
-              owner: repoOwnerAndRepo.owner,
-              repo: repoOwnerAndRepo.repo,
+          newSubscription = createSubscriptionObjectWithId<ActivityColumnSubscriptionCreation>(
+            {
+              params: {
+                ...(defaultParams as any),
+                owner: repoOwnerAndRepo.owner,
+                repo: repoOwnerAndRepo.repo,
+              },
+              type,
+              subtype,
             },
-            type,
-            subtype,
-          })
+          )
           filterBotsForksAndStarsOut()
 
           break
@@ -993,16 +993,16 @@ function getNewColumnAndSubscriptions(
         case 'USER_RECEIVED_PUBLIC_EVENTS': {
           if (!formValues.user) return null
 
-          newSubscription = createSubscriptionObjectWithId<
-            ActivityColumnSubscriptionCreation
-          >({
-            params: {
-              ...(defaultParams as any),
-              username: formValues.user,
+          newSubscription = createSubscriptionObjectWithId<ActivityColumnSubscriptionCreation>(
+            {
+              params: {
+                ...(defaultParams as any),
+                username: formValues.user,
+              },
+              type,
+              subtype,
             },
-            type,
-            subtype,
-          })
+          )
 
           if (subtype === 'USER_RECEIVED_EVENTS') {
             newColumnFilters.subjectTypes = newColumnFilters.subjectTypes || {

diff --git a/packages/components/src/libs/swipeable/AppleSwipeableRow.tsx b/packages/components/src/libs/swipeable/AppleSwipeableRow.tsx
@@ -23,9 +23,7 @@ export interface AppleSwipeableRowAction extends BaseSwipeableRowAction {
   label: string
 }
 
-export type AppleSwipeableRowProps = BaseSwipeableRowProps<
-  AppleSwipeableRowAction
->
+export type AppleSwipeableRowProps = BaseSwipeableRowProps<AppleSwipeableRowAction>
 
 export class AppleSwipeableRow extends BaseSwipeableRow<
   AppleSwipeableRowProps,

diff --git a/packages/components/src/libs/swipeable/GoogleSwipeableRow.tsx b/packages/components/src/libs/swipeable/GoogleSwipeableRow.tsx
@@ -20,9 +20,7 @@ export type GoogleSwipeableRowAction = BaseSwipeableRowAction & {
   icon: IconProp
 }
 
-export type GoogleSwipeableRowProps = BaseSwipeableRowProps<
-  GoogleSwipeableRowAction
->
+export type GoogleSwipeableRowProps = BaseSwipeableRowProps<GoogleSwipeableRowAction>
 
 const AnimatedOcticons = Animated.createAnimatedComponent(Octicons)
 const AnimatedMaterialIcons = Animated.createAnimatedComponent(MaterialIcons)

diff --git a/packages/components/src/redux/migrations.ts b/packages/components/src/redux/migrations.ts
@@ -266,10 +266,9 @@ export default {
         )
           return
 
-        const oldTypesFilter: Partial<Record<
-          GitHubEvent['type'],
-          boolean
-        >> = (column.filters.activity as any).types
+        const oldTypesFilter: Partial<
+          Record<GitHubEvent['type'], boolean>
+        > = (column.filters.activity as any).types
 
         column.filters.subjectTypes = column.filters.subjectTypes || {}
         column.filters.activity.actions = column.filters.activity.actions || {}