Skip to content

Commit

Permalink
Merge branch '4.x' into relationship-json
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Feb 3, 2025
2 parents 0fd1e83 + 2603152 commit f641d29
Show file tree
Hide file tree
Showing 2,957 changed files with 103,448 additions and 67,463 deletions.
1 change: 1 addition & 0 deletions .github/workflows/monorepo-split.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
- infolists
- notifications
- panels
- schemas
- spark-billing-provider
- spatie-laravel-google-fonts-plugin
- spatie-laravel-media-library-plugin
Expand Down
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/vendor.nosync
/.vscode
.DS_Store
.phpunit.cache
.phpunit.result.cache
composer.phar
Thumbs.db
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
8 changes: 1 addition & 7 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
# Security Policy

## Supported Versions

| Version | Supported |
|---------| ------------------ |
| 1.x | :white_check_mark: |
| 2.x | :white_check_mark: |
| 3.x | :white_check_mark: |
Please review the [Version Support Policy](https://filamentphp.com/docs/version-support-policy) on our website.

## Reporting a Vulnerability

Expand Down
49 changes: 44 additions & 5 deletions bin/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,14 @@ const defaultOptions = {
],
}

const corePackages = ['forms', 'notifications', 'panels', 'support', 'tables']
const corePackages = [
'forms',
'notifications',
'panels',
'schemas',
'support',
'tables',
]

corePackages.forEach((packageName) => {
compile({
Expand All @@ -87,15 +94,15 @@ corePackages.forEach((packageName) => {
compile({
...defaultOptions,
platform: 'browser',
entryPoints: [`./node_modules/async-alpine/dist/async-alpine.script.js`],
outfile: `./packages/support/dist/async-alpine.js`,
entryPoints: [`./packages/panels/resources/js/echo.js`],
outfile: `./packages/panels/dist/echo.js`,
})

compile({
...defaultOptions,
platform: 'browser',
entryPoints: [`./packages/panels/resources/js/echo.js`],
outfile: `./packages/panels/dist/echo.js`,
entryPoints: [`./packages/panels/resources/js/fonts/inter.js`],
outfile: `./packages/panels/dist/fonts/inter/index.js`,
})

const formComponents = [
Expand Down Expand Up @@ -126,6 +133,38 @@ compile({
outfile: `./packages/tables/dist/components/table.js`,
})

compile({
...defaultOptions,
entryPoints: [
`./packages/tables/resources/js/components/columns/checkbox.js`,
],
outfile: `./packages/tables/dist/components/columns/checkbox.js`,
})

compile({
...defaultOptions,
entryPoints: [
`./packages/tables/resources/js/components/columns/select.js`,
],
outfile: `./packages/tables/dist/components/columns/select.js`,
})

compile({
...defaultOptions,
entryPoints: [
`./packages/tables/resources/js/components/columns/text-input.js`,
],
outfile: `./packages/tables/dist/components/columns/text-input.js`,
})

compile({
...defaultOptions,
entryPoints: [
`./packages/tables/resources/js/components/columns/toggle.js`,
],
outfile: `./packages/tables/dist/components/columns/toggle.js`,
})

compile({
...defaultOptions,
entryPoints: [`./packages/widgets/resources/js/components/chart.js`],
Expand Down
4 changes: 3 additions & 1 deletion bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
use Filament\Forms\FormsServiceProvider;
use Filament\Infolists\InfolistsServiceProvider;
use Filament\Notifications\NotificationsServiceProvider;
use Filament\Schemas\SchemaServiceProvider;
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 All @@ -31,6 +32,7 @@
$app->register(FormsServiceProvider::class);
$app->register(InfolistsServiceProvider::class);
$app->register(NotificationsServiceProvider::class);
$app->register(SchemaServiceProvider::class);
$app->register(SpatieLaravelTranslatablePluginServiceProvider::class);
$app->register(SupportServiceProvider::class);
$app->register(TablesServiceProvider::class);
Expand Down
11 changes: 8 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,32 @@
"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"
},
"require-dev": {
"anourvalar/eloquent-serialize": "^1.2",
"chillerlan/php-qrcode": "^5.0",
"danharrin/livewire-rate-limiting": "^0.3|^1.0",
"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",
"phpstan/phpstan": "v1.11.1",
"pragmarx/google2fa": "^8.0",
"pragmarx/google2fa-qrcode": "^3.0",
"rector/rector": "^1.0",
"spatie/laravel-medialibrary": "^10.0|^11.0",
"spatie/laravel-ray": "^1.29",
"spatie/laravel-settings": "^2.2|^3.0",
"spatie/laravel-tags": "^4.2",
"staudenmeir/belongs-to-through": "^2.5",
"staudenmeir/eloquent-has-many-deep": "^1.7",
Expand All @@ -51,6 +55,7 @@
"Filament\\FontProviders\\": "packages/spatie-laravel-google-fonts-plugin/src",
"Filament\\Infolists\\": "packages/infolists/src",
"Filament\\Notifications\\": "packages/notifications/src",
"Filament\\Schemas\\": "packages/schemas/src",
"Filament\\Support\\": "packages/support/src",
"Filament\\Tables\\": "packages/tables/src",
"Filament\\Tests\\": "tests/src",
Expand Down
Loading

0 comments on commit f641d29

Please sign in to comment.