diff --git a/package-lock.json b/package-lock.json index 3d6cfcd327..6f04cc3a60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-promise": "^6.0.0", - "prettier": "3.2.5", + "prettier": "3.3.3", "typescript": "^5.0.4" } }, @@ -33558,9 +33558,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true, "bin": { "prettier": "bin/prettier.cjs" @@ -74495,9 +74495,9 @@ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" }, "prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", "dev": true }, "prettier-linter-helpers": { diff --git a/package.json b/package.json index 81af828c60..df63eb0d02 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-promise": "^6.0.0", - "prettier": "3.2.5", + "prettier": "3.3.3", "typescript": "^5.0.4" }, "scripts": { diff --git a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx index f96eba9aa3..a06746c66a 100644 --- a/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx +++ b/services/web/frontend/js/features/ide-react/context/editor-manager-context.tsx @@ -538,7 +538,7 @@ export const EditorManagerProvider: FC = ({ children }) => { if (docError) { const { doc, document, error, meta } = docError let { editorContent } = docError - const message = typeof error === 'string' ? error : error?.message ?? '' + const message = typeof error === 'string' ? error : (error?.message ?? '') // Clear document error so that it's only handled once setDocError(null) diff --git a/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx b/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx index 621f3ed8d8..5d878a7b3a 100644 --- a/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx +++ b/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx @@ -100,7 +100,7 @@ export function EditTagModal({ id, tag, onEdit, onClose }: EditTagModalProps) { type="text" placeholder="Tag Name" name="new-tag-name" - value={newTagName === undefined ? tag.name ?? '' : newTagName} + value={newTagName === undefined ? (tag.name ?? '') : newTagName} required onChange={e => setNewTagName(e.target.value)} /> diff --git a/services/web/frontend/js/features/project-list/components/modals/manage-tag-modal.tsx b/services/web/frontend/js/features/project-list/components/modals/manage-tag-modal.tsx index f8b0597226..26a2fe683a 100644 --- a/services/web/frontend/js/features/project-list/components/modals/manage-tag-modal.tsx +++ b/services/web/frontend/js/features/project-list/components/modals/manage-tag-modal.tsx @@ -92,7 +92,7 @@ export function ManageTagModal({ type="text" placeholder="Tag Name" name="new-tag-name" - value={newTagName === undefined ? tag.name ?? '' : newTagName} + value={newTagName === undefined ? (tag.name ?? '') : newTagName} required onChange={e => setNewTagName(e.target.value)} /> diff --git a/services/web/frontend/js/features/settings/components/password-section.tsx b/services/web/frontend/js/features/settings/components/password-section.tsx index acd2e16450..33480e1357 100644 --- a/services/web/frontend/js/features/settings/components/password-section.tsx +++ b/services/web/frontend/js/features/settings/components/password-section.tsx @@ -190,7 +190,7 @@ function PasswordForm() { {t('use_a_different_password')}. ) : ( - getUserFacingMessage(error) ?? '' + (getUserFacingMessage(error) ?? '') ) } /> diff --git a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx index 53fac5e49e..341885ed7b 100644 --- a/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx +++ b/services/web/frontend/js/features/source-editor/components/table-generator/toolbar/column-width-modal/modal.tsx @@ -158,7 +158,7 @@ const ColumnWidthModalBody = () => { } items={UNITS} itemToKey={x => x ?? ''} - itemToString={x => (x === 'custom' ? t('custom') : x ?? '')} + itemToString={x => (x === 'custom' ? t('custom') : (x ?? ''))} onSelectedItemChanged={item => setCurrentUnit(item)} defaultItem={currentUnit} /> diff --git a/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx b/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx index 0f5cfd396c..71476de599 100644 --- a/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx +++ b/services/web/frontend/js/features/source-editor/components/toolbar/section-heading-dropdown.tsx @@ -48,7 +48,7 @@ export const SectionHeadingDropdown = () => { ) const currentLabel = currentLevel - ? levels.get(currentLevel.level) ?? currentLevel.level + ? (levels.get(currentLevel.level) ?? currentLevel.level) : '---' return (