Skip to content

Commit

Permalink
Merge branch '4.x' into pr/14419
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Feb 2, 2025
2 parents 1f0d06a + 6d2b147 commit 40f31e8
Show file tree
Hide file tree
Showing 1,467 changed files with 24,867 additions and 13,725 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,12 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [8.3, 8.2, 8.1]
laravel: [11.*, 10.*]
php: [8.3, 8.2]
laravel: [11.*]
dependency-version: [prefer-stable]
include:
- laravel: 11.*
testbench: 9.*
- laravel: 10.*
testbench: 8.*
exclude:
- laravel: 11.*
php: 8.1
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
steps:
- uses: actions/checkout@v3
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,12 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [8.3, 8.2, 8.1]
laravel: [11.*, 10.*]
php: [8.3, 8.2]
laravel: [11.*]
dependency-version: [prefer-stable]
include:
- laravel: 11.*
testbench: 9.*
- laravel: 10.*
testbench: 8.*
exclude:
- laravel: 11.*
php: 8.1
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 1 addition & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"plugins": ["prettier-plugin-blade", "prettier-plugin-tailwindcss"],
"semi": false,
"singleQuote": true,
"tailwindConfig": "./packages/panels/tailwind.config.js"
"singleQuote": true
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

<p align="center">
<a href="https://github.com/filamentphp/filament/actions"><img alt="Tests passing" src="https://img.shields.io/badge/Tests-passing-green?style=for-the-badge&logo=github"></a>
<a href="https://laravel.com"><img alt="Laravel v10.x" src="https://img.shields.io/badge/Laravel-v10.x-FF2D20?style=for-the-badge&logo=laravel"></a>
<a href="https://laravel.com"><img alt="Laravel v11.x" src="https://img.shields.io/badge/Laravel-v11.x-FF2D20?style=for-the-badge&logo=laravel"></a>
<a href="https://livewire.laravel.com"><img alt="Livewire v3.x" src="https://img.shields.io/badge/Livewire-v3.x-FB70A9?style=for-the-badge"></a>
<a href="https://php.net"><img alt="PHP 8.1" src="https://img.shields.io/badge/PHP-8.1-777BB4?style=for-the-badge&logo=php"></a>
<a href="https://php.net"><img alt="PHP 8.2" src="https://img.shields.io/badge/PHP-8.2-777BB4?style=for-the-badge&logo=php"></a>
</p>

<p align="center">
Expand Down
7 changes: 0 additions & 7 deletions bin/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@ corePackages.forEach((packageName) => {
})
})

compile({
...defaultOptions,
platform: 'browser',
entryPoints: [`./node_modules/async-alpine/dist/async-alpine.script.js`],
outfile: `./packages/support/dist/async-alpine.js`,
})

compile({
...defaultOptions,
platform: 'browser',
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Filament\SpatieLaravelTranslatablePluginServiceProvider;
use Filament\Support\SupportServiceProvider;
use Filament\Tables\TablesServiceProvider;
use Filament\Tests\AdminPanelProvider;
use Filament\Tests\Fixtures\Providers\AdminPanelProvider;
use Filament\Widgets\WidgetsServiceProvider;
use Livewire\LivewireServiceProvider;
use Orchestra\Testbench\Concerns\CreatesApplication;
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A collection of full-stack components for accelerated Laravel development.",
"license": "MIT",
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-intl": "*",
"composer-runtime-api": "^2.1"
},
Expand All @@ -14,11 +14,11 @@
"filament/support": "*",
"larastan/larastan": "^2.2",
"laravel/pint": "^1.0",
"league/csv": "^9.14",
"league/csv": "^9.16",
"league/flysystem-aws-s3-v3": "^3.0",
"nunomaduro/termwind": "^1.0|^2.0",
"openspout/openspout": "^4.23",
"orchestra/testbench": "^8.20|^9.0",
"orchestra/testbench": "^9.0",
"pestphp/pest": "^2.0",
"pestphp/pest-plugin-laravel": "^2.0",
"phpstan/extension-installer": "^1.1",
Expand Down
Loading

0 comments on commit 40f31e8

Please sign in to comment.