mirror of
https://github.com/arsvendg/Stirling-PDF.git
synced 2026-07-16 11:23:10 +02:00
Prettier 2: Electric Boogaloo (#6113)
# Description of Changes When I added Prettier formatting in #6052, my aim was to use just the default settings in Prettier. Turns out, Prettier looks _really hard_ for any config files if it's not explicitly given one, which means that if a developer has some sort of Prettier config file lying around on their system, Prettier might find it and use it. Also, Prettier changes its defaults based on stuff in `.editorconfig` without any good way of disabling that behaviour explicitly in its config file. To solve both of these issues, I've introduced a `.prettierrc` file which sets Prettier's defaults explicitly, and then reformatted all our code _again_ in Prettier's actual default settings. This should achieve the aim of #6052 and remove the possibility for it breaking on different dev computers.
This commit is contained in:
@@ -20,7 +20,14 @@ export type SlideId =
|
||||
| "analytics-choice"
|
||||
| "mfa-setup";
|
||||
|
||||
export type HeroType = "rocket" | "dual-icon" | "shield" | "diamond" | "logo" | "lock" | "analytics";
|
||||
export type HeroType =
|
||||
| "rocket"
|
||||
| "dual-icon"
|
||||
| "shield"
|
||||
| "diamond"
|
||||
| "logo"
|
||||
| "lock"
|
||||
| "analytics";
|
||||
|
||||
export type ButtonAction =
|
||||
| "next"
|
||||
@@ -91,7 +98,11 @@ export interface SlideDefinition {
|
||||
export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
|
||||
"first-login": {
|
||||
id: "first-login",
|
||||
createSlide: ({ firstLoginUsername, onPasswordChanged, usingDefaultCredentials }) =>
|
||||
createSlide: ({
|
||||
firstLoginUsername,
|
||||
onPasswordChanged,
|
||||
usingDefaultCredentials,
|
||||
}) =>
|
||||
FirstLoginSlide({
|
||||
username: firstLoginUsername || "",
|
||||
onPasswordChanged: onPasswordChanged || (() => {}),
|
||||
@@ -148,7 +159,8 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
|
||||
},
|
||||
"security-check": {
|
||||
id: "security-check",
|
||||
createSlide: ({ selectedRole, onRoleSelect }) => SecurityCheckSlide({ selectedRole, onRoleSelect }),
|
||||
createSlide: ({ selectedRole, onRoleSelect }) =>
|
||||
SecurityCheckSlide({ selectedRole, onRoleSelect }),
|
||||
hero: { type: "shield" },
|
||||
buttons: [
|
||||
{
|
||||
@@ -172,7 +184,8 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
|
||||
},
|
||||
"admin-overview": {
|
||||
id: "admin-overview",
|
||||
createSlide: ({ licenseNotice, loginEnabled }) => PlanOverviewSlide({ isAdmin: true, licenseNotice, loginEnabled }),
|
||||
createSlide: ({ licenseNotice, loginEnabled }) =>
|
||||
PlanOverviewSlide({ isAdmin: true, licenseNotice, loginEnabled }),
|
||||
hero: { type: "diamond" },
|
||||
buttons: [
|
||||
{
|
||||
@@ -262,7 +275,8 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
|
||||
},
|
||||
"analytics-choice": {
|
||||
id: "analytics-choice",
|
||||
createSlide: ({ analyticsError }) => AnalyticsChoiceSlide({ analyticsError }),
|
||||
createSlide: ({ analyticsError }) =>
|
||||
AnalyticsChoiceSlide({ analyticsError }),
|
||||
hero: { type: "analytics" },
|
||||
buttons: [
|
||||
{
|
||||
@@ -285,7 +299,8 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
|
||||
},
|
||||
"mfa-setup": {
|
||||
id: "mfa-setup",
|
||||
createSlide: ({ onMfaSetupComplete = () => {} }: SlideFactoryParams) => MFASetupSlide({ onMfaSetupComplete }),
|
||||
createSlide: ({ onMfaSetupComplete = () => {} }: SlideFactoryParams) =>
|
||||
MFASetupSlide({ onMfaSetupComplete }),
|
||||
hero: { type: "lock" },
|
||||
buttons: [], // Form has its own submit button
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user