From bacb103bf0293d4ddaf68391a55b5337bdc59674 Mon Sep 17 00:00:00 2001 From: "Irsyad A. Panjaitan" Date: Wed, 16 Oct 2024 16:07:25 +0700 Subject: [PATCH 1/2] fix: fix app.tsx --- resources/js/app.tsx | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/resources/js/app.tsx b/resources/js/app.tsx index 1556ea3..60b852c 100644 --- a/resources/js/app.tsx +++ b/resources/js/app.tsx @@ -1,33 +1,31 @@ -import '../css/app.css'; -import './bootstrap'; +import '../css/app.css' +import './bootstrap' -import { Ziggy } from '@/ziggy'; -import { createInertiaApp } from '@inertiajs/react'; -import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers'; -import { createRoot, hydrateRoot } from 'react-dom/client'; -import { useRoute } from 'ziggy-js'; -import { Providers } from './providers'; +import { Ziggy } from '@/ziggy' +import { createInertiaApp } from '@inertiajs/react' +import { Providers } from './providers' +import { resolvePageComponent } from 'laravel-vite-plugin/inertia-helpers' +import { createRoot, hydrateRoot } from 'react-dom/client' +import { useRoute } from 'ziggy-js' -const appName = import.meta.env.VITE_APP_NAME || 'Laravel'; +const appName = import.meta.env.VITE_APP_NAME || 'Irsyad' createInertiaApp({ title: (title) => (title ? `${title} / ${appName}` : appName), resolve: (name) => resolvePageComponent(`./pages/${name}.tsx`, import.meta.glob('./pages/**/*.tsx')), setup({ el, App, props }) { - window.route = useRoute(Ziggy as any); + window.route = useRoute(Ziggy as any) const appElement = ( - ); - if (import.meta.env.DEV) { - createRoot(el).render(appElement); - return; + ) + if (import.meta.env.SSR) { + hydrateRoot(el, appElement) + return } - hydrateRoot(el, appElement); + createRoot(el).render(appElement) }, - progress: { - color: '#4B5563' - } -}); + progress: false +}) From 71ecdae169707fbc256b582776d1b829c41ae919 Mon Sep 17 00:00:00 2001 From: "Irsyad A. Panjaitan" Date: Wed, 16 Oct 2024 16:07:36 +0700 Subject: [PATCH 2/2] chore: release v1.0.30 --- CHANGELOG.md | 7 +++++++ composer.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51801e1..378242a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ +## [1.0.30](https://github.com/justdlabs/inertia.ts/compare/1.0.29...1.0.30) (2024-10-16) + + +### Bug Fixes + +* fix app.tsx ([bacb103](https://github.com/justdlabs/inertia.ts/commit/bacb103bf0293d4ddaf68391a55b5337bdc59674)) + ## [1.0.29](https://github.com/justdlabs/inertia.ts/compare/1.0.28...1.0.29) (2024-10-16) diff --git a/composer.json b/composer.json index 663df1b..3f3a834 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "justd/laravel", - "version": "1.0.29", + "version": "1.0.30", "type": "project", "description": "The skeleton application for the Laravel framework.", "keywords": [ diff --git a/package-lock.json b/package-lock.json index 9b0ed08..fa5a761 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { "name": "inertia.ts", - "version": "1.0.29", + "version": "1.0.30", "lockfileVersion": 3, "requires": true, "packages": { "": { - "version": "1.0.29", + "version": "1.0.30", "dependencies": { "clsx": "^2.1.1", "framer-motion": "^11.3.31", diff --git a/package.json b/package.json index 7d168f0..71ab220 100644 --- a/package.json +++ b/package.json @@ -80,5 +80,5 @@ } } }, - "version": "1.0.29" + "version": "1.0.30" }