Merge pull request #2 from mitydigital/feature/statamic-6

Support for Statamic 6

Author: martyf

composer.json

@@ -26,15 +26,15 @@
   },
   "require": {
     "php": "^8.2",
-    "statamic/cms": "^5.0",
+    "statamic/cms": "^6.0",
     "ext-intl": "*"
   },
   "require-dev": {
-    "pestphp/pest": "^2.9",
-    "orchestra/testbench": "^8.5",
-    "laravel/pint": "^1.10",
+    "orchestra/testbench": "^10.0",
+    "pestphp/pest": "^4.0",
+    "laravel/pint": "^1.16",
+    "pestphp/pest-plugin-laravel": "^4.0",
     "spatie/pest-plugin-test-time": "^2.0",
-    "pestphp/pest-plugin-laravel": "^2.1",
     "spatie/laravel-ray": "^1.33"
   },
   "scripts": {
@@ -50,5 +50,7 @@
       "pestphp/pest-plugin": true,
       "pixelfear/composer-dist-plugin": true
     }
-  }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }

package.json

@@ -5,11 +5,9 @@
     "build": "vite build"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue2": "^2.2.0",
-    "autoprefixer": "^10.4.14",
-    "laravel-vite-plugin": "^0.7.2",
-    "tailwindcss": "^3.3.3",
-    "vite": "^4.0.0"
+    "@statamic/cms": "file:./vendor/statamic/cms/resources/js/package",
+    "laravel-vite-plugin": "^1.2.0",
+    "vite": "^6.3.4"
   },
   "type": "module"
 }

resources/dist/build/assets/cp-d0b6376f.js

@@ -1,7 +1,8 @@
 {
   "resources/js/cp.js": {
-    "file": "assets/cp-d0b6376f.js",
-    "isEntry": true,
-    "src": "resources/js/cp.js"
+    "file": "assets/cp-j_PjJc2l.js",
+    "name": "cp",
+    "src": "resources/js/cp.js",
+    "isEntry": true
   }
 }

resources/dist/build/assets/cp-j_PjJc2l.js

@@ -6,8 +6,11 @@
 </template>
 
 <script>
+
+import {FieldtypeMixin} from '@statamic/cms';
+
 export default {
-    mixins: [Fieldtype],
+    mixins: [FieldtypeMixin],
 
     computed: {
         message() {

resources/dist/build/manifest.json

@@ -5,7 +5,10 @@
 </template>
 
 <script>
+
+import {IndexFieldtypeMixin} from '@statamic/cms';
+
 export default {
-    mixins: [IndexFieldtype],
+    mixins: [IndexFieldtypeMixin],
 }
 </script>

resources/js/fieldtypes/VariableNumber.vue

@@ -217,7 +217,7 @@ protected function configFieldItems(): array
 
                 'if' => [
                     'allow_custom' => 'equals true',
-                    //'layout' => '=== radio',
+                    // 'layout' => '=== radio',
                 ],
             ],
 

resources/js/fieldtypes/VariableNumberIndex.vue

@@ -217,7 +217,7 @@
     //
     // USE DEFAULT OPTIONS
     //
-    request()->setLaravelSession(session());
+    request()->setLaravelSession(app('session.store'));
     $this->withSession(['_old_input.'.$field->handle() => 5]);
 
     $extra = $field->fieldtype()->extraRenderableFieldData();
@@ -240,15 +240,15 @@
     });
     app()->instance('request', $request);
 
-    request()->setLaravelSession(session());
+    request()->setLaravelSession(app('session.store'));
     $this->withSession(['_old_input.'.$field->handle() => 3]);
 
     $extra = $field->fieldtype()->extraRenderableFieldData();
 
     expect($extra['init']['option'])->toBe(3.0);
 
     // attempt a custom value, but not have it configured to allow it
-    request()->setLaravelSession(session());
+    request()->setLaravelSession(app('session.store'));
     $this->withSession(['_old_input.'.$field->handle() => 5]);
 
     $extra = $field->fieldtype()->extraRenderableFieldData();
@@ -261,14 +261,13 @@
     $config['allow_custom'] = true;
     $field->setConfig($config);
 
-    request()->setLaravelSession(session());
+    request()->setLaravelSession(app('session.store'));
     $this->withSession(['_old_input.'.$field->handle() => 5]);
 
     $extra = $field->fieldtype()->extraRenderableFieldData();
 
     expect($extra['init']['option'])->toBeNull()
         ->and($extra['init']['custom'])->toBe(5);
-
 });
 
 it('correctly sets the placeholder', function () {
@@ -362,7 +361,7 @@
     $blueprint = Blueprint::find('collections/pages/article');
 
     // set the parent
-    $blueprint->setParent(new Entry());
+    $blueprint->setParent(new Entry);
 
     // get the variable number
     $field = $blueprint->field('variable_number');

src/Fieldtypes/VariableNumberFieldtype.php

@@ -6,7 +6,7 @@
 
 it('outputs a variable number partial with fields from the tag\'s context', function () {
     // create the tag
-    $tag = new VariableNumber();
+    $tag = new VariableNumber;
 
     // load fields from the form blueprint
     $blueprint = Blueprint::find('forms/has_variable_number');
@@ -22,7 +22,7 @@
 
 it('outputs a variable number partial with form from the tag\'s params', function () {
     // create the tag
-    $tag = new VariableNumber();
+    $tag = new VariableNumber;
 
     // load form
     $form = Form::find('has_variable_number');
@@ -40,7 +40,7 @@
 
 it('outputs nothing when the blueprint does not contain a variable number fieldtype', function () {
     // create the tag
-    $tag = new VariableNumber();
+    $tag = new VariableNumber;
 
     // load fields from the form blueprint
     $blueprint = Blueprint::find('forms/no_variable_number');