Skip to content

Commit

Permalink
Merge branch 'Power-Components:6.x' into 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Geovanek authored Sep 18, 2024
2 parents 18cef4c + 73292a2 commit 8e74884
Show file tree
Hide file tree
Showing 64 changed files with 764 additions and 1,062 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
name: Cypress

on:
workflow_dispatch:
push:
branches:
- "**"
paths-ignore:
- "art/**"
- "README.md"
pull_request:
types: [ready_for_review, synchronize, opened]
paths-ignore:
- "art/**"
- "README.md"

jobs:
build:
Expand Down Expand Up @@ -31,10 +41,8 @@ jobs:
fail-fast: false
matrix:
php: [ 8.2 ]
laravel: [ 10.* ]
dependency-version: [ prefer-stable ]

name: PHP:${{ matrix.php }} / L:${{ matrix.laravel }}
name: PHP:${{ matrix.php }}

if: github.ref != 'refs/heads/todo-tests'

Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
],
"require": {
"php": "^8.2",
"livewire/livewire": "^3.5.4",
"laravel/prompts": "^0.1.24"
"livewire/livewire": "^3.5.6",
"laravel/prompts": "^0.1.25"
},
"require-dev": {
"composer/composer": "^2.7.7",
"composer/composer": "^2.7.9",
"laravel/pint": "1.17",
"laradumps/laradumps-core": "^2.1.1",
"laradumps/laradumps-core": "^2.2.1",
"larastan/larastan": "^2.9.8",
"pestphp/pest": "^2.35.0",
"orchestra/testbench": "^9.2",
"laradumps/laradumps": "^3.1",
"laravel/scout": "^10.11.1",
"pestphp/pest": "^2.35",
"orchestra/testbench": "^9.4",
"laradumps/laradumps": "^3.2",
"laravel/scout": "^10.11.2",
"openspout/openspout": "^4.24.5"
},
"suggest": {
Expand Down
6 changes: 2 additions & 4 deletions dist/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"/powergrid.js": "/powergrid.js?id=4dca90656b0681f252821ac585281e87",
"/powergrid.js": "/powergrid.js?id=85ea731ef43f4f2726f191a79396ab7b",
"/bootstrap5.css": "/bootstrap5.css?id=a27af22343149104b2aa3283d8fd502b",
"/tailwind.css": "/tailwind.css?id=924477e2afcb2cb56aa392e266ee56ca",
"/tom-select.css": "/tom-select.css?id=7feeb634924554f9e57ce1e09edcabcb",
"/powergrid.css": "/powergrid.css?id=c2648f9d0d2b90371db3b914ef05450e"
"/tailwind.css": "/tailwind.css?id=924477e2afcb2cb56aa392e266ee56ca"
}
1 change: 0 additions & 1 deletion dist/powergrid.css

This file was deleted.

2 changes: 1 addition & 1 deletion dist/powergrid.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/tom-select.css

This file was deleted.

2 changes: 1 addition & 1 deletion resources/config/livewire-powergrid.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
'theme' => \PowerComponents\LivewirePowerGrid\Themes\Tailwind::class,
//'theme' => \PowerComponents\LivewirePowerGrid\Themes\Bootstrap5::class,

'cache_ttl' => 3600,
'cache_ttl' => null,

'icon_resources' => [
'paths' => [
Expand Down
Loading

0 comments on commit 8e74884

Please sign in to comment.