Merge branch '3.x' into fix/module-route-helper

Author: zachgarwood

.github/workflows/main.yml

@@ -65,8 +65,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.3, 8.2, 8.1]
-        laravel: [10.*, 11.*]
+        php: [8.4, 8.3, 8.2, 8.1]
+        laravel: [10.*, 11.*, 12.*]
         dbal: [3.*, 4.*]
         exclude:
           - laravel: 10.*
@@ -75,11 +75,15 @@ jobs:
             php: 8.1
           - laravel: 11.*
             dbal: 3.*
+          - laravel: 12.*
+            php: 8.1
         include:
           - laravel: 10.*
             testbench: 8.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
 
     steps:
       - name: Set timezone?
@@ -108,7 +112,7 @@ jobs:
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -129,10 +133,6 @@ jobs:
         run: |
           npm ci
 
-      - name: Create blocks dir
-        run: |
-          mkdir ./frontend/js/components/blocks/customs
-
       - name: Build twill.
         run: ./vendor/bin/testbench twill:build --forTesting
         env:

.github/workflows/release.yml

@@ -0,0 +1,61 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version_bump_type:
+        description: 'Type of version bump (patch, minor, major)'
+        required: true
+        default: 'patch'
+
+jobs:
+  build-and-pr:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: 3.x
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build project
+        run: npm run build
+
+      - name: Copy build artifacts
+        run: |
+          mkdir -p twill-assets/assets
+          rm -rf twill-assets/assets/*
+          cp -r dist/assets/* twill-assets/assets/
+
+      - name: Bump version
+        id: bump_version
+        run: |
+          npm version ${{ github.event.inputs.version_bump_type }} --no-git-tag-version
+          echo "::set-output name=new_version::$(node -p "require('./package.json').version")"
+      
+      - name: Update version in PHP file
+        run: |
+          NEW_VERSION="${{ steps.bump_version.outputs.new_version }}"
+          sed -i "s/\(public const VERSION = '\)[^']*\(';\)/\1${NEW_VERSION}\2/" src/TwillServiceProvider.php
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: |
+            Update assets and bump version to ${{ steps.bump_version.outputs.new_version }}
+          title: |
+            Twill ${{ steps.bump_version.outputs.new_version }} release
+          body: |
+            This PR updates the build and bumps the version number to ${{ steps.bump_version.outputs.new_version }}.
+          branch: release-${{ steps.bump_version.outputs.new_version }}
+          base: 3.x

.php-cs-fixer.dist.php

@@ -110,9 +110,9 @@
     'phpdoc_types' => true,
     'phpdoc_var_without_name' => true,
     'short_scalar_cast' => true,
+    'nullable_type_declaration_for_default_null_value' => true,
     'simplified_null_return' => false, // disabled by Shift
     'single_blank_line_at_eof' => true,
-    'single_blank_line_before_namespace' => true,
     'single_class_element_per_statement' => true, // here
     'single_import_per_statement' => true,
     'single_line_after_imports' => true,

CHANGELOG.md

@@ -2,6 +2,54 @@
 
 All notable changes to `twill` will be documented in this file.
 
+## 3.5.2
+
+### Fixed
+
+- Fix cropper regression (likely a from a recent browser update) by [@13twelve](https://github.com/13twelve) in [#2744](https://github.com/area17/twill/pull/2744)
+
+
+## 3.5.1
+
+### Fixed
+
+- Fix file library uploader regression by [@joyceverheije](https://github.com/joyceverheije) in https://github.com/area17/twill/pull/2740
+- Fix `timeOnly` variant of the `Datepicker` field by [@MamlukiSn](https://github.com/MamlukiSn) in https://github.com/area17/twill/pull/2739 
+
+### Improved
+
+- Add a warning during the `twill:update` and `twill:build` commands for developers that have `twill.load_default_migrations` set to false by [@ifox](https://github.com/ifox) in [de274175](https://github.com/area17/twill/commit/de274175)
+
+## 3.5.0
+
+### Added
+
+- Add a `ModuleController::setPreviewView()` method by @zachgarwood in https://github.com/area17/twill/pull/2724
+- Add a `disableCrop()` method to `medias` fields by @ifox in https://github.com/area17/twill/pull/2686
+
+### Fixed
+
+- Fix position management in `medias` and `files` fields by @zeezo887 in https://github.com/area17/twill/pull/2694
+- Fix issues with touch actions by @13twelve in https://github.com/area17/twill/pull/2713
+- Fix issue with `Relation` column by @zachgarwood in https://github.com/area17/twill/pull/2720
+- Fix endpoints initialization for `Browser` component by @zeezo887 in https://github.com/area17/twill/pull/2722
+- Fix image cropper for erroneous EXIF orientation: Use JS to read image dimensions on upload by @13twelve in https://github.com/area17/twill/pull/2705
+- Fix square crops having mismatching width/height values by @13twelve in https://github.com/area17/twill/pull/2706
+- Fix `hideActiveCrop()` not working for medias form field when max is greater than 1 by @zeezo887 in https://github.com/area17/twill/pull/2686
+- Fix #2641: `InlineRepeater` updates by @13twelve in https://github.com/area17/twill/pull/2714
+- Fix Vue dropdown console warnings: update useCapture param for removeEventListener to match addEventListener by @zeezo887 in https://github.com/area17/twill/pull/2687
+- Fix #2657: adds missing Vue draggable deprecations by @13twelve in https://github.com/area17/twill/pull/2707
+
+### Docs
+
+- Added instructions to disable publish switch in create modal by @ordigital in https://github.com/area17/twill/pull/2698
+- Added instructions for `MultiSelect` field with dynamic values in form builder by @ordigital in https://github.com/area17/twill/pull/2699
+- Added instructions for free cropping with `null` or `0` ratio value by @LucaRed in https://github.com/area17/twill/pull/2715
+
+### Translations
+
+- Fix #2619: adds missing iso languages by @13twelve in https://github.com/area17/twill/pull/2708
+
 ## 3.4.1
 
 ### Improved
@@ -66,6 +114,12 @@ All notable changes to `twill` will be documented in this file.
 - Bump body-parser and express by [@dependabot](https://github.com/dependabot) in https://github.com/area17/twill/pull/2659
 - Bump cookie and express by [@dependabot](https://github.com/dependabot) in https://github.com/area17/twill/pull/2664
 
+## 3.3.2
+ 
+### Fixed
+ 
+- Backport fix from 3.5.1: `timeOnly` variant of the `Datepicker` field by [@MamlukiSn](https://github.com/MamlukiSn) in https://github.com/area17/twill/pull/2739
+
 ## 3.3.1
 
 ### Fixed

composer.json

@@ -26,13 +26,13 @@
     "php": "^8.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "astrotomic/laravel-translatable": "^v11.12",
-    "cartalyst/tags": "^12.0 || ^13.0 || ^14.0",
+    "astrotomic/laravel-translatable": "^v11.16",
+    "cartalyst/tags": "^12.0 || ^13.0 || ^14.0 || ^15.0",
     "doctrine/dbal": "^3.0 || ^4.0",
     "guzzlehttp/guzzle": "^7.0",
     "imgix/imgix-php": "^3.0",
     "kalnoy/nestedset": "^6.0",
-    "laravel/framework": "^9.0 || ^10.0 || ^11.0",
+    "laravel/framework": "^9.0 || ^10.0 || ^11.0 || ^12.0",
     "laravel/socialite": "^5.3",
     "laravel/ui": "^4.0",
     "league/flysystem-aws-s3-v3": "^3.0",
@@ -48,14 +48,14 @@
     "area17/phptorch": "dev-main",
     "chillerlan/php-qrcode": "~4.0",
     "friendsofphp/php-cs-fixer": "^3.0",
+    "larastan/larastan": "^2.9 | ^3.0",
     "nette/php-generator": "^4.0.3",
     "nunomaduro/collision": "^6.0 || ^7.0 || ^8.0",
-    "nunomaduro/larastan": "^2.0",
-    "orchestra/testbench": "^7.8 || ^8.0 || ^9.0",
-    "orchestra/testbench-dusk": "^7.8 || ^8.0 || ^9.0",
-    "phpunit/php-invoker": "^3.1 || ^4.0",
-    "phpunit/phpunit": "~9.0 || ~10.0",
-    "rector/rector": "^0.19.2 || ^1.0 ",
+    "orchestra/testbench": "^7.8 || ^8.0 || ^9.0 || ^10.0",
+    "orchestra/testbench-dusk": "^7.8 || ^8.0 || ^9.0 || ^10.0",
+    "phpunit/php-invoker": "^3.1 || ^4.0 || ^5.0",
+    "phpunit/phpunit": "~9.0 || ~10.0 || ~11.0",
+    "rector/rector": "^0.19.2 || ^1.0 || ^2.0",
     "spatie/invade": "^1.1",
     "squizlabs/php_codesniffer": "*"
   },

docs/content/1_docs/4_form-fields/06_multi-select.md

@@ -200,21 +200,38 @@ public function sectors() {
 - In your repository, make sure to sync the association when saving:
 
 ```php
-public function afterSave($object, $fields)
+public function afterSave($object, $fields): void
 {
     $object->sectors()->sync($fields['sectors'] ?? []);
 
     parent::afterSave($object, $fields);
 }
 ```
 
+:::tabs=currenttab.FormBuilder&items.FormBuilder|FormView:::
+:::tab=name.FormBuilder:::
+
+```php
+        $form->add(
+            MultiSelect::make()
+            ->name('sectors')
+            ->options(
+                Options::fromArray(app()->make(SectorsRepository::class)->listAll()->toArray())
+              )
+        );
+```
+
+:::#tab:::
+
+:::tab=name.FormView:::
+
 - In your controller, add to the formData the collection of options:
 
 ```php
 protected function formData($request)
 {
     return [
-        'sectors' => app()->make(SectorRepository::class)->listAll()
+        'sectors' => app()->make(SectorRepository::class)->listAll()->toArray()
     ];
 }
 ```
@@ -229,6 +246,9 @@ protected function formData($request)
 />
 ```
 
+:::#tab:::
+:::#tabs:::
+
 When used in a [block](../5_block-editor), no migration is needed.
 
 ## Multi Select Inline

docs/content/1_docs/4_form-fields/11_repeater.md

@@ -162,6 +162,43 @@ class ProjectController extends BaseModuleController
     }
 }
 ```
+### Medias
+
+If your json repeater contains media formField, you need to define the
+`mediasParams` at `config/twill.php` under `repeaters.crops` or `block_editor.crops`.
+
+```
+'repeaters' => [
+  'crops' => [
+     ‘your-media-field-name’ => [
+       …
+     ]
+  ],
+]
+```
+
+OR
+```
+'block_editor' => [
+  'crops' => [
+     ‘your-media-field-name’ => [
+       …
+     ]
+  ],
+]
+
+```
+
+| Option         | Description                                  | Type    | Default value    |
+|:---------------|:---------------------------------------------|:--------|:-----------------|
+| type           | Type of repeater items                       | string  |                  |
+| name           | Name of the field                            | string  | same as `type`   |
+| max            | Maximum amount that can be created           | number  | null (unlimited) |
+| buttonAsLink   | Displays the `Add` button as a centered link | boolean | false            |
+| disableCreate  | Disables ability to add new items            | boolean | false            |
+| disableActions | Removes row item actions                     | boolean | false            |
+| disableReorder | Disables reordering of repeater items        | boolean | false            |
+
 
 ## Blade repeater fields
 

docs/content/1_docs/5_block-editor/02_creating-a-block-editor.md

@@ -393,6 +393,8 @@ See also [Default Configuration](./11_default-configuration.md).
 
 If the `resource_path('assets/admin/icons')` directory contains a `my-custom-icon.svg` file, you can use this icon in your block by using its basename: `@twillBlockIcon('my-custom-icon')`.
 
+In order to make the icons appear in the CMS, you'll need to run `php artisan twill:build`
+
 ## Use Block traits in your Model and Repository
 
 Now, to handle the block data you must integrate it with your module. *Use* the *Blocks* traits in the Model and Repository associated with your module.

docs/content/1_docs/7_media-library/03_role-crop-params.md

@@ -6,7 +6,7 @@ A _role_ is a way to define different contexts in which an image might be placed
 
 _Crops_ are more self-explanatory. Twill comes with some pre-defined crop settings to allow you to set different variants of a given image, so crops can be used in combination with _roles,_ or they can be used on their own with a single role to define multiple cropping ratios on the same image.
 
-Using the Person example, your `cover` image could have a `square` crop for mobile screens, but could use a `16/9` crop on larger screens. Those values are editable at your convenience for each model, even if there are already some crops created in the CMS.
+Using the Person example, your `cover` image could have a `square` crop for mobile screens, but could use a `16/9` crop on larger screens. Those values are editable at your convenience for each model in the `ratio` option, even if there are already some crops created in the CMS. By specifying `null` or `0` as a `ratio`, no automatic crop will happen and you'll be able to crop freely.
 
 The only thing you have to do to make it work is to compose your model and repository with the appropriate traits, respectively `HasMedias` and `HandleMedias`, set up your `$mediasParams` configuration and use the `medias` form partial in your form view (more info in the CRUD section).
 

docs/content/2_guides/4_creating_custom_components_form_fields_and_blocks.md

@@ -409,7 +409,7 @@ npm install vue-numeric --save
 ### Blade view
 
 :::filename:::
-`resources/views/admin/partials/form/_custom_number.blade.php`
+`resources/views/twill/partials/form/_custom_number.blade.php`
 :::#filename:::
 
 ```blade