Prettier adds to devDeps and format script now runs from yarn instead…

… of npx
EPICLab · Nov 1, 2023 · 9fce9a3 · 9fce9a3
1 parent 8239631
commit 9fce9a3
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 36 deletions.
diff --git a/.yarn/cache/prettier-npm-3.0.3-fced695dae-e10b9af02b.zip b/.yarn/cache/prettier-npm-3.0.3-fced695dae-e10b9af02b.zip
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -2,6 +2,6 @@ nodeLinker: node-modules
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
+    spec: '@yarnpkg/plugin-typescript'
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+    spec: '@yarnpkg/plugin-interactive-tools'
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "typecheck:renderer": "tsc --noEmit -p packages/renderer/tsconfig.json",
     "typecheck": "yarn typecheck:main && yarn typecheck:preload && yarn typecheck:renderer",
     "postinstall": "cross-env ELECTRON_RUN_AS_NODE=1 electron scripts/update-electron-vendors.mjs",
-    "format": "npx prettier --write \"**/*.{js,mjs,cjs,ts,mts,cts,json}\""
+    "format": "yarn run prettier --write \"**/*.{js,mjs,cjs,ts,mts,cts,json}\""
   },
   "devDependencies": {
     "@testing-library/dom": "^9.3.3",
@@ -69,6 +69,7 @@
     "nano-staged": "0.8.0",
     "pako": "^2.1.0",
     "playwright": "1.39.0",
+    "prettier": "^3.0.3",
     "re-reselect": "^4.0.1",
     "reselect": "^4.1.8",
     "rimraf": "^5.0.5",

diff --git a/packages/renderer/index.html b/packages/renderer/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/packages/renderer/src/components/Canvas/index.tsx b/packages/renderer/src/components/Canvas/index.tsx
@@ -1 +1 @@
-export { default } from './Canvas';
+export {default} from './Canvas';
diff --git a/packages/renderer/src/components/Card/ReverseItem.tsx b/packages/renderer/src/components/Card/ReverseItem.tsx
@@ -5,10 +5,10 @@ import {
   ListItemText,
   Menu,
   MenuItem,
-  Tooltip
+  Tooltip,
 } from '@mui/material';
-import { useState } from 'react';
-import { Action } from './ActionsMenu';
+import {useState} from 'react';
+import type {Action} from './ActionsMenu';
 
 type ItemProps = {
   icon: JSX.Element;
@@ -27,7 +27,10 @@ type MenuProps = {
 
 export const ReverseListItem = (props: ItemProps) => {
   return (
-    <ListItem dense disablePadding>
+    <ListItem
+      dense
+      disablePadding
+    >
       <ListItemButton onClick={props.onClick}>
         {props.tooltip ? (
           <Tooltip title={props.tooltip}>
@@ -36,7 +39,10 @@ export const ReverseListItem = (props: ItemProps) => {
         ) : (
           <ListItemIcon>{props.icon}</ListItemIcon>
         )}
-        <ListItemText primary={props.name} sx={{ maxWidth: 160, overflowWrap: 'break-word' }} />
+        <ListItemText
+          primary={props.name}
+          sx={{maxWidth: 160, overflowWrap: 'break-word'}}
+        />
       </ListItemButton>
     </ListItem>
   );
@@ -53,7 +59,10 @@ export const ReverseListMenu = (props: MenuProps) => {
   };
 
   return (
-    <ListItem dense disablePadding>
+    <ListItem
+      dense
+      disablePadding
+    >
       <ListItemButton
         id={`${props.name}-menu-button`}
         aria-controls={open ? `${props.name}-menu` : undefined}
@@ -88,7 +97,7 @@ export const ReverseListMenu = (props: MenuProps) => {
                 width: 32,
                 height: 32,
                 ml: -0.5,
-                mr: 1
+                mr: 1,
               },
               '&:before': {
                 content: '""',
@@ -100,19 +109,27 @@ export const ReverseListMenu = (props: MenuProps) => {
                 height: 10,
                 bgcolor: 'background.paper',
                 transform: 'translateY(-50%) rotate(45deg)',
-                zIndex: 0
-              }
-            }
-          }
+                zIndex: 0,
+              },
+            },
+          },
         }}
-        transformOrigin={{ horizontal: 'left', vertical: 'top' }}
-        anchorOrigin={{ horizontal: 'left', vertical: 'bottom' }}
+        transformOrigin={{horizontal: 'left', vertical: 'top'}}
+        anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
       >
-        <MenuItem dense disabled divider>
+        <MenuItem
+          dense
+          disabled
+          divider
+        >
           <ListItemText>{props.actionPrompt}</ListItemText>
         </MenuItem>
         {props.actions.map((action, index) => (
-          <MenuItem dense key={index} onClick={action.onClick}>
+          <MenuItem
+            dense
+            key={index}
+            onClick={action.onClick}
+          >
             <ListItemIcon>{action.icon}</ListItemIcon>
             <ListItemText>{action.name}</ListItemText>
           </MenuItem>

diff --git a/packages/renderer/src/components/Card/index.tsx b/packages/renderer/src/components/Card/index.tsx
@@ -1,2 +1,2 @@
-export { default } from './Card';
-export { default as BaseCard } from './BaseCard';
+export {default} from './Card';
+export {default as BaseCard} from './BaseCard';
diff --git a/packages/renderer/src/components/Diff/index.tsx b/packages/renderer/src/components/Diff/index.tsx
@@ -1,2 +1,2 @@
-export { default } from './Diff';
-export { default as DiffReverse } from './DiffReverse';
+export {default} from './Diff';
+export {default as DiffReverse} from './DiffReverse';
diff --git a/packages/renderer/src/components/Editor/index.tsx b/packages/renderer/src/components/Editor/index.tsx
@@ -1,2 +1,2 @@
-export { default } from './Editor';
-export { default as EditorReverse } from './EditorReverse';
+export {default} from './Editor';
+export {default as EditorReverse} from './EditorReverse';
diff --git a/packages/renderer/src/components/Explorer/index.tsx b/packages/renderer/src/components/Explorer/index.tsx
@@ -1,2 +1,2 @@
-export { default } from './Explorer';
-export { default as ExplorerReverse } from './ExplorerReverse';
+export {default} from './Explorer';
+export {default as ExplorerReverse} from './ExplorerReverse';
diff --git a/packages/renderer/src/components/GitGraph/ContextMenu.tsx b/packages/renderer/src/components/GitGraph/ContextMenu.tsx
@@ -190,9 +190,9 @@ const ContextMenu = ({
     })),
     {
       icon: <GitCommit />,
-      name: `Commit to ${branches[node.data.branches[0] ?? '']?.scope}/${
-        branches[node.data.branches[0] ?? '']?.ref
-      }`,
+      name: `Commit to ${branches[node.data.branches[0] ?? '']?.scope}/${branches[
+        node.data.branches[0] ?? ''
+      ]?.ref}`,
       disabled: !node.data.staged,
       onClick: () => {
         commit(node.data.branches[0] ?? '');

diff --git a/packages/renderer/src/components/GitGraph/index.tsx b/packages/renderer/src/components/GitGraph/index.tsx
@@ -1 +1 @@
-export { default } from './GitGraph';
+export {default} from './GitGraph';
diff --git a/packages/renderer/src/components/Handle/index.tsx b/packages/renderer/src/components/Handle/index.tsx
@@ -1 +1 @@
-export { default } from './Handle';
+export {default} from './Handle';
diff --git a/packages/renderer/src/components/Modal/index.tsx b/packages/renderer/src/components/Modal/index.tsx
@@ -1 +1 @@
-export { default } from './ModalComponent';
+export {default} from './ModalComponent';
diff --git a/packages/renderer/src/components/Stack/index.tsx b/packages/renderer/src/components/Stack/index.tsx
@@ -1,2 +1,2 @@
-export { default } from './Stack';
-export { default as BaseStack } from './BaseStack';
+export {default} from './Stack';
+export {default as BaseStack} from './BaseStack';
diff --git a/yarn.lock b/yarn.lock
@@ -6696,6 +6696,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "prettier@npm:3.0.3"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
+  languageName: node
+  linkType: hard
+
 "pretty-format@npm:^27.0.2":
   version: 27.5.1
   resolution: "pretty-format@npm:27.5.1"
@@ -7785,6 +7794,7 @@ __metadata:
     parse-path: ^7.0.0
     parse-url: ^8.1.0
     playwright: 1.39.0
+    prettier: ^3.0.3
     re-reselect: ^4.0.1
     react: ^18.2.0
     react-ace: ^10.1.0