Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/migrate laravel 11 #482

Merged
merged 3 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/update-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Update Version on Release

on:
release:
types: [published]

jobs:
update-version:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2' # Use your PHP version

- name: Get latest release tag
run: echo "RELEASE_VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV

- name: Update version in config/app.php
run: |
sed -i "s/'version' => env('APP_VERSION', .*/'version' => env('APP_VERSION', '${RELEASE_VERSION}'),/" config/app.php

- name: Commit and push changes
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"
git add config/app.php
git commit -m "Update app version to ${RELEASE_VERSION}"
git push origin HEAD
19 changes: 10 additions & 9 deletions app/Http/Middleware/HandleInertiaRequests.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ public function share(Request $request)
$team = $user ? $user->currentTeam : null;
$menu = Menu::render('app');

return array_merge(parent::share($request), [
'auth' => [
'user' => $request->user(),
],
'ziggy' => function () use ($request) {
return array_merge((new Ziggy)->toArray(), [
return [
...parent::share($request),
'ziggy' => fn () =>[
...(new Ziggy)->toArray(),
'location' => $request->url(),
]);
},
],
// 'auth' => [
// 'user' => $request->user(),
// ],
'locale' => app()->getLocale(),
'settings' => $team ? $team->settings->mapWithKeys(fn ($setting) => [$setting['name'] => $setting['value']]) : [],
'accountDetailTypes' => AccountDetailType::all(),
Expand All @@ -74,6 +74,7 @@ public function share(Request $request)
->orderBy('index')
->with('subCategories')
->get() : [''],
]);
'version' => config('app.version')
];
}
}
8 changes: 8 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,26 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
IFluentFoodApple20Filled: typeof import('~icons/fluent/food-apple20-filled')['default']
IMaterialSymbolsBrightnessAlertOutlineRounded: typeof import('~icons/material-symbols/brightness-alert-outline-rounded')['default']
IMdiBankTransfer: typeof import('~icons/mdi/bank-transfer')['default']
IMdiBankTransferIn: typeof import('~icons/mdi/bank-transfer-in')['default']
IMdiBankTransferOut: typeof import('~icons/mdi/bank-transfer-out')['default']
IMdiBell: typeof import('~icons/mdi/bell')['default']
IMdiCallSplit: typeof import('~icons/mdi/call-split')['default']
IMdiCheck: typeof import('~icons/mdi/check')['default']
IMdiChevronDown: typeof import('~icons/mdi/chevron-down')['default']
IMdiChevronLeft: typeof import('~icons/mdi/chevron-left')['default']
IMdiChevronRight: typeof import('~icons/mdi/chevron-right')['default']
IMdiChevronUp: typeof import('~icons/mdi/chevron-up')['default']
IMdiClose: typeof import('~icons/mdi/close')['default']
IMdiEdit: typeof import('~icons/mdi/edit')['default']
IMdiEllipsisVertical: typeof import('~icons/mdi/ellipsis-vertical')['default']
IMdiFile: typeof import('~icons/mdi/file')['default']
IMdiLink: typeof import('~icons/mdi/link')['default']
IMdiLock: typeof import('~icons/mdi/lock')['default']
IMdiMoney: typeof import('~icons/mdi/money')['default']
IMdiPlus: typeof import('~icons/mdi/plus')['default']
IMdiStar: typeof import('~icons/mdi/star')['default']
IMdiStarOutline: typeof import('~icons/mdi/star-outline')['default']
IMdiSync: typeof import('~icons/mdi/sync')['default']
Expand Down
13 changes: 6 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-mailparse": "*",
"brick/money": "^0.6.0",
"doctrine/dbal": "^3.3",
Expand All @@ -14,19 +14,18 @@
"freesgen/atmosphere": "dev-main",
"google/apiclient": "^2.12",
"guzzlehttp/guzzle": "^7.0.2",
"inertiajs/inertia-laravel": "^0.6.3",
"inertiajs/inertia-laravel": "^1.0",
"insane/journal": "dev-master",
"insane/plan-module": "dev-master",
"insane/treasurer": "dev-master",
"insane/watchlist-module": "dev-main",
"joshbrw/laravel-module-installer": "^2.0",
"kreait/laravel-firebase": "^5.2",
"lab404/laravel-impersonate": "^1.7",
"laravel/framework": "^10.0",
"laravel/jetstream": "^2.3",
"laravel/octane": "^2.2",
"laravel/framework": "^11.0",
"laravel/jetstream": "^5.0",
"laravel/pulse": "^1.0@beta",
"laravel/sanctum": "^3.2",
"laravel/sanctum": "^4.0",
"laravel/tinker": "^2.8",
"maatwebsite/excel": "^3.1",
"mvanduijker/laravel-mercure-broadcaster": "^3.5",
Expand All @@ -50,7 +49,7 @@
"insane/remotr": "dev-main",
"laravel/pint": "^1.13",
"mockery/mockery": "^1.4.2",
"nunomaduro/collision": "^7.0",
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^10.0",
"spatie/laravel-ignition": "^2.0"
},
Expand Down
Loading
Loading