Skip to content

Commit

Permalink
chore: refresh lockfile (#10459)
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Krick <[email protected]>
  • Loading branch information
mattkrick authored Nov 8, 2024
1 parent 12f3347 commit cc2ab79
Show file tree
Hide file tree
Showing 64 changed files with 8,294 additions and 8,735 deletions.
3 changes: 2 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ export default tseslint.config(
'@typescript-eslint/no-require-imports': 'off',
'@typescript-eslint/restrict-template-expressions': 'off',
'@typescript-eslint/restrict-plus-operands': 'off',
'@typescript-eslint/unbound-method': 'off'
'@typescript-eslint/unbound-method': 'off',
'@typescript-eslint/no-duplicate-type-constituents': 'off'
}
}
)
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"test:server": "yarn workspace parabol-server test"
},
"resolutions": {
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"hoist-non-react-statics": "^3.3.0",
"@types/react": "16.9.11",
"@types/react-dom": "16.9.4",
Expand All @@ -77,11 +77,11 @@
"@babel/preset-env": "^7.25.0",
"@datadog/datadog-ci": "^2.33.0",
"@eslint/compat": "^1.1.1",
"@graphql-codegen/add": "^5.0.0",
"@graphql-codegen/cli": "^5.0.0",
"@graphql-codegen/typescript": "^4.0.1",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@graphql-codegen/typescript-resolvers": "^4.0.1",
"@graphql-codegen/add": "5.0.0",
"@graphql-codegen/cli": "5.0.0",
"@graphql-codegen/typescript": "4.0.1",
"@graphql-codegen/typescript-operations": "4.0.1",
"@graphql-codegen/typescript-resolvers": "4.0.1",
"@graphql-tools/merge": "^9.0.0",
"@sucrase/webpack-loader": "^2.0.0",
"@swc/core": "^1.7.22",
Expand Down Expand Up @@ -124,7 +124,7 @@
"tailwindcss": "^3.2.7",
"terser-webpack-plugin": "^5.3.9",
"ts-loader": "9.2.6",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"typescript-eslint": "^8.3.0",
"vscode-apollo-relay": "^1.5.0",
"webpack": "^5.89.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const ActivityCardImage = (props: PropsWithChildren<ActivityCardImageProp
>
<img className='object-contain' src={backgroundSrc} alt='' />
<img
className='absolute top-0 left-0 h-full w-full object-contain p-10'
className='absolute left-0 top-0 h-full w-full object-contain p-10'
src={src}
alt='Card Illustration'
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const ActivityDetails = (props: Props) => {
<div className='flex flex-col justify-start pl-4 pr-4 md:pr-14 xl:flex-row xl:justify-center xl:pl-14'>
<div>
<ActivityCard
className='mb-8 w-80 max-md:hidden sm:ml-14 xl:ml-0 xl:mb-0'
className='mb-8 w-80 max-md:hidden sm:ml-14 xl:mb-0 xl:ml-0'
theme={CATEGORY_THEMES[category as CategoryID]}
type={type}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const ActivityDetailsCategoryBadge = (props: Props) => {
return (
<DropdownMenu.RadioItem
key={categoryId}
className='flex cursor-pointer select-none py-3 px-4 outline-none data-[state=checked]:bg-slate-200
data-[highlighted]:bg-slate-100'
className='flex cursor-pointer select-none px-4 py-3 outline-none data-[highlighted]:bg-slate-100
data-[state=checked]:bg-slate-200'
value={categoryId}
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const RetroDescription = (props: RetroDescriptionProps) => {
{prompts!.map((prompt) => (
<div key={prompt.id} className='mb-1 flex flex-col items-start py-1 sm:flex-row'>
<div
className='mt-1 mr-4 h-3 w-3 shrink-0 self-start rounded-full'
className='mr-4 mt-1 h-3 w-3 shrink-0 self-start rounded-full'
style={{backgroundColor: prompt.groupColor}}
/>
<div className='flex min-w-0 flex-grow flex-col'>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const ActivityLibraryEmptyState = (props: Props) => {
src={favoriteImg}
alt='Favorite placeholder'
/>
<div className='absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 transform'>
<div className='absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 transform'>
<div className='flex flex-col items-center'>
<FavoriteIcon
className='icon-color-red icon-border-gold rounded-full p-3 text-5xl md:text-6xl lg:p-5 lg:text-8xl'
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/DashNavList/DashNavList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const DashNavList = (props: Props) => {
const teams = organizations.flatMap((org) => org.viewerTeams)

return (
<div className='w-full p-3 pt-4 pb-0'>
<div className='w-full p-3 pb-0 pt-4'>
{sortedOrgs.map((org) => (
<div key={org.id} className='w-full pb-4'>
<div className='mb-1 flex min-w-0 flex-1 flex-wrap items-center justify-between'>
Expand Down
4 changes: 2 additions & 2 deletions packages/client/components/EditableAvatar/EditableAvatar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ const EditableAvatar = (props: Props) => {
picture={picture}
className={clsx(`h-16 w-16 border-4 border-solid border-slate-200`, className)}
/>
<div className='absolute top-0 left-0 flex h-full w-full items-center justify-center rounded-full bg-slate-400 text-sm font-semibold text-slate-800 opacity-0 transition-opacity duration-300 hover:opacity-75'>
<div className='absolute left-0 top-0 flex h-full w-full items-center justify-center rounded-full bg-slate-400 text-sm font-semibold text-slate-800 opacity-0 transition-opacity duration-300 hover:opacity-75'>
EDIT
</div>
<div
aria-hidden
className='icon-wrapper absolute top-0 right-0 z-10 rounded-full bg-slate-200 px-1.5 hover:bg-slate-200'
className='icon-wrapper absolute right-0 top-0 z-10 rounded-full bg-slate-200 px-1.5 hover:bg-slate-200'
>
<EditIcon className='mb-[-2px] w-3.5 pt-0.5' />
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/EmailPasswordAuthForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ const EmailPasswordAuthForm = forwardRef((props: Props, ref: any) => {
<Form onSubmit={onSubmit}>
{error && <ErrorAlert message={error.message} />}
{isSSO && submitting && <HelpMessage>Continue through the login popup</HelpMessage>}
<div className={signInWithSSOOnly ? 'hidden' : 'mt-4 mb-4'}>
<div className={signInWithSSOOnly ? 'hidden' : 'mb-4 mt-4'}>
<FieldBlock isSSO={signInWithSSOOnly}>
<EmailInputField
autoFocus={!hasEmail}
Expand Down
4 changes: 2 additions & 2 deletions packages/client/components/MeetingsDashHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const TeamFilterMenu = lazyPreload(
)

interface Props {
viewerRef: MeetingsDashHeader_viewer$key | null
viewerRef: MeetingsDashHeader_viewer$key | null | undefined
}

const MeetingsDashHeader = (props: Props) => {
Expand Down Expand Up @@ -63,7 +63,7 @@ const MeetingsDashHeader = (props: Props) => {
<DashSectionHeader>
<DashSectionControls className='w-full flex-wrap justify-start overflow-visible'>
<DashFilterToggle
className='mt-4 mr-16 mb-4 ml-0 sidebar-left:mt-0 sidebar-left:mr-24 sidebar-left:mb-0 sidebar-left:ml-0'
className='mb-4 ml-0 mr-16 mt-4 sidebar-left:mb-0 sidebar-left:ml-0 sidebar-left:mr-24 sidebar-left:mt-0'
label='Team'
onClick={teamFilterTogglePortal}
onMouseEnter={TeamFilterMenu.preload}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/Mentioned.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const Mentioned = (props: Props) => {
action={<NotificationAction label={actionLabel} onClick={goThere} />}
>
{previewContent && (
<div className='my-1 mx-0 mt-4 rounded bg-white p-2 text-sm leading-5 shadow-card'>
<div className='mx-0 my-1 mt-4 rounded bg-white p-2 text-sm leading-5 shadow-card'>
<Editor
readOnly
editorState={editorState}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/NewMeetingTeamPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const NewMeetingTeamPicker = (props: Props) => {

return (
<Menu
className='data-[side=top]:animate-slideUp data-[side=bottom]:animate-slideDown'
className='data-[side=bottom]:animate-slideDown data-[side=top]:animate-slideUp'
trigger={
<div className='group flex cursor-pointer items-center rounded-md bg-slate-200 p-2 hover:bg-slate-300'>
<div className='p-2'>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/OrgAdminActionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const OrgAdminActionMenu = (props: Props) => {
}
>
<MenuContent
className='data-[side=top]:animate-slideUp data-[side=bottom]:animate-slideDown'
className='data-[side=bottom]:animate-slideDown data-[side=top]:animate-slideUp'
align='end'
sideOffset={4}
>
Expand Down
4 changes: 2 additions & 2 deletions packages/client/components/SelectMeetingDropdownItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const SelectMeetingDropdownItem = (props: Props) => {
return (
<MenuItem onClick={gotoMeeting}>
{typeof IconOrSVG === 'string' ? (
<div className='size-6 m-2 text-slate-600'>
<div className='m-2 size-6 text-slate-600'>
{
{
group_work: <GroupWork />,
Expand All @@ -79,7 +79,7 @@ const SelectMeetingDropdownItem = (props: Props) => {
{meetingPhaseLabel}{teamName}
</div>
</div>
<div className='size-6 flex flex-grow items-center justify-end'>
<div className='flex size-6 flex-grow items-center justify-end'>
<ArrowForwardIcon />
</div>
</MenuItem>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/TeamFilterMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {SearchMenuItem} from './SearchMenuItem'

interface Props {
menuProps: MenuProps
viewer: TeamFilterMenu_viewer$key | null
viewer: TeamFilterMenu_viewer$key | null | undefined
}

const TeamFilterMenu = (props: Props) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/TeamInvitationWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function TeamInvitationWrapper(props: Props) {
return (
<div className='min-h-100 flex max-w-full flex-1 flex-col items-center overflow-auto bg-slate-200 text-slate-700'>
<Header />
<div className='maxw-full flex w-full flex-1 flex-col items-center py-8 px-4'>{children}</div>
<div className='maxw-full flex w-full flex-1 flex-col items-center px-4 py-8'>{children}</div>
</div>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ export const TeamPromptResponseEmojis = (props: Props) => {
)
}

return <ReactjiSection className='pt-2 pr-2' reactjis={reactjis} onToggle={onToggleReactji} />
return <ReactjiSection className='pr-2 pt-2' reactjis={reactjis} onToggle={onToggleReactji} />
}
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ const GCalPanel = (props: Props) => {
<div
key={tab.key}
className={clsx(
'w-1/2 cursor-pointer rounded-full py-3 px-3 text-center text-sm leading-3 text-slate-800',
'w-1/2 cursor-pointer rounded-full px-3 py-3 text-center text-sm leading-3 text-slate-800',
tab.key === eventRangeKey
? 'bg-grape-700 font-semibold text-white focus:text-white'
: 'border border-slate-300 bg-white'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const GitHubIntegrationPanel = (props: Props) => {
<div
key={tab.key}
className={clsx(
'w-1/2 cursor-pointer rounded-full py-2 px-4 text-center text-sm leading-3 text-slate-800',
'w-1/2 cursor-pointer rounded-full px-4 py-2 text-center text-sm leading-3 text-slate-800',
tab.key === githubType
? 'bg-grape-700 font-semibold text-white focus:text-white'
: 'border border-slate-300 bg-white'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const GitHubIntegrationResults = (props: Props) => {
)}
{lastItem}
{hasNext && (
<div className='mx-auto mb-4 -mt-4 h-8 text-2xl' key={'loadingNext'}>
<div className='mx-auto -mt-4 mb-4 h-8 text-2xl' key={'loadingNext'}>
<Ellipsis />
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const GitHubRepoFilterBar = (props: Props) => {
<>
<button
className={clsx(
'mx-4 mt-4 mb-2 flex cursor-pointer items-center gap-2 rounded border border-solid bg-white py-0.5 px-3 text-left transition',
'mx-4 mb-2 mt-4 flex cursor-pointer items-center gap-2 rounded border border-solid bg-white px-3 py-0.5 text-left transition',
isMenuOpen
? 'border-sky-400 hover:border-sky-500'
: 'border-slate-300 hover:border-slate-500'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const JiraIntegrationResults = (props: Props) => {
)}
{lastItem}
{hasNext && (
<div className='mx-auto mb-4 -mt-4 h-8 text-2xl' key={'loadingNext'}>
<div className='mx-auto -mt-4 mb-4 h-8 text-2xl' key={'loadingNext'}>
<Ellipsis />
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const JiraServerIntegrationResults = (props: Props) => {
)}
{lastItem}
{hasNext && (
<div className='mx-auto mb-4 -mt-4 h-8 text-2xl' key={'loadingNext'}>
<div className='mx-auto -mt-4 mb-4 h-8 text-2xl' key={'loadingNext'}>
<Ellipsis />
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ParabolTasksPanel = (props: Props) => {
<div
key={status}
className={clsx(
'flex-shrink-0 cursor-pointer rounded-full py-2 px-4 text-sm leading-3 text-slate-800',
'flex-shrink-0 cursor-pointer rounded-full px-4 py-2 text-sm leading-3 text-slate-800',
status === selectedStatus
? 'bg-grape-700 font-semibold text-white focus:text-white'
: 'border border-slate-300 bg-white'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const ParabolTasksResults = (props: Props) => {
.filter((task) => task.status === selectedStatus)

return (
<div className='flex h-full flex-col items-center gap-y-2 overflow-auto px-4 pt-1 pb-4'>
<div className='flex h-full flex-col items-center gap-y-2 overflow-auto px-4 pb-4 pt-1'>
{selectedTasks.length > 0 ? (
selectedTasks.map((task) => (
<NullableTask
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/ThreadedCommentBase.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ const ThreadedCommentBase = (props: Props) => {
threadParentId
} = comment
const ownerId = threadParentId || commentId
const picture = isActive ? createdByUserNullable?.picture ?? anonymousAvatar : deletedAvatar
const picture = isActive ? (createdByUserNullable?.picture ?? anonymousAvatar) : deletedAvatar
const {submitMutation, submitting, onError, onCompleted} = useMutationProps()
const [editorState, setEditorState] = useEditorState(content)
const editorRef = useRef<HTMLTextAreaElement>(null)
Expand Down
4 changes: 2 additions & 2 deletions packages/client/components/TimelineHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const TimelineHeader = (props: Props) => {
<DashSectionHeader>
<DashSectionControls className='w-full flex-wrap justify-start overflow-visible'>
<DashFilterToggle
className='mt-4 mr-16 mb-4 ml-0 sidebar-left:mt-0 sidebar-left:mr-6 sidebar-left:mb-0 sidebar-left:ml-0'
className='mb-4 ml-0 mr-16 mt-4 sidebar-left:mb-0 sidebar-left:ml-0 sidebar-left:mr-6 sidebar-left:mt-0'
label='Team'
onClick={teamFilterTogglePortal}
onMouseEnter={TeamFilterMenu.preload}
Expand All @@ -98,7 +98,7 @@ const TimelineHeader = (props: Props) => {
/>
{teamFilterMenuPortal(<TeamFilterMenu menuProps={teamFilterMenuProps} viewer={viewer} />)}
<DashFilterToggle
className='mt-4 mr-16 mb-4 ml-0 sidebar-left:mt-0 sidebar-left:mr-6 sidebar-left:mb-0 sidebar-left:ml-0'
className='mb-4 ml-0 mr-16 mt-4 sidebar-left:mb-0 sidebar-left:ml-0 sidebar-left:mr-6 sidebar-left:mt-0'
label='Event Type'
onClick={timelineEventTypeFilterTogglePortal}
onMouseEnter={TimelineEventTypeMenu.preload}
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/UserAvatarInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const UserAvatarInput = (props: Props) => {
<div className='flex w-full justify-end'>
<FlatButton
onClick={handleClose}
className='mr-6 mb-6 bg-sky-500 font-semibold text-white duration-300 ease-in-out hover:bg-sky-700 focus:bg-sky-700'
className='mb-6 mr-6 bg-sky-500 font-semibold text-white duration-300 ease-in-out hover:bg-sky-700 focus:bg-sky-700'
>
{'Save'}
</FlatButton>
Expand Down
2 changes: 1 addition & 1 deletion packages/client/components/UserDashTeamMemberMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {SearchMenuItem} from './SearchMenuItem'

interface Props {
menuProps: MenuProps
viewer: UserDashTeamMemberMenu_viewer$key | null
viewer: UserDashTeamMemberMenu_viewer$key | null | undefined
}

const UserDashTeamMemberMenu = (props: Props) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ const EmojiMenuTipTap = (props: Props) => {
}) as any

tiptapEditor.registerPlugin(plugin)
return () => tiptapEditor.unregisterPlugin(pluginKey)
return () => {
tiptapEditor.unregisterPlugin(pluginKey)
}
}, [tiptapEditor, setOpenEmojiMenu, setEmojiQuery])

const onSelectEmoji = (emoji: string) => {
Expand Down
4 changes: 3 additions & 1 deletion packages/client/components/promptResponse/MentionsTipTap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ const MentionsTipTap = (props: Props) => {
// Other plugins that tiptap adds will try to handle the certain keydown events without giving
// us a chance to handle them here, so bump up the priority for us.
tiptapEditor.registerPlugin(plugin, (newPlugin, plugins) => [newPlugin, ...plugins])
return () => tiptapEditor.unregisterPlugin(pluginKey)
return () => {
tiptapEditor.unregisterPlugin(pluginKey)
}
}, [tiptapEditor, setOpenMentions, setMentionQuery])

return openMentions && tiptapEditor.isFocused ? (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from '@emotion/styled'
import {Link} from '@mui/icons-material'
import {Editor as EditorState} from '@tiptap/core'
import {BubbleMenu, EditorContent, JSONContent, PureEditorContent, useEditor} from '@tiptap/react'
import {BubbleMenu, EditorContent, JSONContent, useEditor} from '@tiptap/react'
import areEqual from 'fbjs/lib/areEqual'
import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'
import {PALETTE} from '~/styles/paletteV3'
Expand Down Expand Up @@ -175,7 +175,7 @@ const PromptResponseEditor = (props: Props) => {
[setLinkOverlayProps]
)

const editorRef = useRef<PureEditorContent>(null)
const editorRef = useRef<HTMLDivElement>(null)

const setEditing = useCallback(
(newIsEditing: boolean) => {
Expand Down
Loading

0 comments on commit cc2ab79

Please sign in to comment.