chore(lint): add trailing commas (#10190)

This PR simply runs `yarn lint --fix` which has added trailing commas. This is now the expected result of prettier as in v3 they changed the default for `trailingComma ` - see [here](https://prettier.io/blog/2023/07/05/3.0.0.html#change-the-default-value-for-trailingcomma-to-all-11479httpsgithubcomprettierprettierpull11479-by-fiskerhttpsgithubcomfisker-13143httpsgithubcomprettierprettierpull13143-by-sosukesuzukihttpsgithubcomsosukesuzuki) for more detail. We could have updated our config to keep the current style but it was felt staying with defaults was better.
redwoodjs · Mar 11, 2024 · 36fa1dd · 36fa1dd
1 parent 8248392
commit 36fa1dd
Show file tree

Hide file tree

Showing 668 changed files with 5,080 additions and 5,047 deletions.
diff --git a/packages/adapters/fastify/web/src/resolveOptions.test.ts b/packages/adapters/fastify/web/src/resolveOptions.test.ts
@@ -36,9 +36,9 @@ describe('resolveOptions', () => {
             apiUrl: undefined,
             apiProxyTarget: '/api',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '/api']`
+        `[Error: If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '/api']`,
       )
     })
 
@@ -49,7 +49,7 @@ describe('resolveOptions', () => {
             apiUrl: undefined,
             apiProxyTarget: 'http://api.foo.com',
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {
@@ -72,9 +72,9 @@ describe('resolveOptions', () => {
             apiUrl: '',
             apiProxyTarget: undefined,
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: \`apiUrl\` cannot be an empty string]`
+        `[Error: \`apiUrl\` cannot be an empty string]`,
       )
     })
 
@@ -85,9 +85,9 @@ describe('resolveOptions', () => {
             apiUrl: '',
             apiProxyTarget: '',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: \`apiUrl\` cannot be an empty string]`
+        `[Error: \`apiUrl\` cannot be an empty string]`,
       )
     })
 
@@ -98,9 +98,9 @@ describe('resolveOptions', () => {
             apiUrl: '',
             apiProxyTarget: '/api',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: \`apiUrl\` cannot be an empty string]`
+        `[Error: \`apiUrl\` cannot be an empty string]`,
       )
     })
 
@@ -111,9 +111,9 @@ describe('resolveOptions', () => {
             apiUrl: '',
             apiProxyTarget: 'http://api.foo.com',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: \`apiUrl\` cannot be an empty string]`
+        `[Error: \`apiUrl\` cannot be an empty string]`,
       )
     })
   })
@@ -126,7 +126,7 @@ describe('resolveOptions', () => {
             apiUrl: '/api',
             apiProxyTarget: undefined,
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {
@@ -147,7 +147,7 @@ describe('resolveOptions', () => {
             apiUrl: '/api',
             apiProxyTarget: '',
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {
@@ -168,9 +168,9 @@ describe('resolveOptions', () => {
             apiUrl: '/api',
             apiProxyTarget: '/api',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '/api']`
+        `[Error: If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '/api']`,
       )
     })
 
@@ -181,7 +181,7 @@ describe('resolveOptions', () => {
             apiUrl: '/api',
             apiProxyTarget: 'http://api.foo.com',
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {
@@ -204,7 +204,7 @@ describe('resolveOptions', () => {
             apiUrl: 'http://api.foo.com',
             apiProxyTarget: undefined,
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {
@@ -225,7 +225,7 @@ describe('resolveOptions', () => {
             apiUrl: 'http://api.foo.com',
             apiProxyTarget: '',
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {
@@ -246,9 +246,9 @@ describe('resolveOptions', () => {
             apiUrl: 'http://api.foo.com',
             apiProxyTarget: '/api',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '/api']`
+        `[Error: If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '/api']`,
       )
     })
 
@@ -259,9 +259,9 @@ describe('resolveOptions', () => {
             apiUrl: 'http://api.foo.com',
             apiProxyTarget: 'http://api.foo.com',
           },
-        })
+        }),
       ).toThrowErrorMatchingInlineSnapshot(
-        `[Error: If you provide \`apiProxyTarget\`, \`apiUrl\` cannot be a fully-qualified URL. \`apiUrl\` is 'http://api.foo.com']`
+        `[Error: If you provide \`apiProxyTarget\`, \`apiUrl\` cannot be a fully-qualified URL. \`apiUrl\` is 'http://api.foo.com']`,
       )
     })
   })
@@ -273,7 +273,7 @@ describe('resolveOptions', () => {
           redwood: {
             apiHost: 'http://api.foo.com',
           },
-        })
+        }),
       ).toMatchInlineSnapshot(`
         {
           "flags": {

diff --git a/packages/adapters/fastify/web/src/resolveOptions.ts b/packages/adapters/fastify/web/src/resolveOptions.ts
@@ -26,7 +26,7 @@ export function resolveOptions(options: RedwoodFastifyWebOptions) {
     !isFullyQualifiedUrl(redwoodOptions.apiProxyTarget)
   ) {
     throw new Error(
-      `If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '${redwoodOptions.apiProxyTarget}'`
+      `If you provide \`apiProxyTarget\`, it has to be a fully-qualified URL. \`apiProxyTarget\` is '${redwoodOptions.apiProxyTarget}'`,
     )
   }
 
@@ -43,7 +43,7 @@ export function resolveOptions(options: RedwoodFastifyWebOptions) {
   // This is pretty unlikely because we default `apiUrl` to '/.redwood/functions'
   if (!redwoodOptions.apiUrl && redwoodOptions.apiProxyTarget) {
     throw new Error(
-      `If you provide \`apiProxyTarget\`, \`apiUrl\` has to be a relative URL. \`apiUrl\` is '${redwoodOptions.apiUrl}'`
+      `If you provide \`apiProxyTarget\`, \`apiUrl\` has to be a relative URL. \`apiUrl\` is '${redwoodOptions.apiUrl}'`,
     )
   }
 
@@ -58,7 +58,7 @@ export function resolveOptions(options: RedwoodFastifyWebOptions) {
   // ```
   if (apiUrlIsFullyQualifiedUrl && redwoodOptions.apiProxyTarget) {
     throw new Error(
-      `If you provide \`apiProxyTarget\`, \`apiUrl\` cannot be a fully-qualified URL. \`apiUrl\` is '${redwoodOptions.apiUrl}'`
+      `If you provide \`apiProxyTarget\`, \`apiUrl\` cannot be a fully-qualified URL. \`apiUrl\` is '${redwoodOptions.apiUrl}'`,
     )
   }
 

diff --git a/packages/adapters/fastify/web/src/web.test.ts b/packages/adapters/fastify/web/src/web.test.ts
@@ -53,7 +53,7 @@ describe('redwoodFastifyWeb', () => {
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
       expect(res.body).toBe(
-        fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8')
+        fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8'),
       )
     })
 
@@ -68,7 +68,7 @@ describe('redwoodFastifyWeb', () => {
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
       expect(res.body).toBe(
-        fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8')
+        fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8'),
       )
     })
 
@@ -85,7 +85,7 @@ describe('redwoodFastifyWeb', () => {
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
       expect(res.body).toBe(
-        fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8')
+        fs.readFileSync(path.join(getPaths().web.dist, `${url}.html`), 'utf-8'),
       )
     })
 
@@ -124,7 +124,7 @@ describe('redwoodFastifyWeb', () => {
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
       expect(res.body).toBe(
-        fs.readFileSync(path.join(getPaths().web.dist, url), 'utf-8')
+        fs.readFileSync(path.join(getPaths().web.dist, url), 'utf-8'),
       )
     })
 
@@ -137,7 +137,7 @@ describe('redwoodFastifyWeb', () => {
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
       expect(res.body).toBe(
-        fs.readFileSync(path.join(getPaths().web.dist, '200.html'), 'utf-8')
+        fs.readFileSync(path.join(getPaths().web.dist, '200.html'), 'utf-8'),
       )
     })
   })
@@ -153,13 +153,13 @@ describe('redwoodFastifyWeb', () => {
 
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe(
-        'application/javascript; charset=UTF-8'
+        'application/javascript; charset=UTF-8',
       )
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
-          'utf-8'
-        )
+          'utf-8',
+        ),
       )
     })
 
@@ -176,8 +176,8 @@ describe('redwoodFastifyWeb', () => {
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
-          'utf-8'
-        )
+          'utf-8',
+        ),
       )
     })
 
@@ -191,13 +191,13 @@ describe('redwoodFastifyWeb', () => {
 
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe(
-        'application/json; charset=UTF-8'
+        'application/json; charset=UTF-8',
       )
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
-          'utf-8'
-        )
+          'utf-8',
+        ),
       )
     })
 
@@ -224,8 +224,8 @@ describe('redwoodFastifyWeb', () => {
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
-          'utf-8'
-        )
+          'utf-8',
+        ),
       )
     })
 
@@ -242,8 +242,8 @@ describe('redwoodFastifyWeb', () => {
       expect(res.body).toBe(
         fs.readFileSync(
           path.join(getPaths().web.dist, relativeFilePath),
-          'utf-8'
-        )
+          'utf-8',
+        ),
       )
     })
   })
@@ -319,10 +319,10 @@ describe('redwoodFastifyWeb', () => {
 
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe(
-        'application/json; charset=utf-8'
+        'application/json; charset=utf-8',
       )
       expect(res.body).toMatchInlineSnapshot(
-        `"{"data":null,"errors":[{"message":"Bad Gateway: you may have misconfigured apiUrl and apiProxyTarget. If apiUrl is a relative URL, you must provide apiProxyTarget.","extensions":{"code":"BAD_GATEWAY","httpStatus":502}}]}"`
+        `"{"data":null,"errors":[{"message":"Bad Gateway: you may have misconfigured apiUrl and apiProxyTarget. If apiUrl is a relative URL, you must provide apiProxyTarget.","extensions":{"code":"BAD_GATEWAY","httpStatus":502}}]}"`,
       )
     })
 
@@ -336,10 +336,10 @@ describe('redwoodFastifyWeb', () => {
 
       expect(res.statusCode).toBe(200)
       expect(res.headers['content-type']).toBe(
-        'application/json; charset=utf-8'
+        'application/json; charset=utf-8',
       )
       expect(res.body).toMatchInlineSnapshot(
-        `"{"data":null,"errors":[{"message":"Bad Gateway: you may have misconfigured apiUrl and apiProxyTarget. If apiUrl is a relative URL, you must provide apiProxyTarget.","extensions":{"code":"BAD_GATEWAY","httpStatus":502}}]}"`
+        `"{"data":null,"errors":[{"message":"Bad Gateway: you may have misconfigured apiUrl and apiProxyTarget. If apiUrl is a relative URL, you must provide apiProxyTarget.","extensions":{"code":"BAD_GATEWAY","httpStatus":502}}]}"`,
       )
     })
   })

diff --git a/packages/adapters/fastify/web/src/web.ts b/packages/adapters/fastify/web/src/web.ts
@@ -17,7 +17,7 @@ export { coerceRootPath, RedwoodFastifyWebOptions }
 
 export async function redwoodFastifyWeb(
   fastify: FastifyInstance,
-  opts: RedwoodFastifyWebOptions
+  opts: RedwoodFastifyWebOptions,
 ) {
   const { redwoodOptions, flags } = resolveOptions(opts)
 

diff --git a/packages/adapters/fastify/web/src/webFallback.test.ts b/packages/adapters/fastify/web/src/webFallback.test.ts
@@ -39,7 +39,7 @@ describe('webFallback', () => {
     expect(res.statusCode).toBe(200)
     expect(res.headers['content-type']).toBe('text/html; charset=UTF-8')
     expect(res.body).toBe(
-      fs.readFileSync(path.join(getPaths().web.dist, url), 'utf-8')
+      fs.readFileSync(path.join(getPaths().web.dist, url), 'utf-8'),
     )
 
     await fastify.close()

diff --git a/packages/api-server/src/__tests__/api.test.ts b/packages/api-server/src/__tests__/api.test.ts
@@ -132,7 +132,7 @@ describe('redwoodFastifyAPI', () => {
 
       expect(res.statusCode).toEqual(404)
       expect(res.body).toEqual(
-        'Function &quot;deeplyNested&quot; was not found.'
+        'Function &quot;deeplyNested&quot; was not found.',
       )
     })
   })