redwoodjs · Josh-Walker-GM · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -14,7 +14,6 @@ module.exports = {
   extends: [
     'eslint:recommended',
     'plugin:react/recommended',
-    'plugin:prettier/recommended',
     'plugin:jest-dom/recommended',
   ],
   parser: '@babel/eslint-parser',
@@ -24,6 +23,8 @@ module.exports = {
       configFile: findBabelConfig(),
     },
   },
+  // Prevents unused eslint-disable comments
+  reportUnusedDisableDirectives: true,
   settings: {
     react: {
       version: 'detect',
@@ -47,7 +48,6 @@ module.exports = {
   ],
   plugins: [
     'unused-imports',
-    'prettier',
     '@babel',
     'import',
     'jsx-a11y',
@@ -60,8 +60,8 @@ module.exports = {
     curly: 'error',
     'unused-imports/no-unused-imports': 'error',
     '@redwoodjs/process-env-computed': 'error',
-    'prettier/prettier': 'warn',
     'no-console': 'off',
+    'no-extra-semi': 'off',
     'prefer-object-spread': 'warn',
     'prefer-spread': 'warn',
     'no-unused-expressions': [
@@ -122,7 +122,6 @@ module.exports = {
             //
             // Uses https://github.com/isaacs/minimatch under the hood
             // See https://github.com/isaacs/node-glob#glob-primer for syntax
-            // eslint-disable-next-line prettier/prettier
             pattern: 'src/*/**/*.?(sdl.){js,ts}',
             patternOptions: {
               nobrace: true,
@@ -167,7 +166,7 @@ module.exports = {
     {
       files: ['*.ts', '*.tsx'],
       parser: '@typescript-eslint/parser',
-      extends: ['plugin:@typescript-eslint/recommended', 'prettier'],
+      extends: ['plugin:@typescript-eslint/recommended'],
       rules: {
         // TODO: look into enabling these eventually
         '@typescript-eslint/no-empty-function': 'off',

diff --git a/.prettierignore b/.prettierignore
@@ -1,6 +1,22 @@
+# Ignore built code
 **/dist
 
-# Do not format Markdown files to allow easier documentation contribution
-*.md
+# Ignore fixture projects
+__fixtures__
 
-/.nx/cache
+# Ignore the docs (docusaurus) project
+docs/
+
+# Ignore the .nx directory
+/.nx
+
+# TODO(jgmw): Is this too broad?
+# Ignore test fixtures
+**/__testfixtures__
+**/__tests__/fixtures
+
+# TODO(jgmw): Re-enable these in managable chunks
+tasks
+.github
+.changesets
+packages/create-redwood-app/tests/e2e_prompts*
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "http://json.schemastore.org/prettierrc",
+  "bracketSpacing": true,
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "plugins": [
+    "prettier-plugin-curly",
+    "prettier-plugin-sh",
+    "prettier-plugin-packagejson"
+  ]
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,8 +1,9 @@
 {
   "recommendations": [
     "EditorConfig.EditorConfig",
-    "dbaeumer.vscode-eslint",
-    "mgmcdermott.vscode-language-babel"
+    "dbaeumer.vscode-eslint", // eslint
+    "mgmcdermott.vscode-language-babel", // babel
+    "esbenp.prettier-vscode", // prettier
   ],
   "unwantedRecommendations": [
     "johnpapa.vscode-peacock" // not used, still tries to apply it's settings

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,8 @@
 {
   "editor.tabSize": 2,
   "files.trimTrailingWhitespace": true,
-  "editor.formatOnSave": false,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },
@@ -20,7 +21,6 @@
     "files.trimTrailingWhitespace": false
   },
   "typescript.tsdk": "node_modules/typescript/lib",
-  "peacock.color": "#b85833",
   "cSpell.words": [
     "attw",
     "autoplay",
@@ -47,4 +47,4 @@
     "tailwindcss",
     "waku"
   ]
-}
+}
diff --git a/package.json b/package.json
@@ -23,6 +23,8 @@
     "check:package": "nx run-many -t check:package --output-style static",
     "clean:prisma": "rimraf node_modules/.prisma/client && node node_modules/@prisma/client/scripts/postinstall.js",
     "e2e": "node ./tasks/run-e2e",
+    "format": "prettier . --write",
+    "format:check": "prettier . --check",
     "generate-dependency-graph": "node ./tasks/generateDependencyGraph.mjs",
     "install:all": "concurrently -g -c auto -n install:fw \"yarn install\" npm:install:crwrsca",
     "install:ci": "concurrently -g -c auto -n install:fw:ci \"yarn install --inline-builds\" npm:install:crwrsca:ci",
@@ -113,6 +115,10 @@
     "npm-packlist": "8.0.2",
     "nx": "19.5.7",
     "ora": "8.0.1",
+    "prettier": "3.3.3",
+    "prettier-plugin-curly": "0.2.2",
+    "prettier-plugin-packagejson": "2.5.1",
+    "prettier-plugin-sh": "0.14.0",
     "prompts": "2.4.2",
     "rimraf": "6.0.1",
     "tstyche": "2.1.1",

diff --git a/packages/babel-config/src/__tests__/api.test.ts b/packages/babel-config/src/__tests__/api.test.ts
@@ -194,7 +194,7 @@ describe('api', () => {
         loglevel: string
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+       
       const [_, babelPluginModuleResolverConfig] = apiSideBabelPlugins.find(
         (plugin) => plugin[0] === 'babel-plugin-module-resolver',
       )! as [any, ModuleResolverConfig, any]

diff --git a/packages/cli/src/commands/__tests__/studioHandler.test.js b/packages/cli/src/commands/__tests__/studioHandler.test.js
@@ -1,5 +1,5 @@
 // Have to use `var` here to avoid "Temporal Dead Zone" issues
-// eslint-disable-next-line
+ 
 var mockedRedwoodVersion = '0.0.0'
 
 vi.mock('@redwoodjs/project-config', async (importOriginal) => {

diff --git a/packages/context/src/context.ts b/packages/context/src/context.ts
@@ -1,4 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
+ 
 
 import { getAsyncStoreInstance } from './store'
 

diff --git a/packages/context/src/global.api-auto-imports.ts b/packages/context/src/global.api-auto-imports.ts
@@ -1,4 +1,4 @@
-/* eslint-disable no-redeclare,  no-undef */
+ 
 import type { GlobalContext } from './context'
 
 declare global {

diff --git a/packages/context/src/store.ts b/packages/context/src/store.ts
@@ -1,4 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
+ 
 
 import { AsyncLocalStorage } from 'async_hooks'
 

diff --git a/packages/cookie-jar/src/CookieJar.test.ts b/packages/cookie-jar/src/CookieJar.test.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
+ 
 /* to keep the tests a little cleaner by using ! */
 
 import { describe, expect, test } from 'vitest'

diff --git a/packages/create-redwood-app/templates/js/api/src/lib/auth.js b/packages/create-redwood-app/templates/js/api/src/lib/auth.js
@@ -19,7 +19,7 @@ export const hasRole = ({ roles }) => {
 // in ./api/src/directives/requireAuth
 
 // Roles are passed in by the requireAuth directive if you have auth setup
-// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line no-unused-vars
 export const requireAuth = ({ roles }) => {
   return isAuthenticated()
 }

diff --git a/packages/create-redwood-app/templates/ts/api/src/lib/auth.ts b/packages/create-redwood-app/templates/ts/api/src/lib/auth.ts
@@ -19,7 +19,7 @@ export const hasRole = ({ roles }) => {
 // in ./api/src/directives/requireAuth
 
 // Roles are passed in by the requireAuth directive if you have auth setup
-// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export const requireAuth = ({ roles }) => {
   return isAuthenticated()
 }

diff --git a/packages/eslint-config/shared.js b/packages/eslint-config/shared.js
@@ -109,7 +109,6 @@ module.exports = {
             //
             // Uses https://github.com/isaacs/minimatch under the hood
             // See https://github.com/isaacs/node-glob#glob-primer for syntax
-            // eslint-disable-next-line prettier/prettier
             pattern: 'src/*/**/*.?(sdl.){js,ts}',
             patternOptions: {
               nobrace: true,

diff --git a/packages/graphql-server/src/createGraphQLYoga.ts b/packages/graphql-server/src/createGraphQLYoga.ts
@@ -1,4 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
+ 
 import { useDisableIntrospection } from '@envelop/disable-introspection'
 import { useFilterAllowedOperations } from '@envelop/filter-operation-type'
 import type { GraphQLSchema } from 'graphql'

diff --git a/packages/graphql-server/src/global.api-auto-imports.ts b/packages/graphql-server/src/global.api-auto-imports.ts
@@ -1,4 +1,4 @@
-/* eslint-disable no-redeclare,  no-undef */
+ 
 import type _gql from 'graphql-tag'
 
 declare global {

diff --git a/packages/graphql-server/src/globalContext.ts b/packages/graphql-server/src/globalContext.ts
@@ -1,4 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
+ 
 
 import { getAsyncStoreInstance } from './globalContextStore'
 

diff --git a/packages/graphql-server/src/globalContextStore.ts b/packages/graphql-server/src/globalContextStore.ts
@@ -1,4 +1,4 @@
-/* eslint-disable react-hooks/rules-of-hooks */
+ 
 
 import { AsyncLocalStorage } from 'async_hooks'
 

diff --git a/packages/graphql-server/src/plugins/useRedwoodOpenTelemetry.ts b/packages/graphql-server/src/plugins/useRedwoodOpenTelemetry.ts
@@ -106,7 +106,7 @@ export const useRedwoodOpenTelemetry = (
             onExecuteDone({ result }) {
               if (isAsyncIterable(result)) {
                 executionSpan.end()
-                // eslint-disable-next-line no-console
+                 
                 console.warn(
                   `Plugin "RedwoodOpenTelemetry" encountered an AsyncIterator which is not supported yet, so tracing data is not available for the operation.`,
                 )

diff --git a/packages/internal/src/jsx.ts b/packages/internal/src/jsx.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
+ 
 import type { types } from '@babel/core'
 import traverse from '@babel/traverse'
 

diff --git a/packages/structure/src/ide.ts b/packages/structure/src/ide.ts
@@ -205,7 +205,7 @@ export abstract class BaseNode {
   }
 
   @lazy() get closestContainingUri(): string | undefined {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+     
     const { uri } = this as any
     if (uri) {
       return uri

diff --git a/packages/structure/src/x/vscode.ts b/packages/structure/src/x/vscode.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
+ 
 
 // vscode is a compile-time only dependency
 // we only use it in type declarations
@@ -228,7 +228,7 @@ export class RemoteTreeDataProviderImpl implements RemoteTreeDataProvider {
   onDidChangeTreeData(listener: (e: string | undefined) => void) {
     this.lazyInit()
     this.listeners.push(listener)
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+     
     return null as any // TODO: disposable (we're not using it for now)
   }
 

diff --git a/packages/testing/src/web/mockRequests.ts b/packages/testing/src/web/mockRequests.ts
@@ -147,7 +147,7 @@ const mockGraphQL = (
     )
   }
 
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+   
   registerHandler(graphql[type](operation, resolver))
   return data
 }

diff --git a/packages/web/src/global.web-auto-imports.ts b/packages/web/src/global.web-auto-imports.ts
@@ -30,7 +30,7 @@ declare global {
 
   type GraphQLOperationVariables = Record<string, any>
 
-  /* eslint-disable no-unused-vars, @typescript-eslint/no-unused-vars */
+  /* eslint-disable @typescript-eslint/no-unused-vars */
   // Overridable graphQL hook return types
   interface QueryOperationResult<
     TData = any,

diff --git a/prettier.config.js b/prettier.config.js