Skip to content

Commit e734563

Browse files
authored
Code formatting with Prettier (#2515)
* wip * Fix code style
1 parent 0d139f3 commit e734563

File tree

162 files changed

+1137
-1060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+1137
-1060
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Coding Standards
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
format:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
17+
- name: Install pnpm
18+
uses: pnpm/action-setup@v4
19+
with:
20+
version: 10
21+
22+
- name: Install dependencies
23+
run: pnpm install
24+
25+
- name: Format code
26+
run: pnpm run format
27+
28+
- name: Commit linted files
29+
uses: stefanzweifel/git-auto-commit-action@v5
30+
with:
31+
commit_message: "Fix code style"

.prettierignore

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,31 @@
1-
.github/
2-
pnpm-lock.yaml
1+
# Dependencies
2+
node_modules/
3+
**/vendor/
4+
5+
# Build outputs
6+
**/dist/
37
**/.svelte-kit
48
**/bootstrap/ssr
5-
**/composer.json
6-
**/composer.lock
7-
**/dist
8-
**/public/build
9-
**/vendor
9+
10+
# Generated files
11+
*.d.ts
12+
**/types/
13+
*.timestamp-*.mjs
14+
15+
# Files we don't want to format
16+
*.lock
17+
*.yaml
18+
*.json
19+
*.md
20+
21+
# Vue files with parsing issues (dual script blocks)
22+
packages/vue3/test-app/Pages/PersistentLayouts/RenderFunction/Nested/PageA.vue
23+
packages/vue3/test-app/Pages/PersistentLayouts/RenderFunction/Nested/PageB.vue
24+
packages/vue3/test-app/Pages/PersistentLayouts/RenderFunction/Simple/PageA.vue
25+
packages/vue3/test-app/Pages/PersistentLayouts/RenderFunction/Simple/PageB.vue
26+
packages/vue3/test-app/Pages/PersistentLayouts/Shorthand/Nested/PageA.vue
27+
packages/vue3/test-app/Pages/PersistentLayouts/Shorthand/Nested/PageB.vue
28+
29+
# Directories we don't want to format
30+
.github/
31+
**/test-results/

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"playground:react": "cd playgrounds/react && composer run dev",
2020
"playground:svelte4": "cd playgrounds/svelte4 && composer run dev",
2121
"playground:svelte5": "cd playgrounds/svelte5 && composer run dev",
22-
"playground:vue": "cd playgrounds/vue3 && composer run dev"
22+
"playground:vue": "cd playgrounds/vue3 && composer run dev",
23+
"format": "prettier --write ."
2324
},
2425
"dependencies": {
2526
"@playwright/test": ">=1.51.0 <1.53.0",

packages/core/src/history.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,10 @@ class History {
107107
return
108108
}
109109

110-
this.doReplaceState(
111-
{
112-
page: window.history.state.page,
113-
scrollRegions,
114-
}
115-
)
110+
this.doReplaceState({
111+
page: window.history.state.page,
112+
scrollRegions,
113+
})
116114
})
117115
})
118116
}
@@ -124,12 +122,10 @@ class History {
124122
return
125123
}
126124

127-
this.doReplaceState(
128-
{
129-
page: window.history.state.page,
130-
documentScrollPosition: scrollRegion,
131-
}
132-
)
125+
this.doReplaceState({
126+
page: window.history.state.page,
127+
documentScrollPosition: scrollRegion,
128+
})
133129
})
134130
})
135131
}

packages/core/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { Router } from './router'
22

33
export { objectToFormData } from './formData'
44
export { formDataToObject } from './formObject'
5-
export { resetFormFields } from './resetFormFields'
65
export { default as createHeadManager } from './head'
76
export { hide as hideProgress, reveal as revealProgress, default as setupProgress } from './progress'
7+
export { resetFormFields } from './resetFormFields'
88
export { default as shouldIntercept } from './shouldIntercept'
99
export * from './types'
10-
export { hrefToUrl, mergeDataIntoQueryString, urlWithoutHash, isUrlMethodPair } from './url'
10+
export { hrefToUrl, isUrlMethodPair, mergeDataIntoQueryString, urlWithoutHash } from './url'
1111
export { type Router }
1212

1313
export const router = new Router()

packages/core/src/resetFormFields.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ export function resetFormFields(formElement: HTMLFormElement, defaults: FormData
165165
if (!fieldNames || fieldNames.length === 0) {
166166
// Get all field names from both defaults and form elements (including disabled ones)
167167
const formData = new FormData(formElement)
168-
const formElementNames = Array.from(formElement.elements).map(el => isFormElement(el) ? el.name : '').filter(Boolean)
168+
const formElementNames = Array.from(formElement.elements)
169+
.map((el) => (isFormElement(el) ? el.name : ''))
170+
.filter(Boolean)
169171
fieldNames = [...new Set([...defaults.keys(), ...formData.keys(), ...formElementNames])]
170172
}
171173

packages/core/src/server.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { createServer, IncomingMessage } from 'http'
2+
import cluster from 'node:cluster'
3+
import { availableParallelism } from 'node:os'
24
import * as process from 'process'
35
import { InertiaAppResponse, Page } from './types'
4-
import cluster from 'node:cluster';
5-
import { availableParallelism } from 'node:os';
66

77
type AppCallback = (page: Page) => InertiaAppResponse
88
type RouteHandler = (request: IncomingMessage) => Promise<unknown>
@@ -21,11 +21,15 @@ const readableToString: (readable: IncomingMessage) => Promise<string> = (readab
2121
})
2222

2323
export default (render: AppCallback, options?: Port | ServerOptions): void => {
24-
const _port = typeof options === 'number' ? options : options?.port ?? 13714;
25-
const _useCluster = typeof options === 'object' && options?.cluster !== undefined ? options.cluster : false;
24+
const _port = typeof options === 'number' ? options : (options?.port ?? 13714)
25+
const _useCluster = typeof options === 'object' && options?.cluster !== undefined ? options.cluster : false
2626

2727
const log = (message: string) => {
28-
console.log(_useCluster && !cluster.isPrimary ? `[${cluster.worker?.id ?? 'N/A'} / ${cluster.worker?.process?.pid ?? 'N/A'}] ${message}` : message)
28+
console.log(
29+
_useCluster && !cluster.isPrimary
30+
? `[${cluster.worker?.id ?? 'N/A'} / ${cluster.worker?.process?.pid ?? 'N/A'}] ${message}`
31+
: message,
32+
)
2933
}
3034

3135
if (_useCluster && cluster.isPrimary) {

packages/core/src/types.ts

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ export type FormDataKeys<T> = T extends Function | FormDataConvertibleValue
6060
[Key in Extract<keyof T, `${number}`>]: `${Key & string}.${FormDataKeys<T[Key & string]> & string}`
6161
}[Extract<keyof T, `${number}`>]
6262
: string extends keyof T
63-
? string
64-
: | Extract<keyof T, string>
63+
? string
64+
:
65+
| Extract<keyof T, string>
6566
| {
6667
[Key in Extract<keyof T, string>]: `${Key}.${FormDataKeys<T[Key]> & string}`
6768
}[Extract<keyof T, string>]
@@ -273,13 +274,25 @@ export type PageEvent = 'newComponent' | 'firstLoad'
273274

274275
export type GlobalEventNames<T extends RequestPayload = RequestPayload> = keyof GlobalEventsMap<T>
275276

276-
export type GlobalEvent<TEventName extends GlobalEventNames<T>, T extends RequestPayload = RequestPayload> = CustomEvent<GlobalEventDetails<TEventName, T>>
277-
278-
export type GlobalEventParameters<TEventName extends GlobalEventNames<T>, T extends RequestPayload = RequestPayload> = GlobalEventsMap<T>[TEventName]['parameters']
279-
280-
export type GlobalEventResult<TEventName extends GlobalEventNames<T>, T extends RequestPayload = RequestPayload> = GlobalEventsMap<T>[TEventName]['result']
281-
282-
export type GlobalEventDetails<TEventName extends GlobalEventNames<T>, T extends RequestPayload = RequestPayload> = GlobalEventsMap<T>[TEventName]['details']
277+
export type GlobalEvent<
278+
TEventName extends GlobalEventNames<T>,
279+
T extends RequestPayload = RequestPayload,
280+
> = CustomEvent<GlobalEventDetails<TEventName, T>>
281+
282+
export type GlobalEventParameters<
283+
TEventName extends GlobalEventNames<T>,
284+
T extends RequestPayload = RequestPayload,
285+
> = GlobalEventsMap<T>[TEventName]['parameters']
286+
287+
export type GlobalEventResult<
288+
TEventName extends GlobalEventNames<T>,
289+
T extends RequestPayload = RequestPayload,
290+
> = GlobalEventsMap<T>[TEventName]['result']
291+
292+
export type GlobalEventDetails<
293+
TEventName extends GlobalEventNames<T>,
294+
T extends RequestPayload = RequestPayload,
295+
> = GlobalEventsMap<T>[TEventName]['details']
283296

284297
export type GlobalEventTrigger<TEventName extends GlobalEventNames<T>, T extends RequestPayload = RequestPayload> = (
285298
...params: GlobalEventParameters<TEventName, T>

packages/react/src/index.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ export { default as Deferred } from './Deferred'
66
export { default as Form } from './Form'
77
export { default as Head } from './Head'
88
export { InertiaLinkProps, default as Link } from './Link'
9-
export { InertiaFormProps, SetDataByObject, SetDataByMethod, SetDataByKeyValuePair, SetDataAction, default as useForm } from './useForm'
9+
export {
10+
InertiaFormProps,
11+
SetDataAction,
12+
SetDataByKeyValuePair,
13+
SetDataByMethod,
14+
SetDataByObject,
15+
default as useForm,
16+
} from './useForm'
1017
export { default as usePage } from './usePage'
1118
export { default as usePoll } from './usePoll'
1219
export { default as usePrefetch } from './usePrefetch'

packages/react/test-app/Pages/Article.tsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export default () => {
1919

2020
return (
2121
<>
22-
<h1 style={{ 'fontSize': '40px', }}>Article Header</h1>
23-
<article style={{ 'fontSize': '20px', 'maxWidth': '500px' }}>
22+
<h1 style={{ fontSize: '40px' }}>Article Header</h1>
23+
<article style={{ fontSize: '20px', maxWidth: '500px' }}>
2424
<p>
2525
Sunt culpa sit sunt enim aliquip. Esse ea ea quis voluptate. Enim consectetur aliqua ex ex magna cupidatat id
2626
minim sit elit. Amet pariatur occaecat pariatur duis eiusmod dolore magna. Et commodo cupidatat in commodo
@@ -82,26 +82,33 @@ export default () => {
8282
</p>
8383
<h2 id="far-down">Far down</h2>
8484
<p>
85-
Ex eiusmod id est laborum sunt ex ea aute adipisicing ad magna deserunt duis. Nostrud velit dolore id commodo quis
86-
enim fugiat. Sint non quis consectetur voluptate aliqua dolore ad voluptate nulla. Irure sit reprehenderit sint
87-
laboris non elit. Duis minim nisi esse dolor. Sit ex in consequat non occaecat commodo irure et. Commodo qui ipsum
88-
Lorem magna consequat consequat et minim eiusmod Lorem eiusmod cupidatat voluptate.
85+
Ex eiusmod id est laborum sunt ex ea aute adipisicing ad magna deserunt duis. Nostrud velit dolore id commodo
86+
quis enim fugiat. Sint non quis consectetur voluptate aliqua dolore ad voluptate nulla. Irure sit
87+
reprehenderit sint laboris non elit. Duis minim nisi esse dolor. Sit ex in consequat non occaecat commodo
88+
irure et. Commodo qui ipsum Lorem magna consequat consequat et minim eiusmod Lorem eiusmod cupidatat
89+
voluptate.
8990
</p>
9091
</article>
9192

9293
<div className="document-position">Scroll log: {JSON.stringify(scrollLog)}</div>
9394

94-
<Link id="home" data-testid="home" href="/"> Home </Link>
95+
<Link id="home" data-testid="home" href="/">
96+
{' '}
97+
Home{' '}
98+
</Link>
9599

96-
<Link id="article-far-down" data-testid="article-far-down" href="/article#far-down"> Article Far Down </Link>
100+
<Link id="article-far-down" data-testid="article-far-down" href="/article#far-down">
101+
{' '}
102+
Article Far Down{' '}
103+
</Link>
97104

98105
<button id="enable-smooth-scroll" data-testid="enable-smooth-scroll" onClick={enableSmoothScroll}>
99106
Enable Smooth Scroll
100-
</button >
107+
</button>
101108

102109
<button id="clear-scroll-log" data-testid="clear-scroll-log" onClick={() => setScrollLog([])}>
103110
Clear Scroll Log
104111
</button>
105112
</>
106113
)
107-
}
114+
}

0 commit comments

Comments
 (0)