Skip to content

Commit 9ec6917

Browse files
feat: add support for Heroicons v2 (#2)
* chore(deps): upgrade `blade-ui-kit/blade-heroicons` to `2.1` * chore: drop PHP 7.4 support * chore(deps): add `laravel/pint` dev dependency * chore: update `lint` script * feat(ci): add `pint` to `tests` action * chore(ci): drop PHP 7.4 and Laravel 8 support * feat(ci): update tests suite - update strategy matrix - run on both `main` branch and version branches - prefix matrix versions with the dependency name - update `actions/checkout` to `v3` * chore: linting * feat: add `heroicon:mini` tag * feat(types): use native types * feat(tests): update tests - add `mini` variant test - update icon names to match v2 set * chore: update changelog * fix(ci): invalid matrix reference * chore(ci,deps): remove `orchestra/testbench` dependency * chore(ci): remove laravel 10 from strategy matrix * chore(ci): explicitly add statamic versions to matrix * chore(deps): only use `orchestra/testbench` version `^7` * chore(deps): add PHP 8.2 to supported versions * chore(deps): only use `orchestra/testbench` version `^7` * chore(deps): update `statamic/cms` version constraint * chore(ci): update test suite * chore(deps): update `statamic/cms` version constraint * feat: update `Heroicon` tag class * chore(tests): sort package providers * chore(deps): upgrade deps * chore(tests): update workflow * chore: drop PHP 8.0 support
1 parent 1fa1263 commit 9ec6917

File tree

7 files changed

+1830
-1214
lines changed

7 files changed

+1830
-1214
lines changed

.github/workflows/tests.yaml

+18-26
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,28 @@ name: Test Suite
22

33
on:
44
push:
5+
branches:
6+
- main
7+
- '*.x'
58
pull_request:
69

710
jobs:
8-
php_tests:
9-
runs-on: ${{ matrix.os }}
11+
tests:
12+
runs-on: ubuntu-latest
1013

1114
strategy:
15+
fail-fast: true
1216
matrix:
13-
php: [8.1, 8.0, 7.4]
14-
laravel: [9.*, 8.*]
15-
statamic: [^3.3]
17+
php: [8.1, 8.2]
18+
laravel: [9.*]
19+
statamic: [^3.3, ^3.4]
1620
os: [ubuntu-latest]
17-
include:
18-
- laravel: 9.*
19-
framework: ^9.1.0
20-
testbench: 7.*
21-
- laravel: 8.*
22-
framework: ^8.24.0
23-
testbench: 6.*
24-
exclude:
25-
- laravel: 9.*
26-
statamic: ^3.2
27-
- laravel: 9.*
28-
php: 7.4
29-
30-
name: ${{ matrix.php }} - ${{ matrix.statamic }} - ${{ matrix.laravel }}
21+
22+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Statamic ${{ matrix.statamic }}
3123

3224
steps:
3325
- name: Checkout code
34-
uses: actions/checkout@v1
35-
36-
- name: Delete composer.lock
37-
run: rm composer.lock
26+
uses: actions/checkout@v3
3827

3928
- name: Setup PHP
4029
uses: shivammathur/setup-php@v2
@@ -44,8 +33,11 @@ jobs:
4433

4534
- name: Install dependencies
4635
run: |
47-
composer require "laravel/framework:${{ matrix.framework }}" "statamic/cms:${{ matrix.statamic }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
48-
composer install --no-interaction
36+
composer require "laravel/framework:${{ matrix.laravel }}" "statamic/cms:${{ matrix.statamic }}" --prefer-dist --no-interaction --no-update
37+
composer install --prefer-dist --no-interaction
38+
39+
- name: Lint
40+
run: composer lint -- --test
4941

50-
- name: Run PHPUnit
42+
- name: Test
5143
run: composer test

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## v2.0 - 2023-02-18
4+
5+
- Upgrade `blade-ui-kit/blade-heroicons` dependency to version `2.1`
6+
- Drop PHP 7.4 and Laravel 8 support
7+
- Add `heroicon:mini` tag (to support the new Heroicons v2 mini set containing 20x20 solid fill icons)
8+
9+
## v1.1 - 2023-02-18
10+
11+
- Upgrade `blade-ui-kit/blade-heroicons` dependency to version `1.4`
12+
313
## v1.0.2 - 2022-06-20
414

515
- Patch previously empty release

composer.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,19 @@
2424
}
2525
},
2626
"require": {
27-
"php": "^7.4 || ^8.0 || ^8.1",
28-
"blade-ui-kit/blade-heroicons": "^1.3",
29-
"statamic/cms": "3.3.*"
27+
"php": "^8.1 || ^8.2",
28+
"blade-ui-kit/blade-heroicons": "^2.1",
29+
"statamic/cms": "3.4.x"
3030
},
3131
"require-dev": {
3232
"facade/ignition-contracts": "^1.0",
33+
"laravel/pint": "^1.5",
3334
"nunomaduro/collision": "^4.2 || ^5.0 || ^6.1",
34-
"orchestra/testbench": "^5.0 || ^6.0 || ^7.0"
35+
"orchestra/testbench": "^7"
3536
},
3637
"scripts": {
3738
"lint": [
38-
"php-cs-fixer fix ./src"
39+
"./vendor/bin/pint"
3940
],
4041
"test": [
4142
"php -d memory_limit=-1 -d max_execution_time=0 ./vendor/bin/phpunit"

0 commit comments

Comments
 (0)