Merge pull request #202 from jeff-phillips-18/apply-prettier

chore(prettier): Apply prettier settings to lint
patternfly · May 29, 2024 · 90aa075 · 90aa075
2 parents c089767 + 7eae9fd
commit 90aa075
Show file tree

Hide file tree

Showing 158 changed files with 2,947 additions and 2,878 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -10,6 +10,8 @@ coverage
 .tmp
 .eslintcache
 generated
+*.d.ts
+*/css/*.js
 
 # package managers
 yarn-error.log

diff --git a/.eslintrc.json b/.eslintrc.json
@@ -31,7 +31,13 @@
       "version": "detect"
     }
   },
-  "plugins": ["react", "react-hooks", "@typescript-eslint", "patternfly-react"],
+  "plugins": [
+    "react",
+    "react-hooks",
+    "@typescript-eslint",
+    "patternfly-react",
+    "prettier"
+  ],
   "rules": {
     "@typescript-eslint/adjacent-overload-signatures": "error",
     "@typescript-eslint/array-type": "error",
@@ -92,6 +98,7 @@
     "object-shorthand": "error",
     "one-var": ["error", "never"],
     "prefer-const": "error",
+    "prettier/prettier": "error",
     "radix": ["error", "as-needed"],
     "react/prop-types": 0,
     "react/display-name": 0,

diff --git a/babel.config.js b/babel.config.js
@@ -3,10 +3,7 @@ module.exports = {
     ['@babel/preset-env', { targets: { node: 'current' } }],
     ['@babel/preset-react', { runtime: 'automatic' }],
     '@babel/preset-flow',
-    '@babel/preset-typescript',
+    '@babel/preset-typescript'
   ],
-  plugins: [
-    ['@babel/plugin-proposal-decorators', { legacy: true }],
-    '@babel/plugin-proposal-class-properties',
-  ]
+  plugins: [['@babel/plugin-proposal-decorators', { legacy: true }], '@babel/plugin-proposal-class-properties']
 };
diff --git a/fed-mini-modules.js b/fed-mini-modules.js
@@ -4,9 +4,7 @@ const path = require('path');
 
 const root = process.cwd();
 
-const sourceFiles = glob
-  .sync(`${root}/src/*/`)
-  .map((name) => name.replace(/\/$/, ''));
+const sourceFiles = glob.sync(`${root}/src/*/`).map((name) => name.replace(/\/$/, ''));
 
 const indexTypings = glob.sync(`${root}/src/index.d.ts`);
 
@@ -34,7 +32,7 @@ async function createPackage(file) {
   const esmRelative = path.relative(file.replace('/src', ''), esmSource);
   const content = {
     main: 'index.js',
-    module: esmRelative,
+    module: esmRelative
   };
   const typings = glob.sync(`${root}/src/${fileName}/*.d.ts`);
   const cmds = [];

diff --git a/jest.config.js b/jest.config.js
@@ -16,5 +16,5 @@ module.exports = {
   testEnvironment: 'jsdom',
   transformIgnorePatterns: ['node_modules/(?!@patternfly)'],
   testPathIgnorePatterns: ['<rootDir>/packages/demo-app-ts/'],
-  setupFilesAfterEnv: ['<rootDir>/testSetup.ts'],
+  setupFilesAfterEnv: ['<rootDir>/testSetup.ts']
 };
diff --git a/package.json b/package.json
@@ -15,8 +15,11 @@
     "serve:docs": "yarn workspace @patternfly/react-topology docs:serve",
     "clean": "yarn workspace @patternfly/react-topology clean",
     "lint:js": "eslint . --ext .js,.jsx,.ts,.tsx --color",
+    "lint:js:fix": "eslint . --ext .js,.jsx,.ts,.tsx --color --fix",
     "lint:md": "eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache",
+    "lint:md:fix": "eslint packages --ext md --no-eslintrc --config .eslintrc-md.json --cache --fix",
     "lint": "yarn lint:js && yarn lint:md",
+    "lint:fix": "yarn lint:js:fix && yarn lint:md:fix",
     "test": "TZ=EST jest packages",
     "test:a11y": "echo skipping a11y tests for now",
     "serve:a11y": "yarn workspace @patternfly/react-topology serve:a11y"

diff --git a/packages/demo-app-ts/src/Demos.ts b/packages/demo-app-ts/src/Demos.ts
@@ -1,9 +1,6 @@
 import { PipelineTasksDemo } from './demos/pipelinesDemo/PipelineTasksDemo';
 import { PipelineLayoutDemo } from './demos/pipelinesDemo/PipelineLayoutDemo';
-import {
-  PipelineGroupsComplexDemo,
-  PipelineGroupsDemo
-} from './demos/pipelineGroupsDemo/PipelineGroupsDemo';
+import { PipelineGroupsComplexDemo, PipelineGroupsDemo } from './demos/pipelineGroupsDemo/PipelineGroupsDemo';
 import { Basics } from './demos/Basics';
 import { StyleEdges, StyleGroups, StyleLabels, StyleNodes } from './demos/stylesDemo/Styles';
 import { Selection } from './demos/Selection';
@@ -38,7 +35,7 @@ export const Demos: DemoInterface[] = [
     id: 'topology-package',
     name: 'Topology Package',
     componentType: TopologyPackage,
-    isDefault: true,
+    isDefault: true
   },
   {
     id: 'pipelines',
@@ -57,24 +54,24 @@ export const Demos: DemoInterface[] = [
       {
         id: 'pipelines-groups-layout-demo',
         name: 'Pipeline Groups Layout',
-        componentType: PipelineGroupsDemo,
+        componentType: PipelineGroupsDemo
       },
       {
         id: 'pipelines-groups-complex-layout-demo',
         name: 'Pipeline Groups Complex Layout',
-        componentType: PipelineGroupsComplexDemo,
-      },
+        componentType: PipelineGroupsComplexDemo
+      }
     ]
   },
   {
     id: 'status-connectors',
     name: 'Status Connectors',
-    componentType: StatusConnectors,
+    componentType: StatusConnectors
   },
   {
     id: 'basic',
     name: 'Basic',
-    componentType: Basics,
+    componentType: Basics
   },
   {
     id: 'styles',
@@ -83,70 +80,70 @@ export const Demos: DemoInterface[] = [
       {
         id: 'nodes',
         name: 'Nodes',
-        componentType: StyleNodes,
+        componentType: StyleNodes
       },
       {
         id: 'labels',
         name: 'Labels',
-        componentType: StyleLabels,
+        componentType: StyleLabels
       },
       {
         id: 'groups',
         name: 'Groups',
-        componentType: StyleGroups,
+        componentType: StyleGroups
       },
       {
         id: 'edges',
         name: 'Edges',
-        componentType: StyleEdges,
-      },
+        componentType: StyleEdges
+      }
     ]
   },
   {
     id: 'selection',
     name: 'Selection',
-    componentType: Selection,
+    componentType: Selection
   },
   {
     id: 'pan-zoom',
     name: 'Pan Zoom',
-    componentType: PanZoom,
+    componentType: PanZoom
   },
   {
     id: 'layout',
     name: 'Layout',
-    componentType: Layouts,
+    componentType: Layouts
   },
   {
     id: 'connectors',
     name: 'Connectors',
-    componentType: Connectors,
+    componentType: Connectors
   },
   {
     id: 'drag-and-drop',
     name: 'Drag and Drop',
-    componentType: DragAndDrop,
+    componentType: DragAndDrop
   },
   {
     id: 'shapes',
     name: 'Shapes',
-    componentType: Shapes,
+    componentType: Shapes
   },
   {
     id: 'context-menus',
     name: 'Context Menus',
-    componentType: ContextMenus,
+    componentType: ContextMenus
   },
   {
     id: 'complex-group',
     name: 'Complex Group',
-    componentType: ComplexGroup,
+    componentType: ComplexGroup
   },
   {
     id: 'collapsible-groups',
     name: 'Collapsible Groups',
-    componentType: CollapsibleGroups,
-  },
+    componentType: CollapsibleGroups
+  }
 ];
 
 export default Demos;
diff --git a/packages/demo-app-ts/src/components/CustomCircleNode.tsx b/packages/demo-app-ts/src/components/CustomCircleNode.tsx
@@ -47,7 +47,7 @@ const CustomCircle: React.FunctionComponent<ShapeProps> = ({ element, className
   );
 };
 
-const CustomCircleNode: React.FunctionComponent<CustomCircleNodeProps> = props => (
+const CustomCircleNode: React.FunctionComponent<CustomCircleNodeProps> = (props) => (
   <DemoDefaultNode getCustomShape={() => CustomCircle} {...props} />
 );
 

diff --git a/packages/demo-app-ts/src/components/CustomPathNode.tsx b/packages/demo-app-ts/src/components/CustomPathNode.tsx
@@ -23,7 +23,7 @@ type CustomPathNodeProps = {
   WithCreateConnectorProps &
   WithContextMenuProps;
 
-const CustomPathNode: React.FunctionComponent<CustomPathNodeProps> = props => (
+const CustomPathNode: React.FunctionComponent<CustomPathNodeProps> = (props) => (
   <DemoDefaultNode getCustomShape={() => Path} {...props} />
 );
 

diff --git a/packages/demo-app-ts/src/components/CustomPolygonNode.tsx b/packages/demo-app-ts/src/components/CustomPolygonNode.tsx
@@ -23,7 +23,7 @@ type CustomPolygonNodeProps = {
   WithCreateConnectorProps &
   WithContextMenuProps;
 
-const CustomPolygonNode: React.FunctionComponent<CustomPolygonNodeProps> = props => (
+const CustomPolygonNode: React.FunctionComponent<CustomPolygonNodeProps> = (props) => (
   <DemoDefaultNode getCustomShape={() => Polygon} {...props} />
 );
 

diff --git a/packages/demo-app-ts/src/components/CustomRectNode.tsx b/packages/demo-app-ts/src/components/CustomRectNode.tsx
@@ -30,7 +30,7 @@ const CustomRect: React.FunctionComponent<ShapeProps> = observer(({ className })
   return <rect className={className} x={0} y={0} width={100} height={20} />;
 });
 
-const CustomRectNode: React.FunctionComponent<CustomRectNodeProps> = props => (
+const CustomRectNode: React.FunctionComponent<CustomRectNodeProps> = (props) => (
   <DemoDefaultNode getCustomShape={() => CustomRect} {...props} />
 );
 

diff --git a/packages/demo-app-ts/src/components/DemoDefaultNode.tsx b/packages/demo-app-ts/src/components/DemoDefaultNode.tsx
@@ -62,7 +62,13 @@ const DemoDefaultNode: React.FunctionComponent<DemoDefaultNodeProps> = ({
 
   return (
     <g ref={refs} onClick={onSelect} onContextMenu={onContextMenu}>
-      <ShapeComponent className={className} element={nodeElement} width={width} height={height} dndDropRef={dndDropRef} />
+      <ShapeComponent
+        className={className}
+        element={nodeElement}
+        width={width}
+        height={height}
+        dndDropRef={dndDropRef}
+      />
     </g>
   );
 };

diff --git a/packages/demo-app-ts/src/components/GroupHull.tsx b/packages/demo-app-ts/src/components/GroupHull.tsx
@@ -84,7 +84,7 @@ const GroupHull: React.FunctionComponent<GroupHullProps> = ({
       return null;
     }
     const points: PointWithSize[] = [];
-    nodeChildren.forEach(c => {
+    nodeChildren.forEach((c) => {
       if (c.getNodeShape() === NodeShape.ellipse) {
         const { width, height } = c.getBounds();
         const { x, y } = c.getBounds().getCenter();

diff --git a/packages/demo-app-ts/src/components/MultiEdge.tsx b/packages/demo-app-ts/src/components/MultiEdge.tsx
@@ -15,7 +15,7 @@ const MultiEdge: React.FunctionComponent<MultiEdgeProps> = ({ element }) => {
   element
     .getGraph()
     .getEdges()
-    .forEach(e => {
+    .forEach((e) => {
       if (e === element) {
         idx = sum;
         sum++;

diff --git a/packages/demo-app-ts/src/components/shapes/Path.tsx b/packages/demo-app-ts/src/components/shapes/Path.tsx
@@ -9,8 +9,9 @@ const Path: React.FunctionComponent<ShapeProps> = ({ className, width, height, f
     <path
       className={className}
       ref={refs}
-      d={`M0 0 L${width / 2} ${height / 4} L${width} 0 L${width} ${height} L${width / 2} ${height -
-        height / 4} L0 ${height} Z`}
+      d={`M0 0 L${width / 2} ${height / 4} L${width} 0 L${width} ${height} L${width / 2} ${
+        height - height / 4
+      } L0 ${height} Z`}
       filter={filter}
     />
   );

diff --git a/packages/demo-app-ts/src/components/shapes/Polygon.tsx b/packages/demo-app-ts/src/components/shapes/Polygon.tsx
@@ -17,7 +17,7 @@ const Polygon: React.FunctionComponent<ShapeProps> = ({ className, width, height
     <polygon
       className={className}
       ref={dndDropRef}
-      points={points.map(p => `${p[0]},${p[1]}`).join(' ')}
+      points={points.map((p) => `${p[0]},${p[1]}`).join(' ')}
       filter={filter}
     />
   );
-Original file line number
+Diff line change
@@ Expand Up @@
       );
     };
-    const CustomCircleNode: React.FunctionComponent<CustomCircleNodeProps> = props => (
+    const CustomCircleNode: React.FunctionComponent<CustomCircleNodeProps> = (props) => (
       <DemoDefaultNode getCustomShape={() => CustomCircle} {...props} />
     );
@@ Expand Down @@