Skip to content
This repository was archived by the owner on Oct 20, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d052729
WIP
pascalbaljet Mar 9, 2024
eea53d9
Fix styling
pascalbaljet Mar 9, 2024
3f73301
Update composer.json
pascalbaljet Mar 9, 2024
6c2d3a7
Merge branch 'l11' of github.com:protonemedia/laravel-splade into l11
pascalbaljet Mar 9, 2024
5ea1f62
Update composer.json
pascalbaljet Mar 9, 2024
0ef2d21
Update composer.json
pascalbaljet Mar 9, 2024
7c55566
Removed `beyondcode/laravel-websockets`
pascalbaljet Mar 12, 2024
36b895d
Update composer.json
pascalbaljet Mar 12, 2024
2c65b05
Update composer.json
pascalbaljet Mar 12, 2024
9d9f190
Update composer.json
pascalbaljet Mar 9, 2024
eba2179
Update composer.json
pascalbaljet Mar 12, 2024
b9280b8
Merge branch 'l11' of github.com:protonemedia/laravel-splade into l11
pascalbaljet Mar 12, 2024
02e727e
👌
pascalbaljet Mar 12, 2024
a55c808
Update PersistentComponent.php
pascalbaljet Mar 12, 2024
4d4ac31
Update SpladeMiddleware.php
pascalbaljet Mar 12, 2024
5948fd7
Update composer.json
pascalbaljet Mar 12, 2024
254d732
Revert "Update SpladeMiddleware.php"
pascalbaljet Mar 12, 2024
0e58f0e
WIP
pascalbaljet Mar 12, 2024
a97db7f
Switch to reverb
pascalbaljet Mar 12, 2024
5927810
CI fixes
pascalbaljet Mar 12, 2024
82aa971
Bump
pascalbaljet Mar 12, 2024
f9a2eca
WIP
pascalbaljet Mar 12, 2024
89b5516
Reverb fixes
pascalbaljet Mar 17, 2024
5a1b48f
Update SpladeQueryBuilder.php
pascalbaljet Mar 17, 2024
fd66ad1
wip
pascalbaljet Mar 17, 2024
d70e0cd
WIP
pascalbaljet Mar 17, 2024
9e0897e
Update run-tests.yml
pascalbaljet Mar 17, 2024
4b8a223
Update InlineTest.php
pascalbaljet Mar 17, 2024
829f4be
Update SpladeCore.php
pascalbaljet Mar 17, 2024
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
Prev Previous commit
Next Next commit
Update composer.json
  • Loading branch information
pascalbaljet committed Mar 12, 2024
commit 9d9f190965ed412f20366375dee46875d72403c3
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ jobs:
cd app
./vendor/laravel/dusk/bin/chromedriver-linux &

- name: Start Laravel Websockets
run: |
cd app
php artisan websockets:serve &
# - name: Start Laravel Websockets
# run: |
# cd app
# php artisan websockets:serve &

- name: Start SSR server
run: |
Expand Down
10 changes: 4 additions & 6 deletions app/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,23 @@
"license": "MIT",
"require": {
"php": "^8.3|^8.2",
"beyondcode/laravel-websockets": "^1.13",
"guzzlehttp/guzzle": "^7.2",
"kirschbaum-development/eloquent-power-joins": "^3.0",
"laravel/sanctum": "^3.2",
"laravel/sanctum": "^3.2|^4.0",
"laravel/tinker": "^2.7",
"maatwebsite/excel": "^3.1",
"monolog/monolog": "^3.0",
"nesbot/carbon": "^2.63",
"psr/simple-cache": "^2.0",
"pusher/pusher-php-server": "^7.0,<7.2.0",
"ramsey/collection": "^1.2",
"spatie/laravel-medialibrary": "^10.7",
"spatie/laravel-medialibrary": "^10.7|^11.0",
"spatie/laravel-query-builder": "^5.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.7",
"fakerphp/faker": "^1.9.1",
"laravel/dusk": "^7.9.2",
"laravel/dusk": "^7.9.2|dev-master",
"laravel/sail": "^1.0.1",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
Expand All @@ -37,8 +36,7 @@
"spatie/fractalistic": "^2.9",
"spatie/laravel-ignition": "^1.0|^2.0",
"spatie/laravel-ray": "^1.31",
"spatie/phpunit-snapshot-assertions": "^5.0",
"thiagocordeiro/laravel-translator": "^1.2|^2.0"
"spatie/phpunit-snapshot-assertions": "^5.0"
},
"autoload": {
"psr-4": {
Expand Down
141 changes: 0 additions & 141 deletions app/config/websockets.php

This file was deleted.

This file was deleted.

7 changes: 7 additions & 0 deletions app/tests/Browser/EventTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ class EventTest extends DuskTestCase
{
use UsesWebsocketsServerTrait;

public function setUp(): void
{
parent::setUp();

$this->markTestSkipped('Temporarily skipped until Laravel Reverb has been released.');
}

/** @test */
public function it_can_redirect_on_an_event()
{
Expand Down