Skip to content

Commit

Permalink
Use trailing slashes everywhere
Browse files Browse the repository at this point in the history
This is the most sweeping breaking change in Prettier 3.0.
  • Loading branch information
Vinnl committed Oct 16, 2023
1 parent a29d009 commit b823acc
Show file tree
Hide file tree
Showing 138 changed files with 786 additions and 783 deletions.
6 changes: 3 additions & 3 deletions src/apiMocks/mockData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export type RandomScanResultOptions = Partial<{
* @returns A single scan result.
*/
export function createRandomScanResult(
options: RandomScanResultOptions = {}
options: RandomScanResultOptions = {},
): OnerepScanResultRow {
faker.seed(options.fakerSeed);
return {
Expand All @@ -60,7 +60,7 @@ export function createRandomScanResult(
status:
options.status ??
(faker.helpers.arrayElement(
Object.values(RemovalStatusMap)
Object.values(RemovalStatusMap),
) as RemovalStatus),
manually_resolved: options.manually_resolved ?? faker.datatype.boolean(),
addresses: Array.from({ length: 3 }, () => ({
Expand Down Expand Up @@ -91,7 +91,7 @@ export type RandomBreachOptions = Partial<{

// TODO: MNTOR-2033 Update this random breach function with new data breach object, and deprecate all BreachMockItems
export function createRandomBreach(
options: RandomBreachOptions = {}
options: RandomBreachOptions = {},
): SubscriberBreach {
const dataClassTypes = options.isHighRiskOnly
? HighRiskDataTypes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,31 +103,31 @@ function getTemplatesData(l10n: ReactLocalization) {
template: getPreviewTemplate(
getVerificationDummyData(appConstants.EMAIL_TEST_RECIPIENT, l10n),
verifyPartial,
l10n
l10n,
),
},
[EmailTemplateType.Notification]: {
label: "Breach notification",
template: getPreviewTemplate(
getNotificationDummyData(appConstants.EMAIL_TEST_RECIPIENT, l10n),
breachAlertEmailPartial,
l10n
l10n,
),
},
[EmailTemplateType.Monthly]: {
label: "Monthly unresolved breaches",
template: getPreviewTemplate(
getMonthlyDummyData(appConstants.EMAIL_TEST_RECIPIENT, l10n),
monthlyUnresolvedEmailPartial,
l10n
l10n,
),
},
[EmailTemplateType.SignupReport]: {
label: "Signup report",
template: getPreviewTemplate(
getSignupReportDummyData(appConstants.EMAIL_TEST_RECIPIENT, l10n),
signupReportEmailPartial,
l10n
l10n,
),
},
};
Expand All @@ -145,7 +145,7 @@ function getPreviewOptions(currentTemplateKey: string, data: any) {
>
${data[templateKey].label as string}
</option>
`
`,
)
.join("");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ export async function POST(req: NextRequest) {
const emailTemplate = getTemplate(
getVerificationDummyData(recipient, l10n),
verifyPartial,
l10n
l10n,
);
await initEmail(process.env.SMTP_URL);
await sendEmail(
recipient,
l10n.getString("email-subject-verify"),
emailTemplate
emailTemplate,
);
break;
}
Expand All @@ -51,13 +51,13 @@ export async function POST(req: NextRequest) {
const emailTemplate = getTemplate(
getMonthlyDummyData(AppConstants.EMAIL_TEST_RECIPIENT, l10n),
monthlyUnresolvedEmailPartial,
l10n
l10n,
);
await initEmail(process.env.SMTP_URL);
await sendEmail(
recipient,
l10n.getString("email-unresolved-heading"),
emailTemplate
emailTemplate,
);
break;
}
Expand All @@ -66,13 +66,13 @@ export async function POST(req: NextRequest) {
const emailTemplate = getTemplate(
getSignupReportDummyData(AppConstants.EMAIL_TEST_RECIPIENT, l10n),
signupReportEmailPartial,
l10n
l10n,
);
await initEmail(process.env.SMTP_URL);
await sendEmail(
recipient,
l10n.getString("email-subject-found-breaches"),
emailTemplate
emailTemplate,
);
break;
}
Expand All @@ -87,7 +87,7 @@ export async function POST(req: NextRequest) {
if (emailId !== EmailTemplateType.Notification) {
return NextResponse.json(
{ success: true, message: `Sent test ${emailId} email` },
{ status: 200 }
{ status: 200 },
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function createEmailOptions({ breachesData, emailSelectIndex }: UserBreaches) {
(email, index) =>
`<option ${
emailSelectIndex === index ? "selected" : ""
}>${email}</option>`
}>${email}</option>`,
);

return optionElements.join("");
Expand Down Expand Up @@ -126,7 +126,7 @@ export default async function UserBreaches() {
dangerouslySetInnerHTML={{
__html: l10n.getString("breach-heading-email", {
"email-select": `<custom-select name="email-account">${createEmailOptions(
userBreachesData
userBreachesData,
)}</custom-select>`,
}),
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const deleteButton = (email: EmailRow) => {

const createEmailItem = (
email: EmailRow & { primary?: boolean },
breachCounts: Map<string, number>
breachCounts: Map<string, number>,
) => {
const l10n = getL10n();

Expand Down Expand Up @@ -98,12 +98,12 @@ const getSortedEmails = (emails: Array<EmailRow & { primary?: boolean }>) =>

const createEmailList = (
emails: EmailRow[],
breachCounts: Map<string, number>
breachCounts: Map<string, number>,
) => {
return (
<ul className="settings-email-list">
{getSortedEmails(emails).map((email) =>
createEmailItem(email, breachCounts)
createEmailItem(email, breachCounts),
)}
</ul>
);
Expand Down Expand Up @@ -180,7 +180,7 @@ export default async function Settings() {
const breaches = await getBreachesForEmail(
getSha1(email.email),
allBreaches,
true
true,
);
breachCounts.set(email.email, breaches?.length || 0);
}
Expand Down Expand Up @@ -252,7 +252,7 @@ export default async function Settings() {
{l10n.getString(
enabledFlags.includes("FxaRebrand")
? "settings-deactivate-account-info-2"
: "settings-deactivate-account-info"
: "settings-deactivate-account-info",
)}
</p>
<a
Expand All @@ -264,7 +264,7 @@ export default async function Settings() {
{l10n.getString(
enabledFlags.includes("FxaRebrand")
? "settings-fxa-link-label-2"
: "settings-fxa-link-label"
: "settings-fxa-link-label",
)}
</a>
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default async function BreachDetail(props: {
year: "numeric",
month: "long",
day: "numeric",
}
},
),
breachTitle: breach.Title,
addedDate: (breach.AddedDate as unknown as Date).toLocaleString(
Expand All @@ -134,7 +134,7 @@ export default async function BreachDetail(props: {
year: "numeric",
month: "long",
day: "numeric",
}
},
),
})}
</div>
Expand Down Expand Up @@ -251,7 +251,7 @@ function getBreachDetail(categoryId: ReturnType<typeof getBreachCategory>) {
}

function makeBreachDetail(
breachCategory: ReturnType<typeof getBreachCategory>
breachCategory: ReturnType<typeof getBreachCategory>,
) {
const breachDetail = getBreachDetail(breachCategory);
return (
Expand Down Expand Up @@ -299,13 +299,13 @@ function getSortedDataClasses(
isUserBrowserFirefox = false,
isUserLocaleEnUs = false,
_isUserLocalEn = false,
changePWLink = false
changePWLink = false,
) {
const l10n = getL10n();
const priorityDataClasses: any = getAllPriorityDataClasses(
isUserBrowserFirefox,
isUserLocaleEnUs,
changePWLink
changePWLink,
);

const sortedDataClasses = {
Expand All @@ -327,7 +327,7 @@ function getSortedDataClasses(
return b.weight - a.weight;
});
sortedDataClasses.lowerPriority = sortedDataClasses.lowerPriority.join(
", "
", ",
) as any;
return sortedDataClasses;
}
Expand Down Expand Up @@ -362,30 +362,31 @@ function makeRecommendationCards(breach: HibpLikeDbBreach) {
const l10n = getL10n();
const dataClasses = getSortedDataClasses(breach);

const priorityRecs = dataClasses.priority.map((dataClass) =>
// This code predates TypeScript:
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
dataClass.recommendations?.map((r: any) => (
<div
key={r.ctaHref}
className={`breach-detail-recommendation ${
r.recIconClassName as string
}`}
>
<dt>{l10n.getString(r.recommendationCopy.subhead)}</dt>
<dd>
<p>{l10n.getString(r.recommendationCopy.body)}</p>
{r.recommendationCopy.cta ? (
<a
href={r.ctaHref}
target={r.ctaShouldOpenInNewTab ? "_blank" : "_self"}
>
{l10n.getString(r.recommendationCopy.cta)}
</a>
) : null}
</dd>
</div>
))
const priorityRecs = dataClasses.priority.map(
(dataClass) =>
// This code predates TypeScript:
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
dataClass.recommendations?.map((r: any) => (
<div
key={r.ctaHref}
className={`breach-detail-recommendation ${
r.recIconClassName as string
}`}
>
<dt>{l10n.getString(r.recommendationCopy.subhead)}</dt>
<dd>
<p>{l10n.getString(r.recommendationCopy.body)}</p>
{r.recommendationCopy.cta ? (
<a
href={r.ctaHref}
target={r.ctaShouldOpenInNewTab ? "_blank" : "_self"}
>
{l10n.getString(r.recommendationCopy.cta)}
</a>
) : null}
</dd>
</div>
)),
);

const genericRecs = getAllGenericRecommendations().map((dataClass: any) => (
Expand Down
6 changes: 3 additions & 3 deletions src/app/(nextjs_migration)/(guest)/breaches/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default async function PublicScan() {
new Date(a.AddedDate).getTime() <
new Date(b.AddedDate).getTime()
? 1
: -1
: -1,
)
.map((breach) => (
<BreachCard
Expand Down Expand Up @@ -124,7 +124,7 @@ function BreachCard(props: { breach: HibpLikeDbBreach | Breach }) {
year: "numeric",
month: "long",
day: "numeric",
}
},
)}
</dd>
</div>
Expand All @@ -133,7 +133,7 @@ function BreachCard(props: { breach: HibpLikeDbBreach | Breach }) {
<dd>
{formatList(
props.breach.DataClasses.map((a: string) => l10n.getString(a)),
getLocale(l10n)
getLocale(l10n),
)}
</dd>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/(nextjs_migration)/(guest)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function Home() {
name="email"
type="email"
placeholder={l10n.getString(
"exposure-landing-hero-email-placeholder"
"exposure-landing-hero-email-placeholder",
)}
required
/>
Expand Down
Loading

0 comments on commit b823acc

Please sign in to comment.