redwoodjs · Tobbe · Sep 5, 2023 · Aug 29, 2023 · Aug 29, 2023 · Aug 29, 2023
diff --git a/packages/api-server/src/__tests__/withApiProxy.test.ts b/packages/api-server/src/__tests__/withApiProxy.test.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { FastifyInstance } from 'fastify'
+import type { FastifyInstance } from 'fastify'
 
 import withApiProxy from '../plugins/withApiProxy'
 

diff --git a/packages/api-server/src/__tests__/withFunctions.test.ts b/packages/api-server/src/__tests__/withFunctions.test.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { FastifyInstance, FastifyPluginCallback } from 'fastify'
+import type { FastifyInstance, FastifyPluginCallback } from 'fastify'
 
 import { loadFastifyConfig } from '../fastify'
 import withFunctions from '../plugins/withFunctions'

diff --git a/packages/api-server/src/__tests__/withWebServer.test.ts b/packages/api-server/src/__tests__/withWebServer.test.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 
-import { FastifyInstance, FastifyPluginCallback } from 'fastify'
+import type { FastifyInstance, FastifyPluginCallback } from 'fastify'
 
 import { loadFastifyConfig } from '../fastify'
 import withWebServer from '../plugins/withWebServer'

diff --git a/packages/api-server/src/cliHandlers.ts b/packages/api-server/src/cliHandlers.ts
@@ -7,7 +7,7 @@ import withApiProxy from './plugins/withApiProxy'
 import withFunctions from './plugins/withFunctions'
 import withWebServer from './plugins/withWebServer'
 import { startServer as startFastifyServer } from './server'
-import { BothServerArgs, WebServerArgs, ApiServerArgs } from './types'
+import type { BothServerArgs, WebServerArgs, ApiServerArgs } from './types'
 
 /*
  * This file has defines CLI handlers used by the redwood cli, for `rw serve`

diff --git a/packages/api-server/src/fastify.ts b/packages/api-server/src/fastify.ts
@@ -6,7 +6,7 @@ import Fastify from 'fastify'
 
 import { getPaths, getConfig } from '@redwoodjs/project-config'
 
-import { FastifySideConfigFn } from './types'
+import type { FastifySideConfigFn } from './types'
 
 const DEFAULT_OPTIONS = {
   logger: {

diff --git a/packages/api-server/src/plugins/lambdaLoader.ts b/packages/api-server/src/plugins/lambdaLoader.ts
@@ -3,7 +3,11 @@ import path from 'path'
 import c from 'ansi-colors'
 import type { Handler } from 'aws-lambda'
 import fg from 'fast-glob'
-import { FastifyReply, FastifyRequest, RequestGenericInterface } from 'fastify'
+import type {
+  FastifyReply,
+  FastifyRequest,
+  RequestGenericInterface,
+} from 'fastify'
 import { escape } from 'lodash'
 
 import { getPaths } from '@redwoodjs/project-config'

diff --git a/packages/api-server/src/plugins/withApiProxy.ts b/packages/api-server/src/plugins/withApiProxy.ts
@@ -1,5 +1,6 @@
-import httpProxy, { FastifyHttpProxyOptions } from '@fastify/http-proxy'
-import { FastifyInstance } from 'fastify'
+import type { FastifyHttpProxyOptions } from '@fastify/http-proxy'
+import httpProxy from '@fastify/http-proxy'
+import type { FastifyInstance } from 'fastify'
 
 export interface ApiProxyOptions {
   apiUrl: string

diff --git a/packages/api-server/src/plugins/withFunctions.ts b/packages/api-server/src/plugins/withFunctions.ts
@@ -1,5 +1,5 @@
 import fastifyUrlData from '@fastify/url-data'
-import { FastifyInstance } from 'fastify'
+import type { FastifyInstance } from 'fastify'
 import fastifyRawBody from 'fastify-raw-body'
 
 import { loadFastifyConfig } from '../fastify'

diff --git a/packages/api-server/src/plugins/withWebServer.ts b/packages/api-server/src/plugins/withWebServer.ts
@@ -2,12 +2,12 @@ import fs from 'fs'
 import path from 'path'
 
 import fastifyStatic from '@fastify/static'
-import { FastifyInstance, FastifyReply } from 'fastify'
+import type { FastifyInstance, FastifyReply } from 'fastify'
 
 import { getPaths } from '@redwoodjs/project-config'
 
 import { loadFastifyConfig } from '../fastify'
-import { WebServerArgs } from '../types'
+import type { WebServerArgs } from '../types'
 
 import { findPrerenderedHtml } from './findPrerenderedHtml'
 

diff --git a/packages/api-server/src/server.ts b/packages/api-server/src/server.ts
@@ -1,4 +1,4 @@
-import { FastifyInstance } from 'fastify'
+import type { FastifyInstance } from 'fastify'
 
 export interface HttpServerParams {
   port: number

diff --git a/packages/api-server/src/types.ts b/packages/api-server/src/types.ts
@@ -1,6 +1,6 @@
-import { FastifyInstance } from 'fastify'
+import type { FastifyInstance } from 'fastify'
 
-import { HttpServerParams } from './server'
+import type { HttpServerParams } from './server'
 
 export interface WebServerArgs extends Omit<HttpServerParams, 'fastify'> {
   apiHost?: string

diff --git a/packages/api/src/auth/__tests__/getAuthenticationContext.test.ts b/packages/api/src/auth/__tests__/getAuthenticationContext.test.ts
@@ -1,4 +1,4 @@
-import { APIGatewayProxyEvent, Context } from 'aws-lambda'
+import type { APIGatewayProxyEvent, Context } from 'aws-lambda'
 
 import { getAuthenticationContext } from '../index'
 

diff --git a/packages/api/src/cache/index.ts b/packages/api/src/cache/index.ts
@@ -1,6 +1,6 @@
 import type { Logger } from '../logger'
 
-import BaseClient from './clients/BaseClient'
+import type BaseClient from './clients/BaseClient'
 import { CacheTimeoutError } from './errors'
 
 export { default as MemcachedClient } from './clients/MemcachedClient'

diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts
@@ -2,7 +2,7 @@
  * Houses utility types commonly used on the api side
  */
 
-import { O, A } from 'ts-toolbelt'
+import type { O, A } from 'ts-toolbelt'
 
 /**
  * ---- Prisma SDL Type Merge ----

diff --git a/packages/api/src/webhooks/index.ts b/packages/api/src/webhooks/index.ts
@@ -1,11 +1,10 @@
 import type { APIGatewayProxyEvent } from 'aws-lambda'
 
+import type { VerifyOptions, SupportedVerifierTypes } from '../auth/verifiers'
 import {
   createVerifier,
-  VerifyOptions,
   WebhookVerificationError,
   DEFAULT_WEBHOOK_SECRET,
-  SupportedVerifierTypes,
   DEFAULT_TOLERANCE,
 } from '../auth/verifiers'
 

diff --git a/packages/auth-providers/auth0/api/src/decoder.ts b/packages/auth-providers/auth0/api/src/decoder.ts
@@ -1,7 +1,7 @@
 import jwt from 'jsonwebtoken'
 import jwksClient from 'jwks-rsa'
 
-import { Decoder } from '@redwoodjs/api'
+import type { Decoder } from '@redwoodjs/api'
 
 /**
  * This takes an auth0 jwt and verifies it. It returns something like this:

diff --git a/packages/auth-providers/auth0/setup/src/setup.ts b/packages/auth-providers/auth0/setup/src/setup.ts
@@ -1,4 +1,4 @@
-import * as yargs from 'yargs'
+import type * as yargs from 'yargs'
 
 import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 

diff --git a/packages/auth-providers/auth0/setup/src/setupHandler.ts b/packages/auth-providers/auth0/setup/src/setupHandler.ts
@@ -3,7 +3,7 @@ import path from 'path'
 
 import { standardAuthHandler } from '@redwoodjs/cli-helpers'
 
-import { Args } from './setup'
+import type { Args } from './setup'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8')

diff --git a/packages/auth-providers/auth0/web/src/__tests__/auth0.test.tsx b/packages/auth-providers/auth0/web/src/__tests__/auth0.test.tsx
@@ -6,7 +6,7 @@ import type {
 } from '@auth0/auth0-spa-js'
 import { renderHook, act } from '@testing-library/react'
 
-import { CurrentUser } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
 
 import { createAuth } from '../auth0'
 

diff --git a/packages/auth-providers/auth0/web/src/auth0.ts b/packages/auth-providers/auth0/web/src/auth0.ts
@@ -4,7 +4,8 @@ import type {
   RedirectLoginOptions,
 } from '@auth0/auth0-spa-js'
 
-import { CurrentUser, createAuthentication } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
+import { createAuthentication } from '@redwoodjs/auth'
 
 // TODO: Map out this user properly.
 export interface Auth0User {}

diff --git a/packages/auth-providers/azureActiveDirectory/api/src/decoder.ts b/packages/auth-providers/azureActiveDirectory/api/src/decoder.ts
@@ -1,7 +1,7 @@
 import jwt from 'jsonwebtoken'
 import jwksClient from 'jwks-rsa'
 
-import { Decoder } from '@redwoodjs/api'
+import type { Decoder } from '@redwoodjs/api'
 
 export const authDecoder: Decoder = async (token: string, type: string) => {
   if (type !== 'azureActiveDirectory') {

diff --git a/packages/auth-providers/azureActiveDirectory/setup/src/setup.ts b/packages/auth-providers/azureActiveDirectory/setup/src/setup.ts
@@ -1,4 +1,4 @@
-import yargs from 'yargs'
+import type yargs from 'yargs'
 
 import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 

diff --git a/packages/auth-providers/azureActiveDirectory/setup/src/setupHandler.ts b/packages/auth-providers/azureActiveDirectory/setup/src/setupHandler.ts
@@ -3,7 +3,7 @@ import path from 'path'
 
 import { standardAuthHandler } from '@redwoodjs/cli-helpers'
 
-import { Args } from './setup'
+import type { Args } from './setup'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8')

diff --git a/packages/auth-providers/azureActiveDirectory/web/src/__tests__/azureActiveDirectory.test.tsx b/packages/auth-providers/azureActiveDirectory/web/src/__tests__/azureActiveDirectory.test.tsx
@@ -5,7 +5,7 @@ import type {
 } from '@azure/msal-browser'
 import { renderHook, act } from '@testing-library/react'
 
-import { CurrentUser } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
 
 import { createAuth } from '../azureActiveDirectory'
 

diff --git a/packages/auth-providers/azureActiveDirectory/web/src/azureActiveDirectory.ts b/packages/auth-providers/azureActiveDirectory/web/src/azureActiveDirectory.ts
@@ -1,12 +1,13 @@
-import {
+import type {
   EndSessionRequest,
   PublicClientApplication as AzureActiveDirectoryClient,
   RedirectRequest,
   SilentRequest,
-  InteractionRequiredAuthError,
 } from '@azure/msal-browser'
+import { InteractionRequiredAuthError } from '@azure/msal-browser'
 
-import { CurrentUser, createAuthentication } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
+import { createAuthentication } from '@redwoodjs/auth'
 
 export function createAuth(
   azureActiveDirectoryClient: AzureActiveDirectoryClient,

diff --git a/packages/auth-providers/clerk/api/src/decoder.ts b/packages/auth-providers/clerk/api/src/decoder.ts
@@ -1,4 +1,4 @@
-import { Decoder } from '@redwoodjs/api'
+import type { Decoder } from '@redwoodjs/api'
 
 /**
  * @deprecated This function will be removed; it uses a rate-limited API. Use `clerkAuthDecoder` instead.

diff --git a/packages/auth-providers/clerk/setup/src/setup.ts b/packages/auth-providers/clerk/setup/src/setup.ts
@@ -1,4 +1,4 @@
-import yargs from 'yargs'
+import type yargs from 'yargs'
 
 import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 

diff --git a/packages/auth-providers/clerk/setup/src/setupHandler.ts b/packages/auth-providers/clerk/setup/src/setupHandler.ts
@@ -3,7 +3,7 @@ import path from 'path'
 
 import { standardAuthHandler } from '@redwoodjs/cli-helpers'
 
-import { Args } from './setup'
+import type { Args } from './setup'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8')

diff --git a/packages/auth-providers/clerk/web/src/__tests__/clerk.test.tsx b/packages/auth-providers/clerk/web/src/__tests__/clerk.test.tsx
@@ -1,12 +1,12 @@
-import {
+import type {
   Clerk as ClerkClient,
   UserResource,
   EmailAddressResource,
   ActiveSessionResource,
 } from '@clerk/types'
 import { renderHook, act } from '@testing-library/react'
 
-import { CurrentUser } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
 
 import { createAuth } from '../clerk'
 

diff --git a/packages/auth-providers/clerk/web/src/clerk.tsx b/packages/auth-providers/clerk/web/src/clerk.tsx
@@ -1,4 +1,4 @@
-import {
+import type {
   SignInProps,
   SignUpProps,
   SignOutCallback,
@@ -7,7 +7,8 @@ import {
   SignOutOptions,
 } from '@clerk/types'
 
-import { CurrentUser, createAuthentication } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
+import { createAuthentication } from '@redwoodjs/auth'
 
 type Clerk = ClerkClient | undefined | null
 

diff --git a/packages/auth-providers/custom/setup/src/setup.ts b/packages/auth-providers/custom/setup/src/setup.ts
@@ -1,4 +1,4 @@
-import yargs from 'yargs'
+import type yargs from 'yargs'
 
 import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 

diff --git a/packages/auth-providers/custom/setup/src/setupHandler.ts b/packages/auth-providers/custom/setup/src/setupHandler.ts
@@ -6,7 +6,7 @@ import {
   standardAuthHandler,
 } from '@redwoodjs/cli-helpers'
 
-import { Args } from './setup'
+import type { Args } from './setup'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8')

diff --git a/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts b/packages/auth-providers/dbAuth/api/src/DbAuthHandler.ts
@@ -17,13 +17,8 @@ import CryptoJS from 'crypto-js'
 import md5 from 'md5'
 import { v4 as uuidv4 } from 'uuid'
 
-import {
-  CorsConfig,
-  CorsContext,
-  CorsHeaders,
-  createCorsContext,
-  normalizeRequest,
-} from '@redwoodjs/api'
+import type { CorsConfig, CorsContext, CorsHeaders } from '@redwoodjs/api'
+import { createCorsContext, normalizeRequest } from '@redwoodjs/api'
 
 import * as DbAuthError from './errors'
 import {

diff --git a/packages/auth-providers/dbAuth/api/src/decoder.ts b/packages/auth-providers/dbAuth/api/src/decoder.ts
@@ -1,6 +1,6 @@
 import type { APIGatewayProxyEvent } from 'aws-lambda'
 
-import { Decoder } from '@redwoodjs/api'
+import type { Decoder } from '@redwoodjs/api'
 
 import { dbAuthSession } from './shared'
 

diff --git a/packages/auth-providers/dbAuth/setup/src/setup.ts b/packages/auth-providers/dbAuth/setup/src/setup.ts
@@ -1,5 +1,5 @@
 import terminalLink from 'terminal-link'
-import yargs from 'yargs'
+import type yargs from 'yargs'
 
 export const command = 'dbAuth'
 export const description = 'Set up auth for for dbAuth'

diff --git a/packages/auth-providers/dbAuth/setup/src/setupHandler.ts b/packages/auth-providers/dbAuth/setup/src/setupHandler.ts
@@ -5,7 +5,7 @@ import prompts from 'prompts'
 
 import { standardAuthHandler } from '@redwoodjs/cli-helpers'
 
-import { Args } from './setup'
+import type { Args } from './setup'
 import { notes, extraTask } from './setupData'
 import {
   notes as webAuthnNotes,

diff --git a/packages/auth-providers/dbAuth/web/src/__tests__/dbAuth.test.ts b/packages/auth-providers/dbAuth/web/src/__tests__/dbAuth.test.ts
@@ -1,8 +1,9 @@
 import { renderHook, act } from '@testing-library/react'
 
-import { CurrentUser } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
 
-import { createDbAuthClient, DbAuthClientArgs, createAuth } from '../dbAuth'
+import type { DbAuthClientArgs } from '../dbAuth'
+import { createDbAuthClient, createAuth } from '../dbAuth'
 
 globalThis.RWJS_API_URL = '/.redwood/functions'
 globalThis.RWJS_API_GRAPHQL_URL = '/.redwood/functions/graphql'

diff --git a/packages/auth-providers/dbAuth/web/src/dbAuth.ts b/packages/auth-providers/dbAuth/web/src/dbAuth.ts
@@ -1,6 +1,7 @@
-import { createAuthentication, CurrentUser } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
+import { createAuthentication } from '@redwoodjs/auth'
 
-import { WebAuthnClientType } from './webAuthn'
+import type { WebAuthnClientType } from './webAuthn'
 
 export interface LoginAttributes {
   username: string

diff --git a/packages/auth-providers/firebase/api/src/decoder.ts b/packages/auth-providers/firebase/api/src/decoder.ts
@@ -1,7 +1,7 @@
 import admin from 'firebase-admin'
 import type { FirebaseError } from 'firebase-admin'
 
-import { Decoder } from '@redwoodjs/api'
+import type { Decoder } from '@redwoodjs/api'
 
 // Alternative third-party JWT verification process described here:
 // https://firebase.google.com/docs/auth/admin/verify-id-tokens#verify_id_tokens_using_a_third-party_jwt_library

diff --git a/packages/auth-providers/firebase/setup/src/setup.ts b/packages/auth-providers/firebase/setup/src/setup.ts
@@ -1,4 +1,4 @@
-import yargs from 'yargs'
+import type yargs from 'yargs'
 
 import { standardAuthBuilder } from '@redwoodjs/cli-helpers'
 

diff --git a/packages/auth-providers/firebase/setup/src/setupHandler.ts b/packages/auth-providers/firebase/setup/src/setupHandler.ts
@@ -3,7 +3,7 @@ import path from 'path'
 
 import { standardAuthHandler } from '@redwoodjs/cli-helpers'
 
-import { Args } from './setup'
+import type { Args } from './setup'
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf-8')

diff --git a/packages/auth-providers/firebase/web/src/__tests__/firebase.test.tsx b/packages/auth-providers/firebase/web/src/__tests__/firebase.test.tsx
@@ -1,10 +1,12 @@
 import { renderHook, act } from '@testing-library/react'
 import type FirebaseAuthNamespace from 'firebase/auth'
-import { User, OperationType, OAuthProvider, Auth } from 'firebase/auth'
+import type { User, OAuthProvider, Auth } from 'firebase/auth'
+import { OperationType } from 'firebase/auth'
 
-import { CurrentUser } from '@redwoodjs/auth'
+import type { CurrentUser } from '@redwoodjs/auth'
 
-import { createAuth, FirebaseClient } from '../firebase'
+import type { FirebaseClient } from '../firebase'
+import { createAuth } from '../firebase'
 
 const user: User = {
   uid: 'unique_user_id',