Inertia.js v2.0 compatibility

.github/workflows/facade.yml

@@ -3,7 +3,7 @@ name: facades
 on:
   push:
     branches:
-      - 'master'
+      - "master"
 
 jobs:
   update:
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/tests.yml

@@ -12,49 +12,19 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.3, 7.4, "8.0", 8.1, 8.2, 8.3]
-        laravel: [8, 9, 10, 11]
+        php: [8.1, 8.2, 8.3, 8.4]
+        laravel: [10, 11]
         stability: ["prefer-lowest", "prefer-stable"]
         exclude:
-          - php: 7.3
-            laravel: 9
-          - php: 7.3
+          - php: 8.4
             laravel: 10
-          - php: 7.3
-            laravel: 11
-          - php: 7.4
-            laravel: 9
-          - php: 7.4
-            laravel: 10
-          - php: 7.4
-            laravel: 11
-          - php: '8.0'
-            laravel: 10
-          - php: '8.0'
-            laravel: 11
-          - php: 8.1
-            laravel: 6
-          - php: 8.1
-            laravel: 7
           - php: 8.1
             laravel: 11
-          - php: 8.2
-            laravel: 6
-          - php: 8.2
-            laravel: 7
-          - php: 8.2
-            laravel: 8
-          - php: 8.3
-            laravel: 6
-          - php: 8.3
-            laravel: 7
-          - php: 8.3
-            laravel: 8
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} (w/ ${{ matrix.stability }})
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -66,7 +36,7 @@ jobs:
           coverage: none
 
       - name: Set Minimum PHP 8.1 Versions
-        uses: nick-invision/retry@v1
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
@@ -76,7 +46,7 @@ jobs:
         if: matrix.php >= 8.1 && matrix.stability == 'prefer-lowest'
 
       - name: Set Minimum PHP 8.2 Versions
-        uses: nick-invision/retry@v1
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
@@ -85,23 +55,24 @@ jobs:
         if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest'
 
       - name: Set Minimum PHP 8.2 Versions and Laravel > 11
-        uses: nick-invision/retry@v1
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: |
+            composer require orchestra/testbench:^9.2 --dev --${{ matrix.stability }} --no-update --no-interaction
             composer require phpunit/phpunit:^10.4 --dev --${{ matrix.stability }} --no-update --no-interaction
         if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel >= 11
 
       - name: Set Laravel version
-        uses: nick-invision/retry@v1
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer require "laravel/framework=^${{ matrix.laravel }}" --no-interaction --no-update
 
       - name: Install dependencies
-        uses: nick-invision/retry@v1
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5

CHANGELOG.md

@@ -1,19 +1,29 @@
 # Release Notes
 
-## [Unreleased](https://github.com/inertiajs/inertia-laravel/compare/v1.2.0...1.x)
+## [Unreleased](https://github.com/inertiajs/inertia-laravel/compare/v2.0.0...2.x)
 
-- Add "always" props using new `Inertia::always()` wrapper ([#627](https://github.com/inertiajs/inertia-laravel/pull/627))
+- Nothing!
+
+## [v2.0.0](https://github.com/inertiajs/inertia-laravel/compare/v1.2.0...2.0.0)
+
+- Add support for Inertia.js v2.0.0
+- Add `Inertia::defer()` to support deferred props
+- Add `Inertia::merge()` to support merging props on client
+- Add `Inertia::always()` for props that should always be included ([#627](https://github.com/inertiajs/inertia-laravel/pull/627))
+- Add `Inertia::clearHistory()` and `Inertia::encryptHistory()` methods, encryption config, and encryption middleware
+- Deprecated `Inertia::lazy()` in favor of `Inertia::optional()`
+- Drop support for Laravel 8 and 9 ([#629](https://github.com/inertiajs/inertia-laravel/pull/629))
 
 ## [v1.2.0](https://github.com/inertiajs/inertia-laravel/compare/v1.1.0...v1.2.0) - 2024-05-17
 
-* [1.x] Make commands lazy by [@timacdonald](https://github.com/timacdonald) in https://github.com/inertiajs/inertia-laravel/pull/601
-* [1.x] Persistent properties by [@lepikhinb](https://github.com/lepikhinb) in https://github.com/inertiajs/inertia-laravel/pull/621
-* [1.x] Exclude properties from partial responses by [@lepikhinb](https://github.com/lepikhinb) in https://github.com/inertiajs/inertia-laravel/pull/622
+- Make commands lazy ([#601](https://github.com/inertiajs/inertia-laravel/pull/601))
+- Add persistent properties ([#621](https://github.com/inertiajs/inertia-laravel/pull/621))
+- Exclude `except` props from partial reloads ([#622](https://github.com/inertiajs/inertia-laravel/pull/622))
 
 ## [v1.1.0](https://github.com/inertiajs/inertia-laravel/compare/v1.0.0...v1.1.0) - 2024-05-16
 
-* Support dot notation in partial requests by [@lepikhinb](https://github.com/lepikhinb) in https://github.com/inertiajs/inertia-laravel/pull/620
-* [1.x] Add `$request->inertia()` IDE helper by [@ycs77](https://github.com/ycs77) in https://github.com/inertiajs/inertia-laravel/pull/625
+- Support dot notation in partial requests ([#620](https://github.com/inertiajs/inertia-laravel/pull/620))
+- Add `$request->inertia()` IDE helper ([#625](https://github.com/inertiajs/inertia-laravel/pull/625))
 
 ## [v1.0.0](https://github.com/inertiajs/inertia-laravel/compare/v0.6.11...v1.0.0) - 2024-03-08
 

composer.json

@@ -2,7 +2,10 @@
     "name": "inertiajs/inertia-laravel",
     "type": "library",
     "description": "The Laravel adapter for Inertia.js.",
-    "keywords": ["laravel", "inertia"],
+    "keywords": [
+        "laravel",
+        "inertia"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -25,16 +28,17 @@
         }
     },
     "require": {
-        "php": "^7.3|~8.0.0|~8.1.0|~8.2.0|~8.3.0",
+        "php": "^8.1.0",
         "ext-json": "*",
-        "laravel/framework": "^8.74|^9.0|^10.0|^11.0",
-        "symfony/console": "^5.3|^6.0|^7.0"
+        "laravel/framework": "^10.0|^11.0",
+        "symfony/console": "^6.2|^7.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "orchestra/testbench": "^6.4|^7.0|^8.0|^9.0",
+        "orchestra/testbench": "^8.0|^9.2",
         "mockery/mockery": "^1.3.3",
-        "phpunit/phpunit": "^8.0|^9.5.8|^10.4"
+        "phpunit/phpunit": "^10.4|^11.0",
+        "laravel/pint": "^1.16"
     },
     "suggest": {
         "ext-pcntl": "Recommended when running the Inertia SSR server via the `inertia:start-ssr` artisan command."
@@ -44,9 +48,6 @@
             "providers": [
                 "Inertia\\ServiceProvider"
             ]
-        },
-        "branch-alias": {
-            "dev-master": "1.x-dev"
         }
     },
     "minimum-stability": "dev",

config/inertia.php

@@ -64,4 +64,10 @@
 
     ],
 
+    'history' => [
+
+        'encrypt' => false,
+
+    ],
+
 ];

src/AlwaysProp.php

@@ -10,7 +10,7 @@ class AlwaysProp
     protected $value;
 
     /**
-     * @param mixed $value
+     * @param  mixed  $value
      */
     public function __construct($value)
     {

src/Commands/CreateMiddleware.php

@@ -41,7 +41,7 @@ protected function getStub(): string
     /**
      * Get the default namespace for the class.
      *
-     * @param string $rootNamespace
+     * @param  string  $rootNamespace
      */
     protected function getDefaultNamespace($rootNamespace): string
     {

src/Commands/StartSsr.php

@@ -2,9 +2,9 @@
 
 namespace Inertia\Commands;
 
-use Inertia\Ssr\SsrException;
 use Illuminate\Console\Command;
 use Inertia\Ssr\BundleDetector;
+use Inertia\Ssr\SsrException;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Process\Process;
 
@@ -36,7 +36,7 @@ public function handle(): int
             return self::FAILURE;
         }
 
-        $bundle = (new BundleDetector())->detect();
+        $bundle = (new BundleDetector)->detect();
         $configuredBundle = config('inertia.ssr.bundle');
 
         if ($bundle === null) {

src/DeferProp.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Inertia;
+
+use Illuminate\Support\Facades\App;
+
+class DeferProp implements IgnoreFirstLoad, Mergeable
+{
+    use MergesProps;
+
+    protected $callback;
+
+    protected $group;
+
+    public function __construct(callable $callback, ?string $group = null)
+    {
+        $this->callback = $callback;
+        $this->group = $group;
+    }
+
+    public function group()
+    {
+        return $this->group;
+    }
+
+    public function __invoke()
+    {
+        return App::call($this->callback);
+    }
+}

src/Directive.php

@@ -7,7 +7,7 @@ class Directive
     /**
      * Compiles the "@inertia" directive.
      *
-     * @param string $expression
+     * @param  string  $expression
      */
     public static function compile($expression = ''): string
     {
@@ -32,7 +32,7 @@ public static function compile($expression = ''): string
     /**
      * Compiles the "@inertiaHead" directive.
      *
-     * @param string $expression
+     * @param  string  $expression
      */
     public static function compileHead($expression = ''): string
     {

src/EncryptHistoryMiddleware.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Inertia;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class EncryptHistoryMiddleware
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @return Response
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        Inertia::encryptHistory();
+
+        return $next($request);
+    }
+}

src/IgnoreFirstLoad.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Inertia;
+
+interface IgnoreFirstLoad
+{
+    //
+}

src/Inertia.php

@@ -8,11 +8,16 @@
  * @method static void setRootView(string $name)
  * @method static void share(string|array|\Illuminate\Contracts\Support\Arrayable $key, mixed $value = null)
  * @method static mixed getShared(string|null $key = null, mixed $default = null)
+ * @method static void clearHistory()
+ * @method static void encryptHistory($encrypt = true)
  * @method static void flushShared()
  * @method static void version(\Closure|string|null $version)
  * @method static string getVersion()
+ * @method static \Inertia\OptionalProp optional(callable $callback)
  * @method static \Inertia\LazyProp lazy(callable $callback)
+ * @method static \Inertia\DeferProp defer(callable $callback, string $group = 'default')
  * @method static \Inertia\AlwaysProp always(mixed $value)
+ * @method static \Inertia\MergeProp merge(mixed $value)
  * @method static \Inertia\Response render(string $component, array|\Illuminate\Contracts\Support\Arrayable $props = [])
  * @method static \Symfony\Component\HttpFoundation\Response location(string|\Symfony\Component\HttpFoundation\RedirectResponse $url)
  * @method static void macro(string $name, object|callable $macro)

src/LazyProp.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Facades\App;
 
-class LazyProp
+class LazyProp implements IgnoreFirstLoad
 {
     protected $callback;