Skip to content

Commit

Permalink
upgrade to laravel 11
Browse files Browse the repository at this point in the history
  • Loading branch information
Thiritin committed Sep 15, 2024
1 parent 11d8126 commit 91f02f1
Show file tree
Hide file tree
Showing 7 changed files with 1,102 additions and 1,689 deletions.
21 changes: 21 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.git
.env.example
.env
README.md
storage/app/*
storage/framework/cache/*
storage/framework/sessions/*
storage/framework/views/*
storage/logs/*
vendor
**/*node_modules
.idea
**.git
**.gitignore
**.gitattributes
**.sass-cache
Dockerfile
docker-compose.yml
phpunit.xml
.envrc
.direnv/*
10 changes: 2 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,8 @@ USER www-data
######################################################
COPY .github/docker/php/opcache.ini $PHP_INI_DIR/conf.d/opcache.ini
COPY .github/docker/php/php.ini $PHP_INI_DIR/conf.d/php.ini

######################################################
# Step 6 | Configure Credentials & Hosts for external Git (optional)
######################################################
COPY composer.json composer.lock /app/
RUN composer install --no-dev --no-scripts --no-autoloader
######################################################
# Local Stage - Unused for this Project only there as a placeholder
# Local Stage
######################################################
FROM base as local
######################################################
Expand All @@ -44,7 +38,7 @@ RUN COMPOSER_ALLOW_SUPERUSER=1 | composer require tightenco/ziggy:^2 --ignore-pl
FROM node:20-alpine as vite
WORKDIR /app
COPY package.json package-lock.json tailwind.config.js vite.config.js postcss.config.js ./
RUN npm ci
RUN npm install --force
COPY ./resources /app/resources
COPY --from=vite-vendor-build /app/vendor/tightenco/ziggy /app/vendor/tightenco/ziggy
RUN npm run build
Expand Down
6 changes: 1 addition & 5 deletions app/Http/Middleware/HandleInertiaRequests.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,10 @@ public function version(Request $request): ?string
public function share(Request $request): array
{
return array_merge(parent::share($request), [
...parent::share($request),
'auth' => [
'user' => $request->user(),
],
'ziggy' => function () use ($request) {
return array_merge((new Ziggy)->toArray(), [
'location' => $request->url(),
]);
},
]);
}
}
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@
"filament/filament": "^3.0-stable",
"filament/spatie-laravel-settings-plugin": "^3.0-stable",
"guzzlehttp/guzzle": "^7.2",
"inertiajs/inertia-laravel": "^0.6.8",
"inertiajs/inertia-laravel": "^1.0",
"intervention/image": "^2.7",
"laravel-notification-channels/telegram": "^4.0",
"laravel/framework": "^10.10",
"laravel-notification-channels/telegram": "^5.0",
"laravel/framework": "^11.10",
"laravel/octane": "^2.5",
"laravel/sanctum": "^3.2",
"laravel/sanctum": "^4.0",
"laravel/tinker": "^2.8",
"pusher/pusher-php-server": "^7.2",
"sentry/sentry-laravel": "^3.7",
"sentry/sentry-laravel": "^4.7",
"spatie/laravel-activitylog": "^4.7",
"spatie/laravel-settings": "^3.2",
"tightenco/ziggy": "^1.0"
"tightenco/ziggy": "^2.0"
},
"require-dev": {
"fakerphp/faker": "^1.9.1",
"laravel-shift/blueprint": "^2.7",
"laravel/breeze": "^1.21",
"laravel/breeze": "^2.0",
"laravel/pint": "^1.10",
"laravel/sail": "^1.23",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^10.1",
"spatie/laravel-ignition": "^2.0",
"tightenco/duster": "^2.2"
Expand Down
Loading

0 comments on commit 91f02f1

Please sign in to comment.