Skip to content

Commit c067b84

Browse files
titouanmathistitouanmathis
committed
Merge branch 'release/1.0.0-beta.0'
2 parents 0dbe66b + a29db33 commit c067b84

File tree

464 files changed

+2914
-2138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

464 files changed

+2914
-2138
lines changed

‎.github/workflows/code-quality.yml

+155
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
name: code-quality
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
pull_request:
9+
10+
jobs:
11+
oxlint:
12+
runs-on: macos-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-node@v4
16+
with:
17+
node-version: 22
18+
cache: 'npm'
19+
- name: Get npm cache directory
20+
id: npm-cache-dir
21+
shell: bash
22+
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
23+
- uses: actions/cache@v4
24+
id: npm-cache
25+
with:
26+
path: |
27+
${{ steps.npm-cache-dir.outputs.dir }}
28+
**/node_modules
29+
.eslintcache
30+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
31+
restore-keys: ${{ runner.os }}-node-
32+
- name: Install modules
33+
run: npm install --no-audit --no-fund
34+
- name: Run code quality tests
35+
run: npm run lint:static
36+
37+
typescript:
38+
runs-on: macos-latest
39+
steps:
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-node@v4
42+
with:
43+
node-version: 22
44+
cache: 'npm'
45+
- name: Get npm cache directory
46+
id: npm-cache-dir
47+
shell: bash
48+
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
49+
- uses: actions/cache@v4
50+
id: npm-cache
51+
with:
52+
path: |
53+
${{ steps.npm-cache-dir.outputs.dir }}
54+
**/node_modules
55+
.eslintcache
56+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
57+
restore-keys: ${{ runner.os }}-node-
58+
- name: Install modules
59+
run: npm install --no-audit --no-fund
60+
- name: Run types tests
61+
run: npm run lint:types
62+
63+
64+
prettier:
65+
runs-on: macos-latest
66+
steps:
67+
- uses: actions/checkout@v4
68+
- uses: actions/setup-node@v4
69+
with:
70+
node-version: 22
71+
cache: 'npm'
72+
- name: Get npm cache directory
73+
id: npm-cache-dir
74+
shell: bash
75+
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
76+
- uses: actions/cache@v4
77+
id: npm-cache
78+
with:
79+
path: |
80+
${{ steps.npm-cache-dir.outputs.dir }}
81+
**/node_modules
82+
.eslintcache
83+
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
84+
restore-keys: ${{ runner.os }}-node-
85+
- name: Install modules
86+
run: npm install --no-audit --no-fund
87+
- name: Run Prettier check
88+
run: npm run lint:prettier
89+
90+
91+
phpcs:
92+
name: phpcs
93+
runs-on: macos-latest
94+
strategy:
95+
fail-fast: false
96+
matrix:
97+
php-versions: ['8.1', '8.2', '8.3', '8.4']
98+
steps:
99+
- uses: actions/checkout@v4
100+
101+
- name: Setup PHP, with composer and xdebug
102+
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
103+
with:
104+
php-version: ${{ matrix.php-versions }}
105+
coverage: xdebug
106+
107+
- name: Get composer cache directory
108+
id: composer-cache
109+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
110+
111+
- name: Cache composer dependencies
112+
uses: actions/cache@v2
113+
with:
114+
path: ${{ steps.composer-cache.outputs.dir }}
115+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
116+
restore-keys: ${{ runner.os }}-composer-
117+
118+
- name: Install Composer dependencies
119+
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-reqs
120+
121+
- name: PHPCS
122+
run: composer run lint:style
123+
124+
phpstan:
125+
name: phpstan
126+
runs-on: macos-latest
127+
strategy:
128+
fail-fast: false
129+
matrix:
130+
php-versions: ['8.1', '8.2', '8.3', '8.4']
131+
steps:
132+
- uses: actions/checkout@v4
133+
134+
- name: Setup PHP, with composer and xdebug
135+
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
136+
with:
137+
php-version: ${{ matrix.php-versions }}
138+
coverage: xdebug
139+
140+
- name: Get composer cache directory
141+
id: composer-cache
142+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
143+
144+
- name: Cache composer dependencies
145+
uses: actions/cache@v2
146+
with:
147+
path: ${{ steps.composer-cache.outputs.dir }}
148+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
149+
restore-keys: ${{ runner.os }}-composer-
150+
151+
- name: Install Composer dependencies
152+
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-reqs
153+
154+
- name: PHPStan
155+
run: composer run lint:static

‎.github/workflows/export-size.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
- uses: titouanmathis/export-size-action@main
1717
with:
1818
github_token: ${{ secrets.GITHUB_TOKEN }}
19-
build_script: npm run build-for-export-size
19+
build_script: npm run build
2020
paths: dist
2121
node-version: 22

‎.github/workflows/tests.yml

+7-38
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,6 @@ on:
88
pull_request:
99

1010
jobs:
11-
code_quality:
12-
runs-on: macos-latest
13-
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-node@v4
16-
with:
17-
node-version: 22
18-
cache: 'npm'
19-
- name: Get npm cache directory
20-
id: npm-cache-dir
21-
shell: bash
22-
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
23-
- uses: actions/cache@v4
24-
id: npm-cache
25-
with:
26-
path: |
27-
${{ steps.npm-cache-dir.outputs.dir }}
28-
**/node_modules
29-
.eslintcache
30-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
31-
restore-keys: ${{ runner.os }}-node-
32-
- name: Install modules
33-
run: npm install --no-audit --no-fund
34-
- name: Run code quality tests
35-
run: npm run lint:static
36-
- name: Run types tests
37-
run: npm run lint:types
38-
- name: Run Prettier check
39-
run: npm run lint:prettier
40-
4111
unit_node:
4212
runs-on: macos-latest
4313
steps:
@@ -77,13 +47,11 @@ jobs:
7747
strategy:
7848
fail-fast: false
7949
matrix:
80-
php-versions: ['8.1', '8.2', '8.3']
81-
twig-versions: ['^2.10', '^3']
50+
php-versions: ['8.1', '8.2', '8.3', '8.4']
8251
env:
8352
PHP_VERSION: ${{ matrix.php-versions }}
84-
TWIG_VERSION: ${{ matrix.twig-versions }}
8553
steps:
86-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v4
8755

8856
- uses: actions/setup-node@v4
8957
with:
@@ -110,10 +78,11 @@ jobs:
11078
restore-keys: ${{ runner.os }}-composer-
11179

11280
- name: Install Composer dependencies
113-
run: composer install --no-progress --prefer-dist --optimize-autoloader
81+
run: composer install --no-progress --prefer-dist --optimize-autoloader --ignore-platform-reqs
11482

115-
- name: Install Twig specific version
116-
run: composer require twig/twig:${{ matrix.twig-versions }}
83+
- name: Install Pest v3
84+
run: composer require pest/pest:^3.0
85+
if: ${{ matrix.php-version == '8.4' }}
11786

11887
- name: Pest
11988
run: php -v && XDEBUG_MODE=coverage ./vendor/bin/pest --coverage --coverage-clover='coverage.xml'
@@ -122,7 +91,7 @@ jobs:
12291
uses: codecov/codecov-action@v4
12392
with:
12493
token: ${{ secrets.CODECOV_TOKEN }}
125-
env_vars: PHP_VERSION,TWIG_VERSION
94+
env_vars: PHP_VERSION
12695
file: ./coverage.xml
12796
flags: unittests
12897
fail_ci_if_error: false

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ storybook-static/
111111

112112
# Symbolic docroot
113113
/web
114-
.phpunit.result.cache
114+
/.phpunit.cache/
115115

116116
/packages/docs/.vitepress/dist/
117117
/packages/docs/.vitepress/.temp/

‎CHANGELOG.md

+21-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
## [v1.0.0-beta.0](https://github.com/studiometa/ui/compare/1.0.0-alpha.14..1.0.0-beta.0) (2025-01-21)
10+
11+
### Added
12+
13+
- **Icon:** add support for icon sets ([#344](https://github.com/studiometa/ui/pull/344), [090b1b1](https://github.com/studiometa/ui/commit/090b1b1))
14+
- **TwigExtension:** add a `meta_icon('collection:icon')` Twig function ([#223](https://github.com/studiometa/ui/issues/223), [#344](https://github.com/studiometa/ui/pull/344), [7dfb635](https://github.com/studiometa/ui/commit/7dfb635))
15+
- Add support for PHP 8.4 ([#348](https://github.com/studiometa/ui/pull/348))
16+
17+
### Changed
18+
19+
- ⚠️ Remove the atomic folders ([#343](https://github.com/studiometa/ui/pull/343), [a61d8e6](https://github.com/studiometa/ui/commit/a61d8e6))
20+
- ⚠️ Upgrade twig/twig to ^3.0 ([#348](https://github.com/studiometa/ui/pull/348), [c8e3830](https://github.com/studiometa/ui/commit/c8e3830))
21+
- ⚠️ Upgrade studiometa/twig-toolkit to ^2.0 ([#348](https://github.com/studiometa/ui/pull/348), [39b43c8](https://github.com/studiometa/ui/commit/39b43c8))
22+
- Upgrade @studiometa/js-toolkit to ^3.0 ([#350](https://github.com/studiometa/ui/pull/350), [439288a](https://github.com/studiometa/ui/commit/439288a))
23+
24+
### Removed
25+
26+
- ⚠️ **Icon:** remove the deprecated version ([#344](https://github.com/studiometa/ui/pull/344), [c8a4001](https://github.com/studiometa/ui/commit/c8a4001))
27+
- Remove component specific package.json file ([#343](https://github.com/studiometa/ui/pull/343), [6c29694](https://github.com/studiometa/ui/commit/6c29694))
28+
929
## [v1.0.0-alpha.14](https://github.com/studiometa/ui/compare/1.0.0-alpha.13..1.0.0-alpha.14) (2025-01-15)
1030

1131
### Fixed
@@ -47,7 +67,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4767

4868
### Added
4969

50-
- Add a [FigureShopify](https://ui.studiometa.dev/-/components/atoms/FigureShopify/) component ([#303](https://github.com/studiometa/ui/pull/303))
70+
- Add a [FigureShopify](https://ui.studiometa.dev/-/components/FigureShopify/) component ([#303](https://github.com/studiometa/ui/pull/303))
5171
- **Transition:** add support for grouped transitions ([#305](https://github.com/studiometa/ui/issues/305), [#306](https://github.com/studiometa/ui/pull/306), [be85501](https://github.com/studiometa/ui/commit/be85501))
5272

5373
## [v1.0.0-alpha.8](https://github.com/studiometa/ui/compare/1.0.0-alpha.7..1.0.0-alpha.8) (2024-09-25)

‎composer.json

+18-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
11
{
22
"name": "studiometa/ui",
3-
"version": "1.0.0-alpha.14",
3+
"version": "1.0.0-beta.0",
44
"description": "A set of opiniated, unstyled and accessible components.",
55
"license": "MIT",
66
"require": {
77
"php": "^8.1",
8-
"studiometa/twig-toolkit": "^1.3",
9-
"twig/twig": "^2.10|^3"
8+
"iconify/json": "^2.2",
9+
"iconify/json-tools": "^1.0",
10+
"studiometa/twig-toolkit": "^2.0",
11+
"twig/twig": "^3.0"
1012
},
1113
"require-dev": {
1214
"mallardduck/prettier-php-runner": "^1.0",
13-
"pestphp/pest": "^1.23",
14-
"phpstan/phpstan": "^0.12.100",
15-
"spatie/pest-plugin-snapshots": "^1.1",
15+
"pestphp/pest": "^2.0|^3.0",
16+
"phpstan/phpstan": "^2.1",
17+
"spatie/pest-plugin-snapshots": "^2.0",
1618
"squizlabs/php_codesniffer": "^3.6"
1719
},
1820
"scripts": {
19-
"phpcs": "phpcs",
20-
"phpstan": "phpstan analyse",
21+
"lint": [
22+
"@lint:style",
23+
"@lint:static"
24+
],
25+
"lint:style": "phpcs",
26+
"lint:static": "phpstan analyse --memory-limit=1024M",
27+
"fix": [
28+
"@fix:style"
29+
],
30+
"fix:style": "phpcbf",
2131
"test": "pest"
2232
},
2333
"autoload": {

0 commit comments

Comments
 (0)