Merge branch '3.x' into fix-nested-repeaters

Author: ifox

.github/workflows/main.yml

@@ -108,7 +108,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 +129,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

CHANGELOG.md

@@ -2,6 +2,124 @@
 
 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
+
+- Allow media and file library disk configuration using an environement variable by [@antonioribeiro](https://github.com/antonioribeiro) in https://github.com/area17/twill/pull/2676
+
+### Fixed
+
+- Fix #2671: 3.4.0 regression on related browsers previews by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2672
+- Fix #2674: 3.4.0 regression on relation column using a one-to-one relationship by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2675
+
+## 3.4.0
+
+### Added
+
+- Add `searchQuery` method to controller for finer control over the search by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2614
+- Add `clearable` method to select form field by [@zeezo887](https://github.com/zeezo887) in https://github.com/area17/twill/pull/2581
+
+### Improved
+
+- Rethink the way the error handler works by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2612
+- Improve related save by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2599
+- Limits Access Key exposition to S3 storage by [@luislavena](https://github.com/luislavena) in https://github.com/area17/twill/pull/2611
+- Don't load relation for each column and allow dot notation in field name for index table by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2603
+- Filter - Select: expand to the longest option by [@mrdoinel](https://github.com/mrdoinel) in https://github.com/area17/twill/pull/2627
+- Preview: Update default width value for the mobile preview (to a more realistic value) by [@mrdoinel](https://github.com/mrdoinel) in https://github.com/area17/twill/pull/2624
+
+### Fixed
+
+- Fix trim function to get corresponding input by [@DCrepper](https://github.com/DCrepper) in https://github.com/area17/twill/pull/2609
+- Fix published scope by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2606
+- Fix sync of medias and files with multiple fields by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2628
+- Fix positioning of the close button in media library tags by [@mrdoinel](https://github.com/mrdoinel) in https://github.com/area17/twill/pull/2626
+- Fix search functionality for buckets by [@zeezo887](https://github.com/zeezo887) in https://github.com/area17/twill/pull/2661
+- Fix #2650: Added parentheses to fix the order of evaluation between t… by [@HarryThe3rd](https://github.com/HarryThe3rd) in https://github.com/area17/twill/pull/2651
+- Fix deleted users causes error 500 by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2643
+- Fix wrong crops for Blocks in `twill:refresh-crops` by [@ptrckvzn](https://github.com/ptrckvzn) in https://github.com/area17/twill/pull/2642
+- Fix server error in the dashboard when a nested module has a deleted parent by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2633
+- Fix slugs are not created when saving models outside of Twill or when duplicating by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2618
+- Fix repeaters are registered without a populated item by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2605
+- Fix block previews don't update when browser items are added or changed by [@zeezo887](https://github.com/zeezo887) in https://github.com/area17/twill/pull/2535
+- Fix weird behaviour of slugs table active column by [@zeezo887](https://github.com/zeezo887) in https://github.com/area17/twill/pull/2531
+- Fix blocks take crop settings from parent model if name is the same by [@zeezo887](https://github.com/zeezo887) in https://github.com/area17/twill/pull/2542
+- Use strict check for is null, as it otherwise causes empty arrays to not have any field by [@Tofandel](https://github.com/Tofandel) in https://github.com/area17/twill/pull/2604
+- Rename moduleName variable in permissionModules loop by [@zeezo887](https://github.com/zeezo887) in https://github.com/area17/twill/pull/2635
+- Ensure catch-all routes do not take precedence by [@ifox](https://github.com/ifox) in https://github.com/area17/twill/pull/2669
+
+### Docs
+
+- Update one-to-many docs to use correct Artisan command by [@daisonth](https://github.com/daisonth) in https://github.com/area17/twill/pull/2615
+- Fix basic page builder guide block file reference by [@amiraezz](https://github.com/amiraezz) in https://github.com/area17/twill/pull/2630
+
+### Translations
+
+- Update both Portuguese from Brazil and Portugal by [@antonioribeiro](https://github.com/antonioribeiro) in https://github.com/area17/twill/pull/2602
+- Improved i18n: added missing translation key (#2616) and improved German translations by [@C2H6-383](https://github.com/C2H6-383) in https://github.com/area17/twill/pull/2634
+
+### Chores
+
+- Upgrade GitHub Actions artefact upload to v4 by [@ifox](https://github.com/ifox)
+- Bump webpack from 5.91.0 to 5.95.0 by [@dependabot](https://github.com/dependabot) in https://github.com/area17/twill/pull/2665
+- 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

@@ -48,9 +48,9 @@
     "area17/phptorch": "dev-main",
     "chillerlan/php-qrcode": "~4.0",
     "friendsofphp/php-cs-fixer": "^3.0",
+    "larastan/larastan": "^2.9",
     "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",

config/file_library.php

@@ -18,7 +18,7 @@
     | - 'A17\Twill\Services\FileLibrary\Disk'
     |
      */
-    'disk' => 'twill_file_library',
+    'disk' => env('FILE_LIBRARY_DISK', 'twill_file_library'),
     'endpoint_type' => env('FILE_LIBRARY_ENDPOINT_TYPE', 'local'),
     'cascade_delete' => env('FILE_LIBRARY_CASCADE_DELETE', false),
     'local_path' => env('FILE_LIBRARY_LOCAL_PATH', 'uploads'),

config/media_library.php

@@ -20,7 +20,7 @@
     | - 'A17\Twill\Services\MediaLibrary\Local'
     |
      */
-    'disk' => 'twill_media_library',
+    'disk' => env('MEDIA_LIBRARY_DISK', 'twill_media_library'),
     'endpoint_type' => env('MEDIA_LIBRARY_ENDPOINT_TYPE', 'local'),
     'cascade_delete' => env('MEDIA_LIBRARY_CASCADE_DELETE', false),
     'local_path' => env('MEDIA_LIBRARY_LOCAL_PATH', 'uploads'),

docs/content/1_docs/2_getting-started/1_index.md

@@ -2,17 +2,18 @@
 
 ## Environment requirements
 
-Twill `3.x` is compatible with Laravel versions above `9.x`, running on PHP `8.0` and above. As a dependency to your
+Twill `3.x` is compatible with Laravel versions `9.x`. `10.x` and `11.x` running on PHP `8.0` and above. As a dependency to your
 own application, Twill shares Laravel's
 [server requirements](https://laravel.com/docs/10.x/deployment#server-requirements).
 
 ## Development
 
 For development, those requirements are satisfied by the following first-party solutions:
 
+- [Herd](https://herd.laravel.com) (macOS and Windows)
+- [Valet](https://laravel.com/docs/10.x/valet) (macOS)
 - [Sail](https://laravel.com/docs/10.x/sail) (All platforms)
 - [Homestead](https://laravel.com/docs/10.x/homestead) (All platforms)
-- [Valet](https://laravel.com/docs/10.x/valet) (macOS)
 
 ## Production
 
@@ -42,9 +43,9 @@ developed and tested against MySQL (`>=5.7`) and PostgreSQL(`>=9.3`) databases.
 
 |            | Supported versions | Recommended version |
 |:-----------|:------------------:|:-------------------:|
-| PHP        |       >= 8.0       |         8.2         |
-| Laravel    |       >= 9.0       |        10.x         |
-| Node.js    |       >= 16        |        18.x         |
+| PHP        |       >= 8.0       |         8.3         |
+| Laravel    |       >= 9.0       |        11.x         |
+| Node.js    |       >= 16        |        20.x         |
 | MySQL      |       >= 5.7       |         8.x         |
 | PostgreSQL |       >= 9.3       |        15.x         |
 

docs/content/1_docs/2_getting-started/2_installation.md

@@ -21,7 +21,7 @@ The starter kit setup is a basic page builder. It comes with:
 You can install it in a Laravel application using:
 
 ```bash
-composer require area17/twill:"^3.2"
+composer require area17/twill:"^3.4"
 ```
 
 :::alert=type.warning::: 
@@ -40,7 +40,7 @@ See [`examples/basic-page-builder`](https://github.com/area17/twill/tree/3.x/exa
 Twill package can be added to your application using Composer:
 
 ```bash
-composer require area17/twill:"^3.2"
+composer require area17/twill:"^3.4"
 ```
 
 :::alert=type.warning::: 

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

@@ -163,6 +163,17 @@ class ProjectController extends BaseModuleController
 }
 ```
 
+| 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
 
 The following example demonstrates how to define a relationship between `Team` and `TeamMember` modules to implement