Merge branch '5.x' into feature/where-has-relationships

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -24,8 +24,7 @@ body:
     attributes:
       label: Environment
       description: |
-        Details about your environment. Versions of Statamic, PHP, Laravel, any addons that are installed, etc.
-        (Go ahead and just paste the output of the `php please support:details` command.)
+        Please paste the *full* output of the `php please support:details` command. It gives us some context about your project.
       render: yaml # the format of the command is close to yaml and gets highlighted nicely
     validations:
       required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,7 @@ Please take 30 seconds to read the following so we can be as efficient as possib
 
 2️⃣ Please make sure to create a new branch for your PR.
 
-3️⃣ Typically you should target the branch of the most current release, e.g. `4.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.
+3️⃣ Typically you should target the branch of the most current release, e.g. `5.x`, unless your PR includes a breaking change, in which case you should target the `master` branch for the next major release.
 
 4️⃣ We _really_ appreciate it if your PR includes tests. This makes it much easier for us to review, merge, and release. A PR with tests is usually reviewed and merged 5x-10x faster.
 

.github/workflows/tests.yml

@@ -115,7 +115,7 @@ jobs:
         uses: tj-actions/changed-files@v44
         with:
           files: |
-            **.{js,vue,ts}
+            **/*.{js,vue,ts}
             package.json
             .github/workflows/tests.yml
 

SECURITY.md

@@ -9,7 +9,7 @@ While working to identify potential security vulnerabilities in Statamic, we ask
 - Provide a quality report with precise explanations and concrete attack scenarios.
 
 ## Scope
-We are only interested in vulnerabilities that affect Statamic itself, tested against **your own local installation** of the software, running the latest version. You can install a local copy of Statamic by following these [installation instructions](https://statamic.dev/installing). Do not test against any Statamic installation that you don’t own, including [statamic.com](https:/statamic.com) or [statamic.dev](https://statamic.dev).
+We are only interested in vulnerabilities that affect Statamic itself, tested against **your own local installation** of the software, running the latest version. You can install a local copy of Statamic by following these [installation instructions](https://statamic.dev/installing). Do not test against any Statamic installation that you don’t own, including [statamic.com](https:/statamic.com), [statamic.dev](https://statamic.dev), and [demo.statamic.com](https://demo.statamic.com).
 
 ### Potentially Qualifying Vulnerabilities
 

composer.json

@@ -16,7 +16,7 @@
         "james-heinrich/getid3": "^1.9.21",
         "laravel/framework": "^10.40 || ^11.0",
         "laravel/prompts": "^0.1.16",
-        "league/commonmark": ">=2.2 <2.5",
+        "league/commonmark": "^2.2",
         "league/csv": "^9.0",
         "league/glide": "^2.3",
         "maennchen/zipstream-php": "^3.1",
@@ -31,7 +31,7 @@
         "symfony/lock": "^6.4",
         "symfony/var-exporter": "^6.0",
         "symfony/yaml": "^6.0 || ^7.0",
-        "ueberdosis/tiptap-php": "^1.1",
+        "ueberdosis/tiptap-php": "^1.4",
         "voku/portable-ascii": "^2.0",
         "wilderborn/partyline": "^1.0"
     },
@@ -42,7 +42,8 @@
         "laravel/pint": "1.16.0",
         "mockery/mockery": "^1.3.3",
         "orchestra/testbench": "^8.14 || ^9.0",
-        "phpunit/phpunit": "^10.0"
+        "phpunit/phpunit": "^10.0",
+        "spatie/laravel-ray": "^1.37"
     },
     "config": {
         "optimize-autoloader": true,

config/protect.php

@@ -44,6 +44,7 @@
         'password' => [
             'driver' => 'password',
             'allowed' => ['secret'],
+            'field' => null,
             'form_url' => null,
         ],
 

config/static_caching.php

@@ -102,6 +102,31 @@
 
     'ignore_query_strings' => false,
 
+    'allowed_query_strings' => [
+        //
+    ],
+
+    'disallowed_query_strings' => [
+        //
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Nocache
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define where the nocache data is stored.
+    |
+    | https://statamic.dev/tags/nocache#database
+    |
+    | Supported drivers: "cache", "database"
+    |
+    */
+
+    'nocache' => 'cache',
+
+    'nocache_js_position' => 'body',
+
     /*
     |--------------------------------------------------------------------------
     | Replacers

config/system.php

@@ -8,7 +8,7 @@
     |--------------------------------------------------------------------------
     |
     | The license key for the corresponding domain from your Statamic account.
-    | Without a key entered, your app will considered to be in Trial Mode.
+    | Without a key entered, your app will be considered to be in Trial Mode.
     |
     | https://statamic.dev/licensing#trial-mode
     |