Skip to content

Commit

Permalink
Run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
james-em committed May 8, 2024
1 parent 4250e78 commit ae1c535
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 40 deletions.
18 changes: 10 additions & 8 deletions packages/svelte/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
let child = $derived(store.component && h(store.component.default, store.page.props))
let layout = $derived(store.component && store.component.layout)
let components = $derived(layout
? Array.isArray(layout)
? layout
.concat(child)
.reverse()
.reduce((child, layout) => h(layout, store.page.props, [child]))
: h(layout, store.page.props, [child])
: child)
let components = $derived(
layout
? Array.isArray(layout)
? layout
.concat(child)
.reverse()
.reduce((child, layout) => h(layout, store.page.props, [child]))
: h(layout, store.page.props, [child])
: child,
)
</script>

<Render {...components} />
22 changes: 11 additions & 11 deletions packages/svelte/src/Link.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
import { default as inertia } from './link'
let {
href,
as = 'a',
data = {},
method = 'get',
replace = false,
preserveScroll = false,
preserveState = null,
only = [],
headers = {},
href,
as = 'a',
data = {},
method = 'get',
replace = false,
preserveScroll = false,
preserveState = null,
only = [],
headers = {},
queryStringArrayFormat = 'brackets',
children,
...restProps
} = $props();
} = $props()
$effect.pre(() => {
if (as === 'a' && method.toLowerCase() !== 'get') {
Expand Down Expand Up @@ -42,5 +42,5 @@
{...as === 'a' ? { href } : {}}
{...restProps}
>
{@render children()}
{@render children()}
</svelte:element>
8 changes: 2 additions & 6 deletions packages/svelte/src/Render.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
<script>
import store from './store.svelte'
let {
component,
props = {},
childComponents = [],
} = $props()
let { component, props = {}, childComponents = [] } = $props()
let prevComponent
let key
Expand All @@ -25,7 +21,7 @@
key = Date.now()
prevComponent = component
}
});
})
</script>

{#if store.component}
Expand Down
6 changes: 3 additions & 3 deletions packages/svelte/src/createInertiaApp.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { router, setupProgress } from '@inertiajs/core'
import { render } from 'svelte/server';
import { render } from 'svelte/server'
import App from './App.svelte'
import SSR from './SSR.svelte'
import store from './store.svelte'
Expand All @@ -12,7 +12,7 @@ export default async function createInertiaApp({ id = 'app', resolve, setup, pro

await resolveComponent(initialPage.component).then((initialComponent) => {
store.component = initialComponent
store.page = initialPage;
store.page = initialPage
})

if (!isServer) {
Expand Down Expand Up @@ -41,7 +41,7 @@ export default async function createInertiaApp({ id = 'app', resolve, setup, pro
}

if (isServer) {
const { html, head } = render(SSR, { props: { id, initialPage }})
const { html, head } = render(SSR, { props: { id, initialPage } })

return {
body: html,
Expand Down
4 changes: 3 additions & 1 deletion packages/svelte/src/page.svelte.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import store from './store.svelte'

const page = {
get current() { return store.page },
get current() {
return store.page
},
}

export default page
4 changes: 2 additions & 2 deletions packages/svelte/src/remember.svelte.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { router } from '@inertiajs/core'
function useRemember(initialState, key) {
const restored = router.restore(key)
const store = $state(restored !== undefined ? restored : initialState)
$effect(() => router.remember($state.snapshot(store), key))

$effect(() => router.remember($state.snapshot(store), key))

return store
}
Expand Down
2 changes: 0 additions & 2 deletions packages/svelte/src/useForm.svelte.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ function useForm(...args) {
})

$effect(() => {

if (store.isDirty === isEqual(store.data(), defaults)) {
store.setStore('isDirty', !store.isDirty)
}
Expand All @@ -200,7 +199,6 @@ function useForm(...args) {
if (rememberKey) {
router.remember({ data: $state.snapshot(store.data()), errors: $state.snapshot(store.errors) }, rememberKey)
}

})

return store
Expand Down
2 changes: 1 addition & 1 deletion playgrounds/svelte/resources/js/Components/Layout.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script>
import { inertia, page } from '@inertiajs/svelte'
let { children } = $props();
let { children } = $props()
</script>

<nav class="flex items-center space-x-6 bg-slate-800 px-10 py-6 text-white">
Expand Down
4 changes: 1 addition & 3 deletions playgrounds/svelte/resources/js/Pages/Form.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@
{/if}
</div>
<div class="flex gap-4">
<button type="submit" disabled={form.processing} class="rounded bg-slate-800 px-6 py-2 text-white">
Submit
</button>
<button type="submit" disabled={form.processing} class="rounded bg-slate-800 px-6 py-2 text-white"> Submit </button>
<button type="button" onclick={() => form.reset()}>Reset</button>
</div>
</form>
6 changes: 3 additions & 3 deletions playgrounds/svelte/resources/js/app.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { mount, hydrate } from "svelte";
import { createInertiaApp } from '../../../../packages/svelte/src/index.js'
import { createInertiaApp } from '@inertiajs/svelte'
import { hydrate, mount } from 'svelte'

createInertiaApp({
resolve: (name) => {
const pages = import.meta.glob('./Pages/**/*.svelte', { eager: true })
return pages[`./Pages/${name}.svelte`]
},
setup({ el, App }) {
if (el.dataset.serverRendered === "true") {
if (el.dataset.serverRendered === 'true') {
hydrate(App, { target: el })
} else {
mount(App, { target: el })
Expand Down

0 comments on commit ae1c535

Please sign in to comment.