Merge branch 'area17:3.x' into 3.x

Author: gvidobluefox

Diff for: .browserslistrc

@@ -1,3 +1 @@
-> 1%
-last 2 versions
-not IE 11
+defaults

Diff for: .eslintrc.js

@@ -5,10 +5,13 @@ module.exports = {
   },
   extends: ['plugin:vue/essential', '@vue/standard', 'prettier'],
   rules: {
+    'no-unmodified-loop-condition': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
+    'no-unused-vars': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
+    'no-unreachable': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
     // indent
     indent: ['error', 2, { SwitchCase: 1 }],
     'vue/script-indent': [
-      'error',
+      process.env.NODE_ENV === 'production' ? 'error' : 'warn',
       2,
       {
         baseIndent: 1,
@@ -27,15 +30,15 @@ module.exports = {
     'no-console':
       process.env.NODE_ENV === 'production'
         ? ['error', { allow: ['error'] }]
-        : 'off'
+        : 'warn'
   },
   overrides: [
     {
       files: ['*.vue'],
       rules: {
         indent: 'off',
         'vue/script-indent': [
-          'error',
+          process.env.NODE_ENV === 'production' ? 'error' : 'warn',
           2,
           {
             baseIndent: 1,
@@ -46,6 +49,6 @@ module.exports = {
     }
   ],
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   }
 }

Diff for: .gitattributes

@@ -0,0 +1,9 @@
+/tests                          export-ignore
+/phpunit.xml                    export-ignore
+/.github                        export-ignore
+/phpstan.neon                   export-ignore
+/phpstan-baseline.neon          export-ignore
+/phpcs.xml                      export-ignore
+/docs                           export-ignore
+/docs-api                       export-ignore
+/examples/tests-*               export-ignore

Diff for: .github/ISSUE_TEMPLATE/config.yml

@@ -4,8 +4,8 @@ contact_links:
     url: https://github.com/area17/twill/discussions
     about: Ask questions and discuss with other community members
   - name: Read the docs
-    url: https://twill.io/docs/
+    url: https://twillcms.com/docs/
     about: Check out the Twill documentation for answers to common questions
   - name: Chat with the community
-    url: https://discord.link/twill
+    url: https://discord.gg/cnWk7EFv8R
     about: Ask questions, get help and discuss new things you're building with the Twill community

Diff for: .github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,6 @@
 <!--
   Thanks for opening a PR! Your contribution is much appreciated.
-  Do you have any questions? Check out the contributing docs at https://github.com/area17/twill/blob/2.x/CONTRIBUTING.md, 
-  or ask in this Pull Request and a Twill maintainer will be happy to help :)
+  Do you have any questions? Check out the contributing docs at https://github.com/area17/twill/blob/3.x/CONTRIBUTING.md, or ask in this Pull Request and a Twill maintainer will be happy to help :)
 -->
 
 ## Description

Diff for: .github/clover.xml

@@ -13,47 +13,89 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Checking for prtodo's.
+        run: |
+          if grep --exclude-dir={.git,.github,vendor} -rE "PRtodo"; then
+               exit 1
+          else
+              echo "All good"
+          fi
+
+      - name: Checking for leftover "ray" usages.
+        run: |
+          if grep --exclude-dir={.git,.github,vendor} -rE "ray("; then
+               exit 1
+          else
+              echo "All good"
+          fi
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: none
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:8.*" "doctrine/dbal:^3.0" --no-interaction --no-update
-          composer update --prefer-stable --prefer-dist --no-interaction
+          composer require "laravel/framework:11.*" --no-interaction --no-update
+          composer install
 
       - name: Execute tests
         run: vendor/bin/phpstan
 
+      - name: Check code style
+        run: vendor/bin/phpcs
+
   test:
+    name: PHP ${{ matrix.php }} - LARAVEL ${{ matrix.laravel }} - DBAL ${{ matrix.dbal }}
+    timeout-minutes: 30
     runs-on: ${{ matrix.os }}
+    services:
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: false
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: twill_testing_3x
+        ports:
+          - 3306/tcp
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        php: [8.1, 8.0]
-        laravel: [9.*, 8.*]
-        dbal: [^2.12, ^3.0]
+        php: [8.3, 8.2, 8.1]
+        laravel: [10.*, 11.*]
+        dbal: [3.*, 4.*]
+        exclude:
+          - laravel: 10.*
+            dbal: 4.*
+          - laravel: 11.*
+            php: 8.1
+          - laravel: 11.*
+            dbal: 3.*
         include:
-          - laravel: 9.*
-            testbench: 7.*
-          - laravel: 8.*
-            testbench: 6.*
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }}
+          - laravel: 10.*
+            testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
 
     steps:
+      - name: Set timezone?
+        uses: szenius/[email protected]
+        with:
+          timezoneLinux: "Europe/Paris"
+
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-          coverage: none
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, mysql
+          coverage: xdebug
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -69,14 +111,66 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-composer-
+            ${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update -vvv
-          composer install --prefer-dist --no-interaction -vvv
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
+          composer install --prefer-dist --no-interaction --no-plugins
 
-      - name: Execute tests
-        run: vendor/bin/phpunit
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '20.x'
+
+      - name: Build npm dependencies.
+        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:
+          CACHE_STORE: array
+
+      - name: Upgrade Chrome
+        uses: browser-actions/setup-chrome@latest
+
+      - name: Upgrade Chrome Driver
+        run: ./vendor/bin/testbench dusk:chrome-driver --detect
+
+      - name: Prepare Testbench Dusk
+        run: ./vendor/bin/testbench-dusk package:discover
+
+      - name: Execute all tests
+        run: vendor/bin/phpunit --stop-on-error
+        env:
+          DB_PORT: ${{ job.services.mysql.ports['3306'] }}
+
+      - uses: codecov/codecov-action@v2
+        with:
+          files: .github/clover.xml
+
+      - name: Replace asterisks in Laravel
+        run: echo "REPLACED_LARAVEL=${MATRIX_LARAVEL//\*/_}" >> $GITHUB_ENV
+        env:
+          MATRIX_LARAVEL: ${{ matrix.laravel }}
+
+      - name: Replace asterisks in DBAL
+        id: replace_dbal
+        run: echo "REPLACED_DBAL=${MATRIX_DBAL//\*/_}" >> $GITHUB_ENV
+        env:
+          MATRIX_DBAL: ${{ matrix.dbal }}
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshots-${{ matrix.os }}-${{ matrix.php }}-${{ env.REPLACED_LARAVEL }}-${{ env.REPLACED_DBAL }}
+          path: |
+            tests/Browser/screenshots/
+            tests/Browser/console/

Diff for: .github/workflows/build.yml

@@ -10,6 +10,8 @@ frontend/js/components/customs/*
 !frontend/js/components/customs/.keep
 frontend/js/components/customs-vendor/*
 !frontend/js/components/customs-vendor/.keep
+frontend/icons-custom/*
+views/partials/icons/icons-custom-svg.blade.php
 .DS_Store
 public/
 tests/coverage
@@ -19,3 +21,9 @@ tests/storage
 .env.local
 .env.*.local
 composer.lock
+.github/clover.xml
+:memory:
+dist
+dist-backup
+.env
+mike.md