From 73b64b89170cb72854a1709186c62ce31f476889 Mon Sep 17 00:00:00 2001 From: Renaud Chaput Date: Thu, 13 Jul 2023 11:26:45 +0200 Subject: [PATCH] Upgrade to Prettier 3 (#25902) --- .../mastodon/components/animated_number.tsx | 2 +- .../mastodon/components/counters.tsx | 6 +++--- app/javascript/mastodon/components/gifv.tsx | 2 +- .../components/relative_timestamp.tsx | 14 ++++++------- .../mastodon/components/short_number.tsx | 4 ++-- .../features/emoji/emoji_compressed.d.ts | 4 ++-- .../mastodon/polyfills/base_polyfills.ts | 2 +- app/javascript/mastodon/reducers/index.ts | 2 +- app/javascript/mastodon/reducers/modal.ts | 14 ++++++------- app/javascript/mastodon/scroll.ts | 4 ++-- app/javascript/mastodon/store/index.ts | 2 +- .../mastodon/store/middlewares/loading_bar.ts | 2 +- app/javascript/mastodon/utils/hashtags.ts | 4 ++-- app/javascript/mastodon/utils/numbers.ts | 2 +- app/javascript/styles/fonts/roboto-mono.scss | 3 ++- app/javascript/styles/fonts/roboto.scss | 12 +++++++---- app/javascript/styles/mastodon/basics.scss | 16 +++++++++++--- .../styles/mastodon/components.scss | 21 +++++++++++++------ package.json | 4 ++-- yarn.lock | 18 +++++++++------- 20 files changed, 82 insertions(+), 56 deletions(-) diff --git a/app/javascript/mastodon/components/animated_number.tsx b/app/javascript/mastodon/components/animated_number.tsx index 3122d6421e..05a7e01898 100644 --- a/app/javascript/mastodon/components/animated_number.tsx +++ b/app/javascript/mastodon/components/animated_number.tsx @@ -32,7 +32,7 @@ export const AnimatedNumber: React.FC = ({ value, obfuscate }) => { const willEnter = useCallback(() => ({ y: -1 * direction }), [direction]); const willLeave = useCallback( () => ({ y: spring(1 * direction, { damping: 35, stiffness: 400 }) }), - [direction] + [direction], ); if (reduceMotion) { diff --git a/app/javascript/mastodon/components/counters.tsx b/app/javascript/mastodon/components/counters.tsx index e0c818f247..35b0ad8d60 100644 --- a/app/javascript/mastodon/components/counters.tsx +++ b/app/javascript/mastodon/components/counters.tsx @@ -4,7 +4,7 @@ import { FormattedMessage } from 'react-intl'; export const StatusesCounter = ( displayNumber: React.ReactNode, - pluralReady: number + pluralReady: number, ) => ( ( ( = ({ onClick(); } }, - [onClick] + [onClick], ); return ( diff --git a/app/javascript/mastodon/components/relative_timestamp.tsx b/app/javascript/mastodon/components/relative_timestamp.tsx index e4a8437d0e..ac3ab0fb4d 100644 --- a/app/javascript/mastodon/components/relative_timestamp.tsx +++ b/app/javascript/mastodon/components/relative_timestamp.tsx @@ -108,7 +108,7 @@ export const timeAgoString = ( now: number, year: number, timeGiven: boolean, - short?: boolean + short?: boolean, ) => { const delta = now - date.getTime(); @@ -118,28 +118,28 @@ export const timeAgoString = ( relativeTime = intl.formatMessage(messages.today); } else if (delta < 10 * SECOND) { relativeTime = intl.formatMessage( - short ? messages.just_now : messages.just_now_full + short ? messages.just_now : messages.just_now_full, ); } else if (delta < 7 * DAY) { if (delta < MINUTE) { relativeTime = intl.formatMessage( short ? messages.seconds : messages.seconds_full, - { number: Math.floor(delta / SECOND) } + { number: Math.floor(delta / SECOND) }, ); } else if (delta < HOUR) { relativeTime = intl.formatMessage( short ? messages.minutes : messages.minutes_full, - { number: Math.floor(delta / MINUTE) } + { number: Math.floor(delta / MINUTE) }, ); } else if (delta < DAY) { relativeTime = intl.formatMessage( short ? messages.hours : messages.hours_full, - { number: Math.floor(delta / HOUR) } + { number: Math.floor(delta / HOUR) }, ); } else { relativeTime = intl.formatMessage( short ? messages.days : messages.days_full, - { number: Math.floor(delta / DAY) } + { number: Math.floor(delta / DAY) }, ); } } else if (date.getFullYear() === year) { @@ -158,7 +158,7 @@ const timeRemainingString = ( intl: IntlShape, date: Date, now: number, - timeGiven = true + timeGiven = true, ) => { const delta = date.getTime() - now; diff --git a/app/javascript/mastodon/components/short_number.tsx b/app/javascript/mastodon/components/short_number.tsx index 010586c04f..928e371bd8 100644 --- a/app/javascript/mastodon/components/short_number.tsx +++ b/app/javascript/mastodon/components/short_number.tsx @@ -6,7 +6,7 @@ import { toShortNumber, pluralReady, DECIMAL_UNITS } from '../utils/numbers'; type ShortNumberRenderer = ( displayNumber: JSX.Element, - pluralReady: number + pluralReady: number, ) => JSX.Element; interface ShortNumberProps { @@ -25,7 +25,7 @@ export const ShortNumberRenderer: React.FC = ({ if (children && renderer) { console.warn( - 'Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.' + 'Both renderer prop and renderer as a child provided. This is a mistake and you really should fix that. Only renderer passed as a child will be used.', ); } diff --git a/app/javascript/mastodon/features/emoji/emoji_compressed.d.ts b/app/javascript/mastodon/features/emoji/emoji_compressed.d.ts index 2408942ed6..333de7c82b 100644 --- a/app/javascript/mastodon/features/emoji/emoji_compressed.d.ts +++ b/app/javascript/mastodon/features/emoji/emoji_compressed.d.ts @@ -25,7 +25,7 @@ export type SearchData = [ BaseEmoji['native'], Emoji['short_names'], Search, - Emoji['unified'] + Emoji['unified'], ]; export interface ShortCodesToEmojiData { @@ -38,7 +38,7 @@ export type EmojiCompressed = [ Skins, Category[], Data['aliases'], - EmojisWithoutShortCodes + EmojisWithoutShortCodes, ]; /* diff --git a/app/javascript/mastodon/polyfills/base_polyfills.ts b/app/javascript/mastodon/polyfills/base_polyfills.ts index 3cde1b1ede..c35ba0d382 100644 --- a/app/javascript/mastodon/polyfills/base_polyfills.ts +++ b/app/javascript/mastodon/polyfills/base_polyfills.ts @@ -12,7 +12,7 @@ if (!HTMLCanvasElement.prototype.toBlob) { this: HTMLCanvasElement, callback: BlobCallback, type = 'image/png', - quality: unknown + quality: unknown, ) { const dataURL: string = this.toDataURL(type, quality); let data; diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts index ad3077e37d..c61c862cfe 100644 --- a/app/javascript/mastodon/reducers/index.ts +++ b/app/javascript/mastodon/reducers/index.ts @@ -99,7 +99,7 @@ const initialRootState = Object.fromEntries( reducer(undefined, { // empty action }), - ]) + ]), ); const RootStateRecord = ImmutableRecord(initialRootState, 'RootState'); diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts index 6afbcc367c..dab1e8301c 100644 --- a/app/javascript/mastodon/reducers/modal.ts +++ b/app/javascript/mastodon/reducers/modal.ts @@ -35,7 +35,7 @@ interface PopModalOption { } const popModal = ( state: State, - { modalType, ignoreFocus }: PopModalOption + { modalType, ignoreFocus }: PopModalOption, ): State => { if ( modalType === undefined || @@ -52,12 +52,12 @@ const popModal = ( const pushModal = ( state: State, modalType: ModalType, - modalProps: ModalProps + modalProps: ModalProps, ): State => { return state.withMutations((record) => { record.set('ignoreFocus', false); record.update('stack', (stack) => - stack.unshift(Modal({ modalType, modalProps })) + stack.unshift(Modal({ modalType, modalProps })), ); }); }; @@ -68,14 +68,14 @@ export function modalReducer( modalType: ModalType; ignoreFocus: boolean; modalProps: Record; - }> + }>, ) { switch (action.type) { case openModal.type: return pushModal( state, action.payload.modalType, - action.payload.modalProps + action.payload.modalProps, ); case closeModal.type: return popModal(state, action.payload); @@ -85,8 +85,8 @@ export function modalReducer( return state.update('stack', (stack) => stack.filterNot( // @ts-expect-error TIMELINE_DELETE action is not typed yet. - (modal) => modal.get('modalProps').statusId === action.id - ) + (modal) => modal.get('modalProps').statusId === action.id, + ), ); default: return state; diff --git a/app/javascript/mastodon/scroll.ts b/app/javascript/mastodon/scroll.ts index 625aab0c04..4188f64753 100644 --- a/app/javascript/mastodon/scroll.ts +++ b/app/javascript/mastodon/scroll.ts @@ -3,12 +3,12 @@ const easingOutQuint = ( t: number, b: number, c: number, - d: number + d: number, ) => c * ((t = t / d - 1) * t * t * t * t + 1) + b; const scroll = ( node: Element, key: 'scrollTop' | 'scrollLeft', - target: number + target: number, ) => { const startTime = Date.now(); const offset = node[key]; diff --git a/app/javascript/mastodon/store/index.ts b/app/javascript/mastodon/store/index.ts index 1ef9cb8184..f748662794 100644 --- a/app/javascript/mastodon/store/index.ts +++ b/app/javascript/mastodon/store/index.ts @@ -30,7 +30,7 @@ export const store = configureStore({ .concat( loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'], - }) + }), ) .concat(errorsMiddleware) .concat(soundsMiddleware()), diff --git a/app/javascript/mastodon/store/middlewares/loading_bar.ts b/app/javascript/mastodon/store/middlewares/loading_bar.ts index 0f997fd349..03217b3824 100644 --- a/app/javascript/mastodon/store/middlewares/loading_bar.ts +++ b/app/javascript/mastodon/store/middlewares/loading_bar.ts @@ -14,7 +14,7 @@ const defaultTypeSuffixes: Config['promiseTypeSuffixes'] = [ ]; export const loadingBarMiddleware = ( - config: Config = {} + config: Config = {}, ): Middleware, RootState> => { const promiseTypeSuffixes = config.promiseTypeSuffixes || defaultTypeSuffixes; diff --git a/app/javascript/mastodon/utils/hashtags.ts b/app/javascript/mastodon/utils/hashtags.ts index 4c76cd7ded..0c5505c6c9 100644 --- a/app/javascript/mastodon/utils/hashtags.ts +++ b/app/javascript/mastodon/utils/hashtags.ts @@ -6,7 +6,7 @@ const buildHashtagPatternRegex = () => { try { return new RegExp( `(?:^|[^\\/\\)\\w])#(([${WORD}_][${WORD}${HASHTAG_SEPARATORS}]*[${ALPHA}${HASHTAG_SEPARATORS}][${WORD}${HASHTAG_SEPARATORS}]*[${WORD}_])|([${WORD}_]*[${ALPHA}][${WORD}_]*))`, - 'iu' + 'iu', ); } catch { return /(?:^|[^/)\w])#(\w*[a-zA-Z·]\w*)/i; @@ -17,7 +17,7 @@ const buildHashtagRegex = () => { try { return new RegExp( `^(([${WORD}_][${WORD}${HASHTAG_SEPARATORS}]*[${ALPHA}${HASHTAG_SEPARATORS}][${WORD}${HASHTAG_SEPARATORS}]*[${WORD}_])|([${WORD}_]*[${ALPHA}][${WORD}_]*))$`, - 'iu' + 'iu', ); } catch { return /^(\w*[a-zA-Z·]\w*)$/i; diff --git a/app/javascript/mastodon/utils/numbers.ts b/app/javascript/mastodon/utils/numbers.ts index 4c8465f577..4b98dfe604 100644 --- a/app/javascript/mastodon/utils/numbers.ts +++ b/app/javascript/mastodon/utils/numbers.ts @@ -55,7 +55,7 @@ export function toShortNumber(sourceNumber: number): ShortNumber { */ export function pluralReady( sourceNumber: number, - division: DecimalUnits + division: DecimalUnits, ): number { if (division == null || division < DECIMAL_UNITS.HUNDRED) { return sourceNumber; diff --git a/app/javascript/styles/fonts/roboto-mono.scss b/app/javascript/styles/fonts/roboto-mono.scss index 10dd630099..d07aae07ab 100644 --- a/app/javascript/styles/fonts/roboto-mono.scss +++ b/app/javascript/styles/fonts/roboto-mono.scss @@ -1,6 +1,7 @@ @font-face { font-family: mastodon-font-monospace; - src: local('Roboto Mono'), + src: + local('Roboto Mono'), url('../fonts/roboto-mono/robotomono-regular-webfont.woff2') format('woff2'), url('../fonts/roboto-mono/robotomono-regular-webfont.woff') format('woff'), url('../fonts/roboto-mono/robotomono-regular-webfont.ttf') diff --git a/app/javascript/styles/fonts/roboto.scss b/app/javascript/styles/fonts/roboto.scss index 672eab086c..2a7b8fb90c 100644 --- a/app/javascript/styles/fonts/roboto.scss +++ b/app/javascript/styles/fonts/roboto.scss @@ -1,6 +1,7 @@ @font-face { font-family: mastodon-font-sans-serif; - src: local('Roboto Italic'), + src: + local('Roboto Italic'), url('../fonts/roboto/roboto-italic-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-italic-webfont.woff') format('woff'), url('../fonts/roboto/roboto-italic-webfont.ttf') format('truetype'), @@ -13,7 +14,8 @@ @font-face { font-family: mastodon-font-sans-serif; - src: local('Roboto Bold'), + src: + local('Roboto Bold'), url('../fonts/roboto/roboto-bold-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-bold-webfont.woff') format('woff'), url('../fonts/roboto/roboto-bold-webfont.ttf') format('truetype'), @@ -26,7 +28,8 @@ @font-face { font-family: mastodon-font-sans-serif; - src: local('Roboto Medium'), + src: + local('Roboto Medium'), url('../fonts/roboto/roboto-medium-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-medium-webfont.woff') format('woff'), url('../fonts/roboto/roboto-medium-webfont.ttf') format('truetype'), @@ -39,7 +42,8 @@ @font-face { font-family: mastodon-font-sans-serif; - src: local('Roboto'), + src: + local('Roboto'), url('../fonts/roboto/roboto-regular-webfont.woff2') format('woff2'), url('../fonts/roboto/roboto-regular-webfont.woff') format('woff'), url('../fonts/roboto/roboto-regular-webfont.ttf') format('truetype'), diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss index a344c7fa4f..ff00c797c8 100644 --- a/app/javascript/styles/mastodon/basics.scss +++ b/app/javascript/styles/mastodon/basics.scss @@ -31,9 +31,19 @@ body { // Droid Sans => Older Androids (<4.0) // Helvetica Neue => Older macOS <10.11 // $font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0) - font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - $font-sans-serif, sans-serif; + font-family: + system-ui, + -apple-system, + BlinkMacSystemFont, + 'Segoe UI', + Oxygen, + Ubuntu, + Cantarell, + 'Fira Sans', + 'Droid Sans', + 'Helvetica Neue', + $font-sans-serif, + sans-serif; } &.app-body { diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index f97c581f3a..2ac04beb2f 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -747,7 +747,9 @@ body > [data-popper-placement] { } .no-reduce-motion .spoiler-input { - transition: height 0.4s ease, opacity 0.4s ease; + transition: + height 0.4s ease, + opacity 0.4s ease; } .sign-in-banner { @@ -3954,7 +3956,9 @@ a.status-card.compact:hover { overflow-y: auto; border-bottom: 1px solid lighten($ui-base-color, 8%); color: $darker-text-color; - transition: max-height 150ms ease-in-out, opacity 300ms linear; + transition: + max-height 150ms ease-in-out, + opacity 300ms linear; opacity: 1; z-index: 1; position: relative; @@ -6935,7 +6939,8 @@ noscript { .navigation-bar { & > a:first-child { will-change: margin-top, margin-inline-start, margin-inline-end, width; - transition: margin-top $duration $delay, + transition: + margin-top $duration $delay, margin-inline-start $duration ($duration + $delay), margin-inline-end $duration ($duration + $delay); } @@ -6948,12 +6953,15 @@ noscript { .navigation-bar__actions { & > .icon-button.close { will-change: opacity transform; - transition: opacity $duration * 0.5 $delay, transform $duration $delay; + transition: + opacity $duration * 0.5 $delay, + transform $duration $delay; } & > .compose__action-bar .icon-button { will-change: opacity transform; - transition: opacity $duration * 0.5 $delay + $duration * 0.5, + transition: + opacity $duration * 0.5 $delay + $duration * 0.5, transform $duration $delay; } } @@ -9094,7 +9102,8 @@ noscript { backdrop-filter: blur(8px); border: 1px solid rgba(lighten($classic-base-color, 4%), 0.85); border-radius: 8px; - box-shadow: 0 10px 15px -3px rgba($base-shadow-color, 0.25), + box-shadow: + 0 10px 15px -3px rgba($base-shadow-color, 0.25), 0 4px 6px -4px rgba($base-shadow-color, 0.25); cursor: default; transition: 0.5s cubic-bezier(0.89, 0.01, 0.5, 1.1); diff --git a/package.json b/package.json index 340a106371..ac2526da2f 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,7 @@ "eslint-plugin-import": "~2.27.5", "eslint-plugin-jsdoc": "^46.1.0", "eslint-plugin-jsx-a11y": "~6.7.1", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.0.0", "eslint-plugin-promise": "~6.1.1", "eslint-plugin-react": "~7.32.2", "eslint-plugin-react-hooks": "^4.6.0", @@ -199,7 +199,7 @@ "jest": "^29.5.0", "jest-environment-jsdom": "^29.5.0", "lint-staged": "^13.2.2", - "prettier": "^2.8.8", + "prettier": "^3.0.0", "react-test-renderer": "^18.2.0", "stylelint": "^15.10.1", "stylelint-config-standard-scss": "^10.0.0", diff --git a/yarn.lock b/yarn.lock index 5aed14ed6f..5c76aa02a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5140,12 +5140,13 @@ eslint-plugin-jsx-a11y@~6.7.1: object.fromentries "^2.0.6" semver "^6.3.0" -eslint-plugin-prettier@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" - integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== +eslint-plugin-prettier@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz#6887780ed95f7708340ec79acfdf60c35b9be57a" + integrity sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w== dependencies: prettier-linter-helpers "^1.0.0" + synckit "^0.8.5" eslint-plugin-promise@~6.1.1: version "6.1.1" @@ -9305,10 +9306,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.8.8: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae" + integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g== pretty-bytes@^5.3.0, pretty-bytes@^5.4.1: version "5.6.0" @@ -10901,6 +10902,7 @@ stringz@^2.1.0: char-regex "^1.0.2" "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: + name strip-ansi-cjs version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==