update prettier to v3 (#31)

mshima · web-flow · commit ac807639fcca · 2024-08-25T19:18:26.000-03:00
diff --git a/eslint.config.js b/eslint.config.js
@@ -2,6 +2,7 @@
 
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
+import prettier from 'eslint-config-prettier';
 
 export default tseslint.config(
   eslint.configs.recommended,
@@ -12,4 +13,5 @@ export default tseslint.config(
       '@typescript-eslint/no-explicit-any': 'off',
     },
   },
+  prettier,
 );
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,10 +15,10 @@
     "build": "npm run build --workspaces",
     "clean": "npm run clean --workspaces",
     "clean-all": "npm run clean-all --workspaces && rimraf node_modules",
-    "fix": "npm run fix --workspaces",
+    "fix": "eslint . --fix && prettier . --write",
     "prepare": "npm run build",
     "prettier": "prettier --write .",
-    "pretest": "eslint .",
+    "pretest": "eslint . && prettier . --check",
     "test": "npm run test --workspaces",
     "test-coverage": "npm run test-coverage --workspaces"
   },
@@ -30,8 +30,9 @@
     "conventional-changelog-conventionalcommits": "^7.0.2",
     "cpy-cli": "^5.0.0",
     "eslint": "^9.9.1",
+    "eslint-config-prettier": "^9.1.0",
     "lerna": "^8.1.8",
-    "prettier": "^2.8.2",
+    "prettier": "^3.3.3",
     "prettier-plugin-packagejson": "^2.3.0",
     "rimraf": "^5.0.10",
     "typescript": "5.1.3",
diff --git a/workspaces/adapter/src/log.ts b/workspaces/adapter/src/log.ts
@@ -191,7 +191,7 @@ export function createLogger<Loggers = any, LoggerCategories extends string | nu
   log.table = (options: any[] | { rows: any[] }) => {
     const tableData = [];
 
-    options = Array.isArray(options) ? { rows: options } : options ?? {};
+    options = Array.isArray(options) ? { rows: options } : (options ?? {});
     options.rows = options.rows || [];
 
     for (const row of options.rows) {
diff --git a/workspaces/conflicter/src/conflicter.ts b/workspaces/conflicter/src/conflicter.ts
@@ -78,7 +78,10 @@ export class Conflicter {
   cwd: string;
   diffOptions?: any;
 
-  constructor(private readonly adapter: InputOutputAdapter, options?: ConflicterOptions) {
+  constructor(
+    private readonly adapter: InputOutputAdapter,
+    options?: ConflicterOptions,
+  ) {
     this.force = options?.force ?? false;
     this.bail = options?.bail ?? false;
     this.ignoreWhitespace = options?.ignoreWhitespace ?? false;
diff --git a/workspaces/conflicter/test/conflicter.test.ts b/workspaces/conflicter/test/conflicter.test.ts
@@ -6,11 +6,10 @@ import { Buffer } from 'node:buffer';
 import { describe, it, beforeEach, expect, vitest } from 'vitest';
 import { filter } from 'lodash-es';
 import slash from 'slash';
-import { QueuedAdapter, testing } from '@yeoman/adapter';
+import { QueuedAdapter } from '@yeoman/adapter';
+import { TestAdapter, defineConfig as defineTestAdapterConfig } from '@yeoman/adapter/testing';
 import { Conflicter, type ConflicterFile } from '../src/conflicter.js';
 
-const { TestAdapter, defineConfig: defineTestAdapterConfig } = testing;
-
 defineTestAdapterConfig({
   spyFactory: ({ returns }) => vitest.fn().mockReturnValue(returns),
 });
