Skip to content

Commit 570c316

Browse files
committed
Merge branch 'release/1.0.0-alpha.13'
2 parents d1b6f52 + 04fa81a commit 570c316

38 files changed

+2312
-6979
lines changed

.ddev/config.yaml

+279-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,286 @@
11
name: ui
22
type: php
33
docroot: packages/docs/.symfony/public
4-
php_version: '8.3'
5-
nodejs_version: '22'
4+
php_version: "8.3"
65
webserver_type: nginx-fpm
6+
xdebug_enabled: false
7+
additional_hostnames: []
8+
additional_fqdns: []
79
database:
810
type: mariadb
9-
version: "10.4"
10-
use_dns_when_possible: true
11-
omit_containers: [db]
12-
upload_dirs: [/-]
11+
version: "10.11"
1312
hooks:
14-
post-start:
15-
- composer: install -d packages/docs/.symfony/
13+
post-start:
14+
- composer: install -d packages/docs/.symfony/
15+
upload_dirs:
16+
- /-
17+
use_dns_when_possible: true
18+
composer_version: "2"
19+
web_environment: []
20+
corepack_enable: false
21+
22+
# Key features of DDEV's config.yaml:
23+
24+
# name: <projectname> # Name of the project, automatically provides
25+
# http://projectname.ddev.site and https://projectname.ddev.site
26+
27+
# type: <projecttype> # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
28+
# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
29+
# information on the different project types
30+
# "drupal" covers recent Drupal 8+
31+
32+
# docroot: <relative_path> # Relative path to the directory containing index.php.
33+
34+
# php_version: "8.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"
35+
36+
# You can explicitly specify the webimage but this
37+
# is not recommended, as the images are often closely tied to DDEV's' behavior,
38+
# so this can break upgrades.
39+
40+
# webimage: <docker_image> # nginx/php docker image.
41+
42+
# database:
43+
# type: <dbtype> # mysql, mariadb, postgres
44+
# version: <version> # database version, like "10.11" or "8.0"
45+
# MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
46+
# MySQL versions can be 5.5-8.0.
47+
# PostgreSQL versions can be 9-17.
48+
49+
# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
50+
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
51+
52+
# xdebug_enabled: false # Set to true to enable Xdebug and "ddev start" or "ddev restart"
53+
# Note that for most people the commands
54+
# "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
55+
# as leaving Xdebug enabled all the time is a big performance hit.
56+
57+
# xhprof_enabled: false # Set to true to enable Xhprof and "ddev start" or "ddev restart"
58+
# Note that for most people the commands
59+
# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
60+
# as leaving Xhprof enabled all the time is a big performance hit.
61+
62+
# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn
63+
64+
# timezone: Europe/Berlin
65+
# If timezone is unset, DDEV will attempt to derive it from the host system timezone
66+
# using the $TZ environment variable or the /etc/localtime symlink.
67+
# This is the timezone used in the containers and by PHP;
68+
# it can be set to any valid timezone,
69+
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
70+
# For example Europe/Dublin or MST7MDT
71+
72+
# composer_root: <relative_path>
73+
# Relative path to the Composer root directory from the project root. This is
74+
# the directory which contains the composer.json and where all Composer related
75+
# commands are executed.
76+
77+
# composer_version: "2"
78+
# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
79+
# to use the latest major version available at the time your container is built.
80+
# It is also possible to use each other Composer version channel. This includes:
81+
# - 2.2 (latest Composer LTS version)
82+
# - stable
83+
# - preview
84+
# - snapshot
85+
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
86+
# To reinstall Composer after the image was built, run "ddev debug rebuild".
87+
88+
# nodejs_version: "20"
89+
# change from the default system Node.js version to any other version.
90+
# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
91+
# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
92+
# Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use,
93+
# can specify any version, and is more robust than using 'nvm'.
94+
95+
# corepack_enable: false
96+
# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
97+
98+
# additional_hostnames:
99+
# - somename
100+
# - someothername
101+
# would provide http and https URLs for "somename.ddev.site"
102+
# and "someothername.ddev.site".
103+
104+
# additional_fqdns:
105+
# - example.com
106+
# - sub1.example.com
107+
# would provide http and https URLs for "example.com" and "sub1.example.com"
108+
# Please take care with this because it can cause great confusion.
109+
110+
# upload_dirs: "custom/upload/dir"
111+
#
112+
# upload_dirs:
113+
# - custom/upload/dir
114+
# - ../private
115+
#
116+
# would set the destination paths for ddev import-files to <docroot>/custom/upload/dir
117+
# When Mutagen is enabled this path is bind-mounted so that all the files
118+
# in the upload_dirs don't have to be synced into Mutagen.
119+
120+
# disable_upload_dirs_warning: false
121+
# If true, turns off the normal warning that says
122+
# "You have Mutagen enabled and your 'php' project type doesn't have upload_dirs set"
123+
124+
# ddev_version_constraint: ""
125+
# Example:
126+
# ddev_version_constraint: ">= 1.22.4"
127+
# This will enforce that the running ddev version is within this constraint.
128+
# See https://github.com/Masterminds/semver#checking-version-constraints for
129+
# supported constraint formats
130+
131+
# working_dir:
132+
# web: /var/www/html
133+
# db: /home
134+
# would set the default working directory for the web and db services.
135+
# These values specify the destination directory for ddev ssh and the
136+
# directory in which commands passed into ddev exec are run.
137+
138+
# omit_containers: [db, ddev-ssh-agent]
139+
# Currently only these containers are supported. Some containers can also be
140+
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
141+
# the "db" container, several standard features of DDEV that access the
142+
# database container will be unusable. In the global configuration it is also
143+
# possible to omit ddev-router, but not here.
144+
145+
# performance_mode: "global"
146+
# DDEV offers performance optimization strategies to improve the filesystem
147+
# performance depending on your host system. Should be configured globally.
148+
#
149+
# If set, will override the global config. Possible values are:
150+
# - "global": uses the value from the global config.
151+
# - "none": disables performance optimization for this project.
152+
# - "mutagen": enables Mutagen for this project.
153+
# - "nfs": enables NFS for this project.
154+
#
155+
# See https://ddev.readthedocs.io/en/stable/users/install/performance/#nfs
156+
# See https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen
157+
158+
# fail_on_hook_fail: False
159+
# Decide whether 'ddev start' should be interrupted by a failing hook
160+
161+
# host_https_port: "59002"
162+
# The host port binding for https can be explicitly specified. It is
163+
# dynamic unless otherwise specified.
164+
# This is not used by most people, most people use the *router* instead
165+
# of the localhost port.
166+
167+
# host_webserver_port: "59001"
168+
# The host port binding for the ddev-webserver can be explicitly specified. It is
169+
# dynamic unless otherwise specified.
170+
# This is not used by most people, most people use the *router* instead
171+
# of the localhost port.
172+
173+
# host_db_port: "59002"
174+
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
175+
# unless explicitly specified.
176+
177+
# mailpit_http_port: "8025"
178+
# mailpit_https_port: "8026"
179+
# The Mailpit ports can be changed from the default 8025 and 8026
180+
181+
# host_mailpit_port: "8025"
182+
# The mailpit port is not normally bound on the host at all, instead being routed
183+
# through ddev-router, but it can be bound directly to localhost if specified here.
184+
185+
# webimage_extra_packages: [php7.4-tidy, php-bcmath]
186+
# Extra Debian packages that are needed in the webimage can be added here
187+
188+
# dbimage_extra_packages: [telnet,netcat]
189+
# Extra Debian packages that are needed in the dbimage can be added here
190+
191+
# use_dns_when_possible: true
192+
# If the host has internet access and the domain configured can
193+
# successfully be looked up, DNS will be used for hostname resolution
194+
# instead of editing /etc/hosts
195+
# Defaults to true
196+
197+
# project_tld: ddev.site
198+
# The top-level domain used for project URLs
199+
# The default "ddev.site" allows DNS lookup via a wildcard
200+
# If you prefer you can change this to "ddev.local" to preserve
201+
# pre-v1.9 behavior.
202+
203+
# ngrok_args: --basic-auth username:pass1234
204+
# Provide extra flags to the "ngrok http" command, see
205+
# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"
206+
207+
# disable_settings_management: false
208+
# If true, DDEV will not create CMS-specific settings files like
209+
# Drupal's settings.php/settings.ddev.php or TYPO3's additional.php
210+
# In this case the user must provide all such settings.
211+
212+
# You can inject environment variables into the web container with:
213+
# web_environment:
214+
# - SOMEENV=somevalue
215+
# - SOMEOTHERENV=someothervalue
216+
217+
# no_project_mount: false
218+
# (Experimental) If true, DDEV will not mount the project into the web container;
219+
# the user is responsible for mounting it manually or via a script.
220+
# This is to enable experimentation with alternate file mounting strategies.
221+
# For advanced users only!
222+
223+
# bind_all_interfaces: false
224+
# If true, host ports will be bound on all network interfaces,
225+
# not the localhost interface only. This means that ports
226+
# will be available on the local network if the host firewall
227+
# allows it.
228+
229+
# default_container_timeout: 120
230+
# The default time that DDEV waits for all containers to become ready can be increased from
231+
# the default 120. This helps in importing huge databases, for example.
232+
233+
#web_extra_exposed_ports:
234+
#- name: nodejs
235+
# container_port: 3000
236+
# http_port: 2999
237+
# https_port: 3000
238+
#- name: something
239+
# container_port: 4000
240+
# https_port: 4000
241+
# http_port: 3999
242+
# Allows a set of extra ports to be exposed via ddev-router
243+
# Fill in all three fields even if you don’t intend to use the https_port!
244+
# If you don’t add https_port, then it defaults to 0 and ddev-router will fail to start.
245+
#
246+
# The port behavior on the ddev-webserver must be arranged separately, for example
247+
# using web_extra_daemons.
248+
# For example, with a web app on port 3000 inside the container, this config would
249+
# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
250+
# web_extra_exposed_ports:
251+
# - name: myapp
252+
# container_port: 3000
253+
# http_port: 9998
254+
# https_port: 9999
255+
256+
#web_extra_daemons:
257+
#- name: "http-1"
258+
# command: "/var/www/html/node_modules/.bin/http-server -p 3000"
259+
# directory: /var/www/html
260+
#- name: "http-2"
261+
# command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
262+
# directory: /var/www/html
263+
264+
# override_config: false
265+
# By default, config.*.yaml files are *merged* into the configuration
266+
# But this means that some things can't be overridden
267+
# For example, if you have 'use_dns_when_possible: true'' you can't override it with a merge
268+
# and you can't erase existing hooks or all environment variables.
269+
# However, with "override_config: true" in a particular config.*.yaml file,
270+
# 'use_dns_when_possible: false' can override the existing values, and
271+
# hooks:
272+
# post-start: []
273+
# or
274+
# web_environment: []
275+
# or
276+
# additional_hostnames: []
277+
# can have their intended affect. 'override_config' affects only behavior of the
278+
# config.*.yaml file it exists in.
279+
280+
# Many DDEV commands can be extended to run tasks before or after the
281+
# DDEV command is executed, for example "post-start", "post-import-db",
282+
# "pre-composer", "post-composer"
283+
# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
284+
# information on the commands that can be extended and the tasks you can define
285+
# for them. Example:
286+
#hooks:

.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,4 @@ jobs:
141141
build_script: npm run build-for-export-size
142142
paths: dist
143143
bundler: esbuild
144-
node-version: '18'
144+
node-version: '22'

.prettierrc.cjs

-16
This file was deleted.

CHANGELOG.md

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

77
## [Unreleased]
88

9+
## [v1.0.0-alpha.13](https://github.com/studiometa/ui/compare/1.0.0-alpha.12..1.0.0-alpha.13) (2024-11-14)
10+
11+
### Changed
12+
13+
- ⚠️ Bump minimum PHP version for the package to 8.1 ([#318](https://github.com/studiometa/ui/pull/318), [512f076](https://github.com/studiometa/ui/commit/512f076))
914

1015
## [v1.0.0-alpha.12](https://github.com/studiometa/ui/compare/1.0.0-alpha.11..1.0.0-alpha.12) (2024-11-11)
1116

Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ COPY packages/ui/ ./packages/ui/
2828
COPY packages/twig-extension/ ./packages/twig-extension/
2929
RUN composer install -d ./packages/docs/.symfony
3030
RUN echo "APP_ENV=prod" > ./packages/docs/.symfony/.env.local
31+
RUN echo 'DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"' >> ./packages/docs/.symfony/.env.local
3132
COPY --from=docs_builder /app/packages/docs/.symfony/public/-/ ./packages/docs/.symfony/public/-/
3233
RUN chown -R www-data:www-data .
3334
ENV NGINX_WEBROOT="/app/packages/docs/.symfony/public/"

composer.json

+7-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
{
22
"name": "studiometa/ui",
3-
"version": "1.0.0-alpha.12",
3+
"version": "1.0.0-alpha.13",
44
"description": "A set of opiniated, unstyled and accessible components.",
55
"license": "MIT",
66
"require": {
7-
"php": "^7.3|^8.0",
8-
"twig/twig": "^2.10|^3",
7+
"php": "^8.1",
98
"studiometa/twig-toolkit": "^1.3",
10-
"easycorp/easyadmin-bundle": "^4.9",
11-
"symfony/orm-pack": "^2.4",
12-
"symfony/console": "^6.4",
13-
"symfony/cache": "^7.1",
14-
"symfony/http-client": "^7.1"
9+
"twig/twig": "^2.10|^3"
1510
},
1611
"require-dev": {
12+
"mallardduck/prettier-php-runner": "^1.0",
13+
"pestphp/pest": "^1.23",
1714
"phpstan/phpstan": "^0.12.100",
18-
"squizlabs/php_codesniffer": "^3.6",
19-
"pestphp/pest": "^1.21",
2015
"spatie/pest-plugin-snapshots": "^1.1",
21-
"mallardduck/prettier-php-runner": "^1.0",
22-
"symfony/maker-bundle": "^1.61"
16+
"squizlabs/php_codesniffer": "^3.6"
2317
},
2418
"scripts": {
2519
"phpcs": "phpcs",
@@ -32,6 +26,7 @@
3226
}
3327
},
3428
"config": {
29+
"sort-packages": true,
3530
"allow-plugins": {
3631
"pestphp/pest-plugin": true
3732
}

0 commit comments

Comments
 (0)