Skip to content

Commit

Permalink
Update inertia
Browse files Browse the repository at this point in the history
  • Loading branch information
antoine committed Dec 17, 2024
1 parent 676c067 commit a50e4c8
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 64 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
"ext-dom": "*",
"blade-ui-kit/blade-icons": "^1.6",
"code16/laravel-content-renderer": "^1.1",
"inertiajs/inertia-laravel": "^1.0",
"inertiajs/inertia-laravel": "^2.0",
"intervention/image": "^3.4",
"intervention/image-laravel": "^1.2",
"laravel/framework": "^11.0",
"laravel/prompts": "0.*",
"league/commonmark": "^2.4",
"masterminds/html5": "^2.8",
"spatie/image-optimizer": "^1.6",
"tightenco/ziggy": "^2.0",
"laravel/prompts": "0.*"
"tightenco/ziggy": "^2.0"
},
"require-dev": {
"brianium/paratest": "^7.0",
Expand Down
2 changes: 1 addition & 1 deletion demo/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"blade-ui-kit/blade-icons": "^1.6",
"code16/laravel-content-renderer": "^1.2",
"guzzlehttp/guzzle": "^7.2",
"inertiajs/inertia-laravel": "^1.0",
"inertiajs/inertia-laravel": "^2.0",
"intervention/image": "^3.4",
"intervention/image-laravel": "^1.2",
"laravel/framework": "^11.0",
Expand Down
28 changes: 13 additions & 15 deletions demo/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 15 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@googlemaps/js-api-loader": "^1.16.8",
"@headlessui/vue": "^1.7.19",
"@heroicons/vue": "^2.0.18",
"@inertiajs/vue3": "^1.2.0",
"@inertiajs/vue3": "^2.0.0",
"@tiptap/core": "^2.2.2",
"@tiptap/extension-character-count": "^2.2.2",
"@tiptap/extension-code-block": "^2.2.2",
Expand Down
7 changes: 1 addition & 6 deletions resources/js/form/components/useFormTabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,7 @@ export function useFormTabs(props: { form: FormData }) {
if(props.form.layout.tabbed && props.form.layout.tabs.length > 1) {
watch(selectedTabSlug, () => {
const url = location.origin + location.pathname + `?tab=${selectedTabSlug.value}`;
// @ts-ignore
router.page.url = url;
// @ts-ignore
history.replaceState(router.page, null, url);
// todo inertia v2 router.page doesn't exist so we will have to hack with popstate event
// window.dispatchEvent(new PopStateEvent('popstate'));
router.replace({ url, preserveState: true });
}, { immediate: true });
}

Expand Down
6 changes: 3 additions & 3 deletions tests-e2e/site/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
"license": "MIT",
"require": {
"php": "^8.2",
"ext-json": "*",
"blade-ui-kit/blade-icons": "^1.7",
"code16/laravel-content-renderer": "^1.2",
"inertiajs/inertia-laravel": "^1.3",
"inertiajs/inertia-laravel": "^2.0",
"intervention/image": "^3.9",
"intervention/image-laravel": "^1.3",
"laravel/framework": "^11.31",
"laravel/tinker": "^2.9",
"spatie/laravel-db-snapshots": "^2.6",
"spatie/laravel-ray": "^1.37",
"spatie/laravel-translatable": "^6.8",
"tightenco/ziggy": "^2.4",
"ext-json": "*"
"tightenco/ziggy": "^2.4"
},
"require-dev": {
"fakerphp/faker": "^1.23",
Expand Down
35 changes: 17 additions & 18 deletions tests-e2e/site/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a50e4c8

Please sign in to comment.