redwoodjs · thedavidprice · May 18, 2021 · May 14, 2021 · May 15, 2021 · May 15, 2021
diff --git a/packages/api-server/src/app.ts b/packages/api-server/src/app.ts
@@ -1,7 +1,8 @@
 import express from 'express'
-import type { Response, Request, Application } from 'express'
 import morgan from 'morgan'
 
+import type { Response, Request, Application } from 'express'
+
 // Base express app, with common config
 const createApp = (): Application => {
   const app = express()

diff --git a/packages/api-server/src/error.ts b/packages/api-server/src/error.ts
@@ -1,5 +1,5 @@
-import Youch from 'youch'
 import forTerminal from 'youch-terminal'
+import Youch from 'youch'
 
 /**
  * This function will print a pretty version of an error in the terminal.

diff --git a/packages/api-server/src/handler.ts b/packages/api-server/src/handler.ts
@@ -5,6 +5,7 @@ import withApiProxy from './middleware/withApiProxy'
 import withFunctions from './middleware/withFunctions'
 import withWebServer from './middleware/withWebServer'
 import { startServer } from './server'
+
 import type { HttpServerParams } from './server'
 
 /*
@@ -35,8 +36,7 @@ export const webCliOptions = {
   apiHost: {
     alias: 'api-host',
     type: 'string',
-    desc:
-      'Forward requests from the apiProxyPath, defined in redwood.toml to this host',
+    desc: 'Forward requests from the apiProxyPath, defined in redwood.toml to this host',
   },
 } as const
 

diff --git a/packages/api-server/src/middleware/withApiProxy.ts b/packages/api-server/src/middleware/withApiProxy.ts
@@ -1,6 +1,7 @@
-import type { Application } from 'express'
 import { createProxyMiddleware } from 'http-proxy-middleware'
 
+import type { Application } from 'express'
+
 interface ApiProxyOptions {
   apiProxyPath: string
   apiHost?: string

diff --git a/packages/api-server/src/middleware/withFunctions.ts b/packages/api-server/src/middleware/withFunctions.ts
@@ -1,15 +1,16 @@
 import path from 'path'
 
-import type { Handler } from 'aws-lambda'
 import bodyParser from 'body-parser'
-import type { Application, Request, Response } from 'express'
 import glob from 'glob'
 import escape from 'lodash.escape'
 
 import { getPaths } from '@redwoodjs/internal'
 
 import { requestHandler } from '../requestHandlers/awsLambda'
 
+import type { Handler } from 'aws-lambda'
+import type { Application, Request, Response } from 'express'
+
 export type Lambdas = Record<string, Handler>
 const LAMBDA_FUNCTIONS: Lambdas = {}
 

diff --git a/packages/api-server/src/middleware/withWebServer.ts b/packages/api-server/src/middleware/withWebServer.ts
@@ -1,11 +1,12 @@
 import fs from 'fs'
 import path from 'path'
 
-import type { Application } from 'express'
 import express from 'express'
 
 import { getPaths } from '@redwoodjs/internal'
 
+import type { Application } from 'express'
+
 const withWebServer = (app: Application) => {
   const indexContent = fs.readFileSync(
     path.join(getPaths().web.dist, '/index.html'),

diff --git a/packages/api-server/src/requestHandlers/awsLambda.ts b/packages/api-server/src/requestHandlers/awsLambda.ts
@@ -1,12 +1,13 @@
+import qs from 'qs'
+
+import { handleError } from '../error'
+
 import type {
   APIGatewayProxyResult,
   APIGatewayProxyEvent,
   Handler,
 } from 'aws-lambda'
 import type { Response, Request } from 'express'
-import qs from 'qs'
-
-import { handleError } from '../error'
 
 export const parseBody = (rawBody: string | Buffer) => {
   if (typeof rawBody === 'string') {
@@ -91,17 +92,16 @@ export const requestHandler = async (
   // We take the express request object and convert it into a lambda function event.
   const event = lambdaEventForExpressRequest(req)
 
-  const handlerCallback = (expressResFn: Response) => (
-    error: Error,
-    lambdaResult: APIGatewayProxyResult
-  ) => {
-    if (error) {
-      expressResponseForLambdaError(expressResFn, error)
-      return
-    }
+  const handlerCallback =
+    (expressResFn: Response) =>
+    (error: Error, lambdaResult: APIGatewayProxyResult) => {
+      if (error) {
+        expressResponseForLambdaError(expressResFn, error)
+        return
+      }
 
-    expressResponseForLambdaResult(expressResFn, lambdaResult)
-  }
+      expressResponseForLambdaResult(expressResFn, lambdaResult)
+    }
 
   // Execute the lambda function.
   // https://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html

diff --git a/packages/api/src/auth/decoders/index.ts b/packages/api/src/auth/decoders/index.ts
@@ -1,5 +1,3 @@
-import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
-
 import type { SupportedAuthTypes } from '@redwoodjs/auth'
 
 import type { GlobalContext } from 'src/globalContext'
@@ -10,6 +8,8 @@ import { ethereum } from './ethereum'
 import { netlify } from './netlify'
 import { nhost } from './nhost'
 import { supabase } from './supabase'
+
+import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
 const noop = (token: string) => token
 
 interface Req {

diff --git a/packages/api/src/auth/decoders/netlify.ts b/packages/api/src/auth/decoders/netlify.ts
@@ -1,5 +1,6 @@
-import type { Context as LambdaContext, ClientContext } from 'aws-lambda'
 import jwt, { TokenExpiredError } from 'jsonwebtoken'
+
+import type { Context as LambdaContext, ClientContext } from 'aws-lambda'
 // import type { TokenExpiredError } from 'jsonwebtoken'
 
 type NetlifyContext = ClientContext & {

diff --git a/packages/api/src/auth/index.ts b/packages/api/src/auth/index.ts
@@ -1,11 +1,11 @@
-import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
-
 import type { SupportedAuthTypes } from '@redwoodjs/auth'
 
 import type { GlobalContext } from 'src/globalContext'
 
 import { decodeToken } from './decoders'
 
+import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
+
 // This is shared by `@redwoodjs/web`
 const AUTH_PROVIDER_HEADER = 'auth-provider'
 

diff --git a/packages/api/src/auth/verifiers/common.ts b/packages/api/src/auth/verifiers/common.ts
@@ -1,14 +1,15 @@
 import jwtVerifier from './jwtVerifier'
-import type { JwtVerifier } from './jwtVerifier'
 import secretKeyVerifier from './secretKeyVerifier'
-import type { SecretKeyVerifier } from './secretKeyVerifier'
 import sha1Verifier from './sha1Verifier'
-import type { Sha1Verifier } from './sha1Verifier'
 import sha256Verifier from './sha256Verifier'
-import type { Sha256Verifier } from './sha256Verifier'
 import skipVerifier from './skipVerifier'
-import type { SkipVerifier } from './skipVerifier'
 import timestampSchemeVerifier from './timestampSchemeVerifier'
+
+import type { JwtVerifier } from './jwtVerifier'
+import type { SecretKeyVerifier } from './secretKeyVerifier'
+import type { Sha1Verifier } from './sha1Verifier'
+import type { Sha256Verifier } from './sha256Verifier'
+import type { SkipVerifier } from './skipVerifier'
 import type { TimestampSchemeVerifier } from './timestampSchemeVerifier'
 
 export const verifierLookup = {

diff --git a/packages/api/src/auth/verifiers/index.ts b/packages/api/src/auth/verifiers/index.ts
@@ -1,4 +1,5 @@
 import { verifierLookup } from './common'
+
 import type {
   SupportedVerifierTypes,
   VerifyOptions,

diff --git a/packages/api/src/auth/verifiers/jwtVerifier.ts b/packages/api/src/auth/verifiers/jwtVerifier.ts
@@ -5,6 +5,7 @@ import {
   WebhookVerificationError,
   DEFAULT_WEBHOOK_SECRET,
 } from './common'
+
 import type { WebhookVerifier, VerifyOptions } from './common'
 
 export interface JwtVerifier extends WebhookVerifier {

diff --git a/packages/api/src/auth/verifiers/secretKeyVerifier.ts b/packages/api/src/auth/verifiers/secretKeyVerifier.ts
@@ -1,4 +1,5 @@
 import { WebhookVerificationError, DEFAULT_WEBHOOK_SECRET } from './common'
+
 import type { WebhookVerifier, VerifyOptions } from './common'
 
 export interface SecretKeyVerifier extends WebhookVerifier {

diff --git a/packages/api/src/auth/verifiers/sha1Verifier.ts b/packages/api/src/auth/verifiers/sha1Verifier.ts
@@ -5,6 +5,7 @@ import {
   VERIFICATION_ERROR_MESSAGE,
   DEFAULT_WEBHOOK_SECRET,
 } from './common'
+
 import type { WebhookVerifier, VerifyOptions } from './common'
 
 export interface Sha1Verifier extends WebhookVerifier {

diff --git a/packages/api/src/auth/verifiers/sha256Verifier.ts b/packages/api/src/auth/verifiers/sha256Verifier.ts
@@ -5,6 +5,7 @@ import {
   VERIFICATION_ERROR_MESSAGE,
   DEFAULT_WEBHOOK_SECRET,
 } from './common'
+
 import type { WebhookVerifier, VerifyOptions } from './common'
 
 export interface Sha256Verifier extends WebhookVerifier {

diff --git a/packages/api/src/auth/verifiers/timestampSchemeVerifier.ts b/packages/api/src/auth/verifiers/timestampSchemeVerifier.ts
@@ -1,6 +1,7 @@
 import { createHmac } from 'crypto'
 
 import { WebhookVerificationError, DEFAULT_WEBHOOK_SECRET } from './common'
+
 import type { WebhookVerifier, VerifyOptions } from './common'
 
 export interface TimestampSchemeVerifier extends WebhookVerifier {

diff --git a/packages/api/src/functions/graphql.ts b/packages/api/src/functions/graphql.ts
@@ -1,7 +1,4 @@
-import type { Context, ContextFunction } from 'apollo-server-core'
-import type { Config, CreateHandlerOptions } from 'apollo-server-lambda'
 import { ApolloServer } from 'apollo-server-lambda'
-import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
 
 import type { AuthContextPayload } from 'src/auth'
 import { getAuthenticationContext } from 'src/auth'
@@ -12,6 +9,10 @@ import {
   usePerRequestContext,
 } from 'src/globalContext'
 
+import type { Context, ContextFunction } from 'apollo-server-core'
+import type { Config, CreateHandlerOptions } from 'apollo-server-lambda'
+import type { APIGatewayProxyEvent, Context as LambdaContext } from 'aws-lambda'
+
 export type GetCurrentUser = (
   decoded: AuthContextPayload[0],
   raw: AuthContextPayload[1],

diff --git a/packages/api/src/global.api-auto-imports.ts b/packages/api/src/global.api-auto-imports.ts
@@ -1,7 +1,6 @@
 /* eslint-disable no-redeclare,  no-undef */
-import type _gql from 'graphql-tag'
-
 import type { GlobalContext } from './globalContext'
+import type _gql from 'graphql-tag'
 
 declare global {
   const gql: typeof _gql

diff --git a/packages/api/src/logger/index.ts b/packages/api/src/logger/index.ts
@@ -1,4 +1,5 @@
 import { PrismaClient } from '@prisma/client'
+import * as prettyPrint from 'pino-pretty'
 import pino, {
   BaseLogger,
   DestinationStream,
@@ -7,7 +8,6 @@ import pino, {
   PrettyOptions,
   redactOptions,
 } from 'pino'
-import * as prettyPrint from 'pino-pretty'
 
 export type LogLevel = 'info' | 'query' | 'warn' | 'error'
 

diff --git a/packages/api/src/logger/logger.test.ts b/packages/api/src/logger/logger.test.ts
@@ -212,8 +212,7 @@ describe('logger', () => {
 
       logger.info(
         {
-          jwt:
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
+          jwt: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c',
         },
         'test of a redacted JWT'
       )

diff --git a/packages/api/src/makeMergedSchema/makeMergedSchema.ts b/packages/api/src/makeMergedSchema/makeMergedSchema.ts
@@ -5,14 +5,15 @@ import {
   IResolvers,
   IExecutableSchemaDefinition,
 } from 'apollo-server-lambda'
-import type { GraphQLSchema, GraphQLFieldMap } from 'graphql'
 import merge from 'lodash.merge'
 import omitBy from 'lodash.omitby'
 
 import { Services, GraphQLTypeWithFields } from 'src/types'
 
 import * as rootSchema from './rootSchema'
 
+import type { GraphQLSchema, GraphQLFieldMap } from 'graphql'
+
 const mapFieldsToService = ({
   fields = {},
   resolvers: unmappedResolvers,

diff --git a/packages/api/src/webhooks/index.ts b/packages/api/src/webhooks/index.ts
@@ -1,5 +1,3 @@
-import type { APIGatewayProxyEvent } from 'aws-lambda'
-
 import {
   createVerifier,
   VerifyOptions,
@@ -8,6 +6,8 @@ import {
   SupportedVerifierTypes,
 } from 'src/auth/verifiers'
 
+import type { APIGatewayProxyEvent } from 'aws-lambda'
+
 export {
   VerifyOptions,
   WebhookVerificationError,

diff --git a/packages/api/src/webhooks/webhooks.test.ts b/packages/api/src/webhooks/webhooks.test.ts
@@ -1,5 +1,3 @@
-import type { APIGatewayProxyEvent } from 'aws-lambda'
-
 import {
   signPayload,
   verifyEvent,
@@ -8,6 +6,8 @@ import {
   DEFAULT_WEBHOOK_SIGNATURE_HEADER,
 } from './index'
 
+import type { APIGatewayProxyEvent } from 'aws-lambda'
+
 const payload = 'No more secrets, Marty.'
 const secret = 'MY_VOICE_IS_MY_PASSPORT_VERIFY_ME'
 

diff --git a/packages/auth/src/AuthProvider.tsx b/packages/auth/src/AuthProvider.tsx
@@ -1,12 +1,13 @@
 import React from 'react'
 
+import { createAuthClient } from './authClients'
+
 import type {
   AuthClient,
   SupportedAuthTypes,
   SupportedAuthClients,
   SupportedUserMetadata,
 } from './authClients'
-import { createAuthClient } from './authClients'
 
 export interface CurrentUser {
   roles?: Array<string>

diff --git a/packages/auth/src/__tests__/AuthProvider.test.tsx b/packages/auth/src/__tests__/AuthProvider.test.tsx
@@ -7,10 +7,11 @@ import '@testing-library/jest-dom/extend-expect'
 import { graphql } from 'msw'
 import { setupServer } from 'msw/node'
 
-import type { AuthClient } from '../authClients'
 import { AuthProvider } from '../AuthProvider'
 import { useAuth } from '../useAuth'
 
+import type { AuthClient } from '../authClients'
+
 let CURRENT_USER_DATA: { name: string; email: string; roles?: string[] } = {
   name: 'Peter Pistorius',
   email: 'nospam@example.net',

diff --git a/packages/auth/src/authClients/auth0.ts b/packages/auth/src/authClients/auth0.ts
@@ -1,6 +1,5 @@
-import type { Auth0Client as Auth0 } from '@auth0/auth0-spa-js'
-
 import type { AuthClient } from './'
+import type { Auth0Client as Auth0 } from '@auth0/auth0-spa-js'
 
 export type AuthClientAuth0 = AuthClient
 

diff --git a/packages/auth/src/authClients/azureActiveDirectory.ts b/packages/auth/src/authClients/azureActiveDirectory.ts
@@ -1,7 +1,7 @@
+import type { AuthClient } from './'
 import type { UserAgentApplication as AzureActiveDirectory } from 'msal'
 
 export type { AzureActiveDirectory }
-import type { AuthClient } from './'
 
 export type AzureActiveDirectoryClient = AzureActiveDirectory
 export interface AzureActiveDirectoryUser {}

diff --git a/packages/auth/src/authClients/firebase.ts b/packages/auth/src/authClients/firebase.ts
@@ -1,7 +1,8 @@
+import { AuthClient } from './'
+
 import type FirebaseNamespace from 'firebase/app'
-export type Firebase = typeof FirebaseNamespace
 
-import { AuthClient } from './'
+export type Firebase = typeof FirebaseNamespace
 
 // @TODO: Firebase doesn't export a list of providerIds they use
 // But I found them here: https://github.com/firebase/firebase-js-sdk/blob/a5768b0aa7d7ce732279931aa436e988c9f36487/packages/rules-unit-testing/src/api/index.ts

diff --git a/packages/auth/src/authClients/goTrue.ts b/packages/auth/src/authClients/goTrue.ts
@@ -1,7 +1,7 @@
+import type { AuthClient } from './index'
 import type { default as GoTrue } from 'gotrue-js'
 import type { User } from 'gotrue-js'
 
-import type { AuthClient } from './index'
 export type GoTrueUser = User
 export type { GoTrue }