Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: laravel/jetstream
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.3.3
Choose a base ref
...
head repository: laravel/jetstream
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.3.4
Choose a head ref
  • 4 commits
  • 5 files changed
  • 5 contributors

Commits on Apr 21, 2021

  1. Update NPM dependencies (#767)

    @tailwindcss/forms: ^0.2.1 -> ^0.3.1
    @tailwindcss/typography: ^0.3.0 -> ^0.4.0
    postcss-import: ^12.0.1 -> ^14.0.1
    sotten authored Apr 21, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dfb27dc View commit details

Commits on Apr 23, 2021

  1. [2.x] Get model of PersonalAccessToken before deleting it to make sur…

    …e the deleting/deleted events are triggered (#771)
    
    * Get model of PersonalAccessToken before deleting it to make sure the deleting/deleted events are triggered
    
    * Add change to livewire as well
    
    Co-authored-by: Dominik Kukacka <[email protected]>
    dominikkukacka and Dominik Kukacka authored Apr 23, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    37a0e52 View commit details

Commits on Apr 26, 2021

  1. Fix css selector query (#772)

    `input:not([type=\'hidden\'])` Was missing the closing `)`. This causes the rest of the query to fail.
    EzraBerendsen authored Apr 26, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    82c984b View commit details

Commits on Apr 27, 2021

  1. Update CHANGELOG.md

    driesvints committed Apr 27, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    driesvints Dries Vints
    Copy the full SHA
    b6c585e View commit details
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Release Notes

## [Unreleased](https://github.com/laravel/jetstream/compare/v2.3.3...2.x)
## [Unreleased](https://github.com/laravel/jetstream/compare/v2.3.4...2.x)


## [v2.3.4 (2021-04-27)](https://github.com/laravel/jetstream/compare/v2.3.3...v2.3.4)

### Changed
- Update NPM dependencies ([#767](https://github.com/laravel/jetstream/pull/767))

### Fixed
- Get model of PersonalAccessToken before deleting it ([#771](https://github.com/laravel/jetstream/pull/771))
- Fix selector query ([#772](https://github.com/laravel/jetstream/pull/772))


## [v2.3.3 (2021-04-20)](https://github.com/laravel/jetstream/compare/v2.3.2...v2.3.3)
2 changes: 1 addition & 1 deletion resources/views/components/modal.blade.php
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
show: @entangle($attributes->wire('model')).defer,
focusables() {
// All focusable element types...
let selector = 'a, button, input:not([type=\'hidden\'], textarea, select, details, [tabindex]:not([tabindex=\'-1\'])'
let selector = 'a, button, input:not([type=\'hidden\']), textarea, select, details, [tabindex]:not([tabindex=\'-1\'])'
return [...$el.querySelectorAll(selector)]
// All non-disabled elements...
6 changes: 3 additions & 3 deletions src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
@@ -121,10 +121,10 @@ protected function installLivewireStack()
// NPM Packages...
$this->updateNodePackages(function ($packages) {
return [
'@tailwindcss/forms' => '^0.2.1',
'@tailwindcss/typography' => '^0.3.0',
'@tailwindcss/forms' => '^0.3.1',
'@tailwindcss/typography' => '^0.4.0',
'alpinejs' => '^2.7.3',
'postcss-import' => '^12.0.1',
'postcss-import' => '^14.0.1',
'tailwindcss' => '^2.0.1',
] + $packages;
});
2 changes: 1 addition & 1 deletion src/Http/Controllers/Inertia/ApiTokenController.php
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ public function update(Request $request, $tokenId)
*/
public function destroy(Request $request, $tokenId)
{
$request->user()->tokens()->where('id', $tokenId)->delete();
$request->user()->tokens()->where('id', $tokenId)->first()->delete();

return back(303);
}
2 changes: 1 addition & 1 deletion src/Http/Livewire/ApiTokenManager.php
Original file line number Diff line number Diff line change
@@ -172,7 +172,7 @@ public function confirmApiTokenDeletion($tokenId)
*/
public function deleteApiToken()
{
$this->user->tokens()->where('id', $this->apiTokenIdBeingDeleted)->delete();
$this->user->tokens()->where('id', $this->apiTokenIdBeingDeleted)->first()->delete();

$this->user->load('tokens');