diff --git a/package-lock.json b/package-lock.json
index 1f0d9df..c3ec18e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"archiver": "^8.0.0",
"fs-extra": "^11.4.0",
"husky": "^9.1.7",
- "lint-staged": "^17.4.1"
+ "lint-staged": "^17.5.1"
}
},
"node_modules/abort-controller": {
@@ -370,15 +370,15 @@
}
},
"node_modules/lint-staged": {
- "version": "17.4.1",
- "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-17.4.1.tgz",
- "integrity": "sha512-FmJeudcalbSfg1du+JCfvi5vS6Qt08KgbfLWiHinbef+2JJwUZwAWVoaO1AcJVUTWPfk0t30PMQNwPAeCzYQ+Q==",
+ "version": "17.5.1",
+ "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-17.5.1.tgz",
+ "integrity": "sha512-7EDuco1xnBMeVpvAbeMq1U5KXwJGLmY8q6l+Ye78r36C4mPc+Vg1Z2SK8gHyRTyvPro90A0q5/FAZ+Au23d6QQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"picomatch": "^4.0.7",
"string-argv": "^0.3.2",
- "tinyexec": "^1.3.0"
+ "tinyexec": "^1.3.1"
},
"bin": {
"lint-staged": "bin/lint-staged.js"
@@ -560,9 +560,9 @@
}
},
"node_modules/tinyexec": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.0.tgz",
- "integrity": "sha512-QKAl9m8gWWGHV8jZcPeym6j+XULi6tOf1mT83WYJ4Lk2ytW/uwAWkrP0uFsdoYMdueVJ0qs26wZ+23xeB4ibNQ==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.3.1.tgz",
+ "integrity": "sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==",
"dev": true,
"license": "MIT",
"engines": {
diff --git a/package.json b/package.json
index 765f56e..47ef591 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
"archiver": "^8.0.0",
"fs-extra": "^11.4.0",
"husky": "^9.1.7",
- "lint-staged": "^17.4.1"
+ "lint-staged": "^17.5.1"
},
"lint-staged": {
"themes/**develop**/**/*.{css,js,jsx,ts,tsx,twig}": [
diff --git a/themes/develop/README.md b/themes/develop/README.md
index 1941f67..e8c605a 100644
--- a/themes/develop/README.md
+++ b/themes/develop/README.md
@@ -1,4 +1,4 @@
-# テーマ「develop」Ver.1.1.6
+# テーマ「develop」Ver.1.1.7
## バンドル環境の使い方
diff --git a/themes/develop/admin.html b/themes/develop/admin.html
index d510706..eb79765 100644
--- a/themes/develop/admin.html
+++ b/themes/develop/admin.html
@@ -1,6 +1,12 @@
@extends("/_layouts/admin.html")
@section("editor-css")
+
+@vite("src/style/editor.css", {
+ "linkTagAttributes": {
+ "data-block-editor-stylesheet": true
+ }
+})
@endsection
@section("admin-js")
@@ -8,7 +14,8 @@
diff --git a/themes/develop/include/head/js.twig b/themes/develop/include/head/js.twig
index 60c14c1..133c799 100755
--- a/themes/develop/include/head/js.twig
+++ b/themes/develop/include/head/js.twig
@@ -7,6 +7,30 @@
{% set js = module('V2_Js') %}
+{% else %}
+ {# htmx でスワップされたコンテンツの組み込みJS(src/js/main.js の window.dispatch)を再初期化する。
+ acms.js を読み込む場合はコア側が行う。htmx 4 の htmx:after:swap は target がテキストノードになる
+ ことがあるため、挿入されたノード一覧を持つ htmx:after:settle を使う。htmx 2(CMS 3.2)向けに
+ afterSwap も残し、htmx 4 で htmx-2-compat 拡張が発火させる afterSwap は無視する。 #}
+ {# prettier-ignore #}
+
{% endif %}
diff --git a/themes/develop/package-lock.json b/themes/develop/package-lock.json
index 731387a..d751aca 100644
--- a/themes/develop/package-lock.json
+++ b/themes/develop/package-lock.json
@@ -1,18 +1,19 @@
{
"name": "develop",
- "version": "1.1.6",
+ "version": "1.1.7",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "develop",
- "version": "1.1.6",
+ "version": "1.1.7",
"license": "MIT",
"dependencies": {
- "@ablogcms/pdf": "^3.2.29",
- "@ablogcms/validator": "^3.2.29",
+ "@ablogcms/pdf": "^3.2.35",
+ "@ablogcms/validator": "^3.2.35",
+ "@rollup/rollup-linux-x64-gnu": "4.63.3",
"a-dispatcher": "^1.0.1",
- "alpinejs": "^3.16.3",
+ "alpinejs": "^3.17.3",
"document-outliner": "^1.1.3",
"dom-content-loaded": "^1.0.2",
"flatpickr": "^4.6.13",
@@ -21,49 +22,49 @@
"leaflet": "^1.9.4",
"leaflet-gesture-handling": "^1.2.2",
"modal-video": "^2.4.8",
- "query-string": "^9.5.0",
+ "query-string": "^9.5.1",
"scroll-hint": "^1.2.9",
- "smartphoto": "^2.1.8"
+ "smartphoto": "^2.1.17"
},
"devDependencies": {
"@eslint/js": "^10.0.1",
"@tailwindcss/typography": "^0.5.20",
"@tailwindcss/vite": "^4.3.3",
"@zackad/prettier-plugin-twig": "^0.17.0",
- "browserslist": "^4.28.8",
- "eslint": "^10.9.1",
- "globals": "^17.11.0",
- "prettier": "^3.9.6",
+ "browserslist": "^4.29.0",
+ "eslint": "^10.11.0",
+ "globals": "^17.12.0",
+ "prettier": "^3.9.8",
"rollup-plugin-visualizer": "^7.1.1",
- "stylelint": "^17.14.1",
+ "stylelint": "^17.15.0",
"stylelint-config-recess-order": "^7.8.0",
"stylelint-config-standard": "^40.0.0",
"stylelint-order": "^8.1.1",
"tailwindcss": "^4.2.4",
- "vite": "^8.2.2",
+ "vite": "^8.3.0",
"vite-plugin-eslint2": "^5.3.0",
"vite-plugin-static-copy": "^4.1.1",
"vite-plugin-stylelint": "^6.3.0"
},
"optionalDependencies": {
- "@rollup/rollup-linux-x64-gnu": "4.63.1",
+ "@rollup/rollup-linux-x64-gnu": "4.63.3",
"@tailwindcss/oxide-linux-x64-gnu": "^4.2.4",
"lightningcss-linux-x64-gnu": "^1.33.0"
}
},
"node_modules/@ablogcms/pdf": {
- "version": "3.2.29",
- "resolved": "https://registry.npmjs.org/@ablogcms/pdf/-/pdf-3.2.29.tgz",
- "integrity": "sha512-aFqRFauF9g7h4eneLqVq+FlSkUYFX8TlMIMXOWEfHpUXvQHl0ONRibnsb7Lp20cYrW4yOaaBBILjIi8Wi9sq7A==",
+ "version": "3.2.35",
+ "resolved": "https://registry.npmjs.org/@ablogcms/pdf/-/pdf-3.2.35.tgz",
+ "integrity": "sha512-yGzHw91CCcq/HFQAnMPqG3bEPxbqY0ILM7+piiEjTNzk91M9xdQeyF/Seyh1ep1eVML2hjH2s/xMhYqReeLlAA==",
"license": "MIT",
"dependencies": {
"pdfjs-dist": "^6.2.108"
}
},
"node_modules/@ablogcms/validator": {
- "version": "3.2.32",
- "resolved": "https://registry.npmjs.org/@ablogcms/validator/-/validator-3.2.32.tgz",
- "integrity": "sha512-vqozZrIwJbT2+VtSs6C4iCKTMZ/ZHA2qCCIvQ+015hnGHNsLN/keEyWVTMoMygY0g+mn4qDLhQVON0QK5TPUtA==",
+ "version": "3.2.35",
+ "resolved": "https://registry.npmjs.org/@ablogcms/validator/-/validator-3.2.35.tgz",
+ "integrity": "sha512-MndAufEiK6ylimhmxUyLjo1XMH4Dlq0tCEdWb/zA/DtR6mqAwENSBXDbEJOGBkJB8wE6puILXQp2wZ0M5/zrUw==",
"license": "MIT"
},
"node_modules/@babel/code-frame": {
@@ -159,33 +160,6 @@
"keyv": "^5.6.0"
}
},
- "node_modules/@cacheable/memory/node_modules/@keyv/bigmap": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
- "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "hashery": "^1.4.0",
- "hookified": "^1.15.0"
- },
- "engines": {
- "node": ">= 18"
- },
- "peerDependencies": {
- "keyv": "^5.6.0"
- }
- },
- "node_modules/@cacheable/memory/node_modules/keyv": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
- "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@keyv/serialize": "^1.1.1"
- }
- },
"node_modules/@cacheable/utils": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.5.0.tgz",
@@ -197,16 +171,6 @@
"keyv": "^5.6.0"
}
},
- "node_modules/@cacheable/utils/node_modules/keyv": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
- "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@keyv/serialize": "^1.1.1"
- }
- },
"node_modules/@csstools/css-calc": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.3.0.tgz",
@@ -255,9 +219,9 @@
}
},
"node_modules/@csstools/css-syntax-patches-for-csstree": {
- "version": "1.1.8",
- "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.8.tgz",
- "integrity": "sha512-CpMLjAvwQg3BL5S0IeqsZNMH7EQrEWi0kLKOC13ZBF0ZwERiLWlibNPJr8G1kdU3Ms/r2KiNrF81pUh2HwAHdg==",
+ "version": "1.1.14",
+ "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.14.tgz",
+ "integrity": "sha512-HpbVXyrofRXpHpgkNIjU/3EWR4WJvOkO3emNK/L6X/mTJU7bGUI3AkkpoTNXznQLp0KRjLHELTGeKI5dIkI9JQ==",
"dev": true,
"funding": [
{
@@ -438,9 +402,9 @@
}
},
"node_modules/@eslint/plugin-kit": {
- "version": "0.7.2",
- "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz",
- "integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==",
+ "version": "0.7.3",
+ "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz",
+ "integrity": "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
@@ -567,6 +531,23 @@
"@jridgewell/sourcemap-codec": "^1.4.14"
}
},
+ "node_modules/@keyv/bigmap": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
+ "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "hashery": "^1.4.0",
+ "hookified": "^1.15.0"
+ },
+ "engines": {
+ "node": ">= 18"
+ },
+ "peerDependencies": {
+ "keyv": "^5.6.0"
+ }
+ },
"node_modules/@keyv/serialize": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
@@ -878,19 +859,19 @@
}
},
"node_modules/@oxc-project/types": {
- "version": "0.146.0",
- "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.146.0.tgz",
- "integrity": "sha512-XC0QsnnhVe7sLIWmYmdPw7x5P0h4W8vUU3Nv1ySgWXtvCz8NizoAEpGXA0sOYoJQV2Rl13LgURAHQ5cI5ILCSA==",
+ "version": "0.150.0",
+ "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.150.0.tgz",
+ "integrity": "sha512-rDS5/31E9HfPl/CIzGrn0DOlvBbXFseQ5URJ9sYMfstbKLD/c6Gm9vmRzRGDdAXyOIL4zmO37lc9RIwYqVruZw==",
"dev": true,
"license": "MIT",
"funding": {
- "url": "https://github.com/sponsors/Boshen"
+ "url": "https://github.com/sponsors/oxc-project"
}
},
"node_modules/@rolldown/binding-android-arm-eabi": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.5.tgz",
- "integrity": "sha512-DLe/i+l8ynIBY7XEQ191TeZvCoowIGa18R+dIV30GW7DiOtp74i/xX8hs8GUjW5ARV7VZuie3d6AumSmCwbeRA==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm-eabi/-/binding-android-arm-eabi-1.2.9.tgz",
+ "integrity": "sha512-tNISae1QEf/vkb3xkRcjV5SEdzPE97We5IVaa2Z8jSszQPZ8U60B/YCYpw4QI7VidYsBtKavczXf+DyDs9WGxw==",
"cpu": [
"arm"
],
@@ -905,9 +886,9 @@
}
},
"node_modules/@rolldown/binding-android-arm64": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.5.tgz",
- "integrity": "sha512-zXcwKlQApYAOELHd8PwKDFkagYF9Wy4e0RJ+0qnzl9Pjnpj75TEG8ufv40p2J7kCEfwZAsNiuzRIyNNMWT38ig==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.2.9.tgz",
+ "integrity": "sha512-YC8YsI30o606GTZi0VyzYlsDKFP8W61i/QzayHDkLbNEz/IShqAmTa+hsJRj13xTHA0H+6fk4b2UmGn+Q/cMlg==",
"cpu": [
"arm64"
],
@@ -922,9 +903,9 @@
}
},
"node_modules/@rolldown/binding-darwin-arm64": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.5.tgz",
- "integrity": "sha512-dK4QakI42nzWgJT5sm4y4y/O//D4OxM75/cH28RLV+nzIN9AY+YsbuUVrUTjlLjXR6vpyxFbSsbmNuJ6BP9sww==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.2.9.tgz",
+ "integrity": "sha512-IwhlH3qK5urrY8hZiEgGkHKEFN901p/p2bjxCxJlr4GyNnF7wYpUvK+Y43uaRYuC4hpfjzbR3SJC3arX1jGvmw==",
"cpu": [
"arm64"
],
@@ -939,9 +920,9 @@
}
},
"node_modules/@rolldown/binding-darwin-x64": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.5.tgz",
- "integrity": "sha512-fqSALaUu1Wjd1nK2uW2kJDWdLCc8lx1IcY+MTY26Aurfdx19anlzhqXOgCFbBFQnlFDTn4TC1/7Nz4Bl2mLP3A==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.2.9.tgz",
+ "integrity": "sha512-XxpJfVzFh+jilRxIXUqcfYAYcunIc/XEzIizsOL1fcJee5Sf7H3mH8WlLmfHfluz5amqR88QQo9izKtmMlavAw==",
"cpu": [
"x64"
],
@@ -956,9 +937,9 @@
}
},
"node_modules/@rolldown/binding-freebsd-x64": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.5.tgz",
- "integrity": "sha512-/vCnNxlkxs9tKxNDcyWUePpJ/PgTzxIaVhoM5SmG8UV+GR/IcPam4VYxi7GIMo7PSDuNqlJqvprqii9NqqVCMw==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.2.9.tgz",
+ "integrity": "sha512-kSfvhmgeWyfkbT3p/1s5vSgboogoah2zkm9fX2zjg2hHxSV7T4KhMWRUUaRk4OXNqoD3QAUeRqLcs1aZOK4U1g==",
"cpu": [
"x64"
],
@@ -973,9 +954,9 @@
}
},
"node_modules/@rolldown/binding-linux-arm-gnueabihf": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.5.tgz",
- "integrity": "sha512-abk0NLA519LxRCszmbE0jYKuQ9YPocOXTiOXOo6Yr+YAT95VH+PtqYAjOJvGKt3viEd/x4qzabAlwd5bHOOARg==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.2.9.tgz",
+ "integrity": "sha512-1RVzG17pxqbTfYLC352JlLt6kKLG+6Hr30n8DlIJqsnV5luUDd2Qdx9Ayw1Cabfyb1K9k0jXEZ7evxkRoT+uiw==",
"cpu": [
"arm"
],
@@ -990,9 +971,9 @@
}
},
"node_modules/@rolldown/binding-linux-arm64-gnu": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.5.tgz",
- "integrity": "sha512-Y7eALiJ8lr0M2HH103Js+g7V34wf6snlpZLAsHI90uLhr3PVlNsbFVAXJC9d/V6BnPyKtpSwI+NcB/RLxsQxuA==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.2.9.tgz",
+ "integrity": "sha512-BXqPvZ2drqVD+/Z8UpKwcs4Mp7grM+eGFku4CAEKrEtcbAsUpzREphK1sogCRZGreVPiMkiiBtw0n3TPteuqvw==",
"cpu": [
"arm64"
],
@@ -1010,9 +991,9 @@
}
},
"node_modules/@rolldown/binding-linux-arm64-musl": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.5.tgz",
- "integrity": "sha512-xMvZgnbZg4YVnR/AX2b3oOPDTFYJvUVaJg5FedA/LuvexAtXibZQej4cnTkw3rjsJ/ggUROB64TdtETiim+FYA==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.2.9.tgz",
+ "integrity": "sha512-11vWvo8YDwLzukt27J3aYDWU+gg2P7J+ZOmiJ0hkF5BXZDW7pVya7r40MXDy6ya0i9KamoENSVKIugvJNgFXIA==",
"cpu": [
"arm64"
],
@@ -1030,9 +1011,9 @@
}
},
"node_modules/@rolldown/binding-linux-ppc64-gnu": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.5.tgz",
- "integrity": "sha512-GRjeqTUDHTo5GwntsLaAMcBahG3nlpjftXWZLN73HiYQlhwEowvarFgQnRnQZtIp4keXX7quXFbG38uPZBa2EA==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.2.9.tgz",
+ "integrity": "sha512-a1tijMkdwsIARtc0F39ApURROkf3NwqinI6TOiSSWCTR7dT96dffNvMUtDHnq64wKNTIZOIlzKrFvvFUznJiyw==",
"cpu": [
"ppc64"
],
@@ -1050,9 +1031,9 @@
}
},
"node_modules/@rolldown/binding-linux-s390x-gnu": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.5.tgz",
- "integrity": "sha512-vLNTR45F2Uwc8AufkNXPmB4VliaXs+FvcheEogIzOXzO4l+LzieXF5A/TWxLy5HtqpsRCHUfd0lPVrrdgXdLHQ==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.2.9.tgz",
+ "integrity": "sha512-x6SQNdAvv4c3hWqTMaWuawzMX9myaCs/yEmlGsxJzkdClnHW7FbrjQuSiRDhuSYzEYoEMhsaJy9qHG/XNemJPQ==",
"cpu": [
"s390x"
],
@@ -1070,9 +1051,9 @@
}
},
"node_modules/@rolldown/binding-linux-x64-gnu": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.5.tgz",
- "integrity": "sha512-Mgj59/HTuYeK9Gz2MA+mBWKnHsAgkBSec15ZMb1st3oIfFbX7gCjOae7GydHhzcyQi9Z/7M1QuN9bR3oFqF0jQ==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.2.9.tgz",
+ "integrity": "sha512-9s0AZ8BFK5/n7B/TBoa2yJE3gI3KURrbXcPBlsAsvjU4VeJKgE90y1YtNxyEUIcHPQkg6/yfF3qihUrcM/Kf0Q==",
"cpu": [
"x64"
],
@@ -1090,9 +1071,9 @@
}
},
"node_modules/@rolldown/binding-linux-x64-musl": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.5.tgz",
- "integrity": "sha512-mY8AP0/ichsbhAxGnLa3d3+MwV0EfgrPND2bplI3Ym8T6R2pJ0N87bvrKVwNXmdy3jnr6eQBecdqx/HMknBmpA==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.2.9.tgz",
+ "integrity": "sha512-P7VWAmV+WdJluH7ovnRGoiv2i8To7GAZ+kGzfGup635cyL7SyYl3lSUaA3Gp5THf0n/Co5EyEqb2zbqq+nMOHQ==",
"cpu": [
"x64"
],
@@ -1110,9 +1091,9 @@
}
},
"node_modules/@rolldown/binding-openharmony-arm64": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.5.tgz",
- "integrity": "sha512-8SLssA2oweAxyRgDp789ACfRb/3P+zNRJpzZxSizxF9m8NUDQ4+3xjo8ttjhVGGw6Qxb70oZiEtIjaKikCO7Yw==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.2.9.tgz",
+ "integrity": "sha512-1qixtsE4BK8h+yS3BfmZ09UhA7O/N4IACva6YBr7EBvCJraByTuRcgOTaiA62Tm0vey3UcKXLOaoGHtYmNGEVg==",
"cpu": [
"arm64"
],
@@ -1127,9 +1108,9 @@
}
},
"node_modules/@rolldown/binding-win32-arm64-msvc": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.5.tgz",
- "integrity": "sha512-vGbruD5zquhoc8D9SViXgN2FBJtNdTyQ4DtG+SWiEGlJiAzoKcZ2xp+xuXCffhubVdt0NJlTZqkeRuERy7g8Cw==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.2.9.tgz",
+ "integrity": "sha512-ok8IQjcEPs1AKZfuEUznVBrJw+gK4soq+bx8b1X2XoMqVClarc1q5JDmVtWXY1xfr6ZuHTAsPXHTgTrqKTZeww==",
"cpu": [
"arm64"
],
@@ -1144,9 +1125,9 @@
}
},
"node_modules/@rolldown/binding-win32-x64-msvc": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.5.tgz",
- "integrity": "sha512-e/SXpgISz+IoqVcSSI0rx/d/he8zqLex+/rCWpnHpmVfmPIUjag9H6P7zotf0gJHwPUhQxZ/mF8tr6acebT9yw==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.2.9.tgz",
+ "integrity": "sha512-Ip2mXoU0hM0boq3Rf+ekuT653OROSo6aSYcPT1VHE4q52KvyxgFkQgrgb/IEsxOuvQ2fZZbs8khJAyCEPM24/g==",
"cpu": [
"x64"
],
@@ -1191,9 +1172,9 @@
}
},
"node_modules/@rollup/rollup-linux-x64-gnu": {
- "version": "4.63.1",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.63.1.tgz",
- "integrity": "sha512-gfI5T24WLLuFfSKw7Go/zDXjAAV0fny0swTaDv+WjK7vqcw4cRhFfdsyKL1n+ukI+ooBxn3bVQnyrn06WpI50w==",
+ "version": "4.63.3",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.63.3.tgz",
+ "integrity": "sha512-SXagRwnI2Wlwlitllu59UK/nGVbD1CKPcNqDplHwIC4BqJcpXFjD32d1R/RbuISa95HdQrZM3/7v4bKiowFaLA==",
"cpu": [
"x64"
],
@@ -1706,9 +1687,9 @@
}
},
"node_modules/alpinejs": {
- "version": "3.16.3",
- "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.16.3.tgz",
- "integrity": "sha512-kLIO2JOPs5ZY3mHPH+CHHPzp89Y6Gb2luLRy+RDIb1oG9y6N5Vfc75kkEoaSOPhJqvakuPiAsnd9paNPNSZyVg==",
+ "version": "3.17.3",
+ "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.17.3.tgz",
+ "integrity": "sha512-hIfoRTBBeHMeMu6gXuKwwNoY6pJ7bwpZ91dXVrqRhUhHFOyGr4S21sUYqbxPY5Cnjo0RAmPZVRRZw1becRyV0Q==",
"license": "MIT",
"dependencies": {
"@vue/reactivity": "~3.5.40"
@@ -1910,9 +1891,9 @@
}
},
"node_modules/baseline-browser-mapping": {
- "version": "2.11.18",
- "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.18.tgz",
- "integrity": "sha512-1iEmLEYSiE1SeBoAfPo/Mnx3PzfzHUkDK61ASkCpuk3YXugYLH5DYK1SzqV55F8FMI6s0F+/tCP7Polz1QRjxw==",
+ "version": "2.11.25",
+ "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.25.tgz",
+ "integrity": "sha512-gMmEShwwq7FJqMwvfRwvCl00v4kN+KOfJqXn+f4nrufak5gNHJOksd/60Dvjuz7sI8Y5WiSFBa8FEYr+zoyqCw==",
"dev": true,
"license": "Apache-2.0",
"bin": {
@@ -1962,9 +1943,9 @@
}
},
"node_modules/browserslist": {
- "version": "4.28.8",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.8.tgz",
- "integrity": "sha512-V2NpofLblG64mfOtSgDhOJESZEGogzDMBv/q+W6oc4LXWP/q75eOXoOaaOu1EOadB9U4Bwx/e0yzbvwKH8zalA==",
+ "version": "4.29.0",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.29.0.tgz",
+ "integrity": "sha512-3GSvyjvDI4Dur1Meg2BekJquu5uF+9R9a1+5M1Mde192eZoXbeXjzgOsgqPS2V8D5wrrip0gR5Hf/GhWQ9ZzaA==",
"dev": true,
"funding": [
{
@@ -1982,11 +1963,11 @@
],
"license": "MIT",
"dependencies": {
- "baseline-browser-mapping": "^2.11.12",
- "caniuse-lite": "^1.0.30001809",
- "electron-to-chromium": "^1.5.402",
- "node-releases": "^2.0.53",
- "update-browserslist-db": "^1.3.0"
+ "baseline-browser-mapping": "^2.11.23",
+ "caniuse-lite": "^1.0.30001810",
+ "electron-to-chromium": "^1.5.427",
+ "node-releases": "^2.0.55",
+ "update-browserslist-db": "^1.3.3"
},
"bin": {
"browserslist": "cli.js"
@@ -2025,16 +2006,6 @@
"qified": "^0.10.1"
}
},
- "node_modules/cacheable/node_modules/keyv": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
- "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@keyv/serialize": "^1.1.1"
- }
- },
"node_modules/call-bind": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
@@ -2093,9 +2064,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001809",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001809.tgz",
- "integrity": "sha512-xxWVywk6a6Arlk+hymeycyn/VgqEfLDxupvhH/xiY5SJ/18kmi9o6MiO320DCUzypORHLtvh0I4i04tUhCNHNQ==",
+ "version": "1.0.30001810",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001810.tgz",
+ "integrity": "sha512-TITQPUkaz+aVk5GL6NhOdwk1aEaNTSDPsGFWrTuhKGtjTF70jL/Oht2W4c6rXUe5fu7Ie19VIahAXHIIiWWNeg==",
"dev": true,
"funding": [
{
@@ -2241,9 +2212,9 @@
"license": "MIT"
},
"node_modules/colord": {
- "version": "2.9.3",
- "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
- "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.10.0.tgz",
+ "integrity": "sha512-AidJptpBJmjTclAp9BkLwJi0T93fo5epJnbaZslpg6QVzpHjAiveF55mE9AcUJiGMqRHgMDY8soMsQtuNYMHfw==",
"dev": true,
"license": "MIT"
},
@@ -2548,9 +2519,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.5.412",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.412.tgz",
- "integrity": "sha512-z4rMe3esBzlzovKHj4gxJnsCGZRK5l4baUvm+gCGJBPE+gsyUMKsuU9tnEUtI1dOebXz1ytAPGjvXhmQ7rIPwA==",
+ "version": "1.5.433",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.433.tgz",
+ "integrity": "sha512-5lCAbyZBjtmUt/RAGHRqrL2q0oEFRThDAsZHHDn9XHa89Qw7gMYOeSicBTy+AHfvo0r6vwsZvqNJTQIQy1BLzA==",
"dev": true,
"license": "ISC"
},
@@ -2773,9 +2744,9 @@
}
},
"node_modules/eslint": {
- "version": "10.9.1",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.9.1.tgz",
- "integrity": "sha512-9VaAkDURekixUQJy0oJYl2DcN6oKMfxay7XzaGYAWQwsb6qfKf+x76R2k1L8kb1boc+FyCAaTA9GmiKaaiaF+A==",
+ "version": "10.11.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.11.0.tgz",
+ "integrity": "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ==",
"dev": true,
"license": "MIT",
"workspaces": [
@@ -2787,7 +2758,7 @@
"@eslint/config-array": "^0.23.5",
"@eslint/config-helpers": "^0.7.0",
"@eslint/core": "^1.2.1",
- "@eslint/plugin-kit": "^0.7.2",
+ "@eslint/plugin-kit": "^0.7.3",
"@humanfs/node": "^0.16.6",
"@humanwhocodes/module-importer": "^1.0.1",
"@humanwhocodes/retry": "^0.4.2",
@@ -2802,7 +2773,7 @@
"esquery": "^1.7.0",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
- "file-entry-cache": "^8.0.0",
+ "file-entry-cache": "11.1.5 || >11.1.6 <12",
"find-up": "^5.0.0",
"glob-parent": "^6.0.2",
"ignore": "^5.2.0",
@@ -3041,16 +3012,13 @@
}
},
"node_modules/file-entry-cache": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
- "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+ "version": "11.1.5",
+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz",
+ "integrity": "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==",
"dev": true,
"license": "MIT",
"dependencies": {
- "flat-cache": "^4.0.0"
- },
- "engines": {
- "node": ">=16.0.0"
+ "flat-cache": "^6.1.23"
}
},
"node_modules/fill-range": {
@@ -3096,17 +3064,15 @@
}
},
"node_modules/flat-cache": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
- "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+ "version": "6.1.23",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.23.tgz",
+ "integrity": "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "flatted": "^3.2.9",
- "keyv": "^4.5.4"
- },
- "engines": {
- "node": ">=16"
+ "cacheable": "^2.5.0",
+ "flatted": "^3.4.2",
+ "hookified": "^1.15.0"
}
},
"node_modules/flatpickr": {
@@ -3116,9 +3082,9 @@
"license": "MIT"
},
"node_modules/flatted": {
- "version": "3.4.2",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
- "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
+ "version": "3.4.4",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.4.tgz",
+ "integrity": "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==",
"dev": true,
"license": "ISC"
},
@@ -3322,9 +3288,9 @@
}
},
"node_modules/globals": {
- "version": "17.11.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-17.11.0.tgz",
- "integrity": "sha512-Z2I8hM+PbJDXQDq3Icgpzv+mPdwr68iZUU9d5WW4FuXfDUQfkZaZuvjMv42/5crNyw154+9+VWXbYrUgDXbxNw==",
+ "version": "17.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-17.12.0.tgz",
+ "integrity": "sha512-cezEd/DTyyht9cvSSURyygXPfy04GtWO/5e6ZPvH7fCtjKz9PYOmuawphw1Ctd1f6C+5JypXfGD7ahNMXvevBA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -4143,13 +4109,6 @@
"js-yaml": "bin/js-yaml.js"
}
},
- "node_modules/json-buffer": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
- "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/json-parse-even-better-errors": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -4172,13 +4131,13 @@
"license": "MIT"
},
"node_modules/keyv": {
- "version": "4.5.4",
- "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
- "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+ "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "json-buffer": "3.0.1"
+ "@keyv/serialize": "^1.1.1"
}
},
"node_modules/kind-of": {
@@ -4690,9 +4649,9 @@
"license": "MIT"
},
"node_modules/node-releases": {
- "version": "2.0.53",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.53.tgz",
- "integrity": "sha512-D9UOmYG3UH1V+ENW56t5QXBwJw1YEY18ruVeus89Rw+SyIgjPkCO84bRzO3uNIYosJbNwiabWVn48o3uJLjxFQ==",
+ "version": "2.0.56",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.56.tgz",
+ "integrity": "sha512-x0InOIyzgdk+eyaWaRJFH5snEtiImgBgblZ2CyPrLmqqcuMQkEvcDPHbzqbD8eDsSeJbVOjn+crzyzHaM4D+/A==",
"dev": true,
"license": "MIT",
"engines": {
@@ -4923,9 +4882,9 @@
"license": "ISC"
},
"node_modules/picomatch": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
- "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
+ "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
"dev": true,
"license": "MIT",
"engines": {
@@ -4945,9 +4904,9 @@
}
},
"node_modules/postcss": {
- "version": "8.5.26",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.26.tgz",
- "integrity": "sha512-u82N74LFzG8ca+dD8puPnplTXoGH4fTPpVGuIbt36G3qvNlkvfD0lEAZSxaly3KX8TS/L1A1gsCEmvKmBcVbkQ==",
+ "version": "8.5.28",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz",
+ "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==",
"dev": true,
"funding": [
{
@@ -4965,7 +4924,7 @@
],
"license": "MIT",
"dependencies": {
- "nanoid": "^3.3.17",
+ "nanoid": "^3.3.18",
"picocolors": "^1.1.1",
"source-map-js": "^1.2.1"
},
@@ -5055,9 +5014,9 @@
}
},
"node_modules/prettier": {
- "version": "3.9.6",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.6.tgz",
- "integrity": "sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==",
+ "version": "3.9.8",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.8.tgz",
+ "integrity": "sha512-WRFq3Wn3WId7LLROfMLdH7xaFr2jR62wU8nLO6rQUOLOxNZUviyJQs1M0iIhLexSFy+L+w0ch66wtoO2jRjG0A==",
"dev": true,
"license": "MIT",
"bin": {
@@ -5101,9 +5060,9 @@
"license": "MIT"
},
"node_modules/query-string": {
- "version": "9.5.0",
- "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.5.0.tgz",
- "integrity": "sha512-YlJmwNyi0RGYjlxYcuDncMsxFU7YyutbuI7gTm8ySxIGBlwx5yiBCOD5ig9ZNoHkawk/1Dey0N5mEfcUybMVAA==",
+ "version": "9.5.1",
+ "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.5.1.tgz",
+ "integrity": "sha512-/zO3RwuRCMTIcEgq6YMv4OrtEE1XzBG7w5N6zc6ydYnkWYOWsnLI/5894hYEzfESfMOT4cHCsRTIdxsSl1KjGg==",
"license": "MIT",
"dependencies": {
"decode-uri-component": "^0.5.0",
@@ -5244,13 +5203,13 @@
}
},
"node_modules/rolldown": {
- "version": "1.2.5",
- "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.5.tgz",
- "integrity": "sha512-VD2IE5PUG4Oj8zz2VGykiYd5wbnjdIiSsNQb8Qu5B+noEp+A78mu2iVvpp27g8es14Tk9rofNs5Tku9iQCS4fA==",
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.9.tgz",
+ "integrity": "sha512-hx/Pv0N1haXRb11qkfnK5MXB/iqr7i0yjWQqmO9uHqZpBgQSqzc8UsSnEpalsh+j1I8qQ2CkXAkJC8Br3dKSlg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@oxc-project/types": "=0.146.0",
+ "@oxc-project/types": "=0.150.0",
"@rolldown/pluginutils": "^1.0.0"
},
"bin": {
@@ -5260,21 +5219,21 @@
"node": "^20.19.0 || >=22.12.0"
},
"optionalDependencies": {
- "@rolldown/binding-android-arm-eabi": "1.2.5",
- "@rolldown/binding-android-arm64": "1.2.5",
- "@rolldown/binding-darwin-arm64": "1.2.5",
- "@rolldown/binding-darwin-x64": "1.2.5",
- "@rolldown/binding-freebsd-x64": "1.2.5",
- "@rolldown/binding-linux-arm-gnueabihf": "1.2.5",
- "@rolldown/binding-linux-arm64-gnu": "1.2.5",
- "@rolldown/binding-linux-arm64-musl": "1.2.5",
- "@rolldown/binding-linux-ppc64-gnu": "1.2.5",
- "@rolldown/binding-linux-s390x-gnu": "1.2.5",
- "@rolldown/binding-linux-x64-gnu": "1.2.5",
- "@rolldown/binding-linux-x64-musl": "1.2.5",
- "@rolldown/binding-openharmony-arm64": "1.2.5",
- "@rolldown/binding-win32-arm64-msvc": "1.2.5",
- "@rolldown/binding-win32-x64-msvc": "1.2.5"
+ "@rolldown/binding-android-arm-eabi": "1.2.9",
+ "@rolldown/binding-android-arm64": "1.2.9",
+ "@rolldown/binding-darwin-arm64": "1.2.9",
+ "@rolldown/binding-darwin-x64": "1.2.9",
+ "@rolldown/binding-freebsd-x64": "1.2.9",
+ "@rolldown/binding-linux-arm-gnueabihf": "1.2.9",
+ "@rolldown/binding-linux-arm64-gnu": "1.2.9",
+ "@rolldown/binding-linux-arm64-musl": "1.2.9",
+ "@rolldown/binding-linux-ppc64-gnu": "1.2.9",
+ "@rolldown/binding-linux-s390x-gnu": "1.2.9",
+ "@rolldown/binding-linux-x64-gnu": "1.2.9",
+ "@rolldown/binding-linux-x64-musl": "1.2.9",
+ "@rolldown/binding-openharmony-arm64": "1.2.9",
+ "@rolldown/binding-win32-arm64-msvc": "1.2.9",
+ "@rolldown/binding-win32-x64-msvc": "1.2.9"
}
},
"node_modules/rollup-plugin-visualizer": {
@@ -5594,9 +5553,9 @@
}
},
"node_modules/smartphoto": {
- "version": "2.1.8",
- "resolved": "https://registry.npmjs.org/smartphoto/-/smartphoto-2.1.8.tgz",
- "integrity": "sha512-gs4nGn9WqJUGgk5D88Rm/QTXw6YaWFertMsuh9Ag6OsBn6mt+myugyFjIchzI/E4/9z1syo/72aZ2ib8rb8qLA==",
+ "version": "2.1.17",
+ "resolved": "https://registry.npmjs.org/smartphoto/-/smartphoto-2.1.17.tgz",
+ "integrity": "sha512-/o1jEptLBULUD4PY6qV0+UlpW2NTQPItnoKgbv5wYqwtbSoHCyBX20PYFxsq1kh8Lm9PfddjbzdImRJjLWHeMQ==",
"license": "MIT"
},
"node_modules/source-map": {
@@ -5729,9 +5688,9 @@
}
},
"node_modules/stylelint": {
- "version": "17.14.1",
- "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-17.14.1.tgz",
- "integrity": "sha512-xVQwyiuxALUBNB2fBe0tmNemg9KqLtdj3T64mioFDar79B2cU8LIyz+3KL6LdiHs9NkeNfwxpKSaIVOY8f112g==",
+ "version": "17.15.0",
+ "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-17.15.0.tgz",
+ "integrity": "sha512-mWIkesYQvQjf4Kvdeu9ns0IL8/K/wtjaGxPqsPd6DlLZvaQxGysJsocxUDrBcyHQ5VleAk4uSMat4yMrVED7PA==",
"dev": true,
"funding": [
{
@@ -5745,14 +5704,14 @@
],
"license": "MIT",
"dependencies": {
- "@csstools/css-calc": "^3.2.1",
+ "@csstools/css-calc": "^3.3.0",
"@csstools/css-parser-algorithms": "^4.0.0",
- "@csstools/css-syntax-patches-for-csstree": "^1.1.6",
+ "@csstools/css-syntax-patches-for-csstree": "^1.1.9",
"@csstools/css-tokenizer": "^4.0.0",
"@csstools/media-query-list-parser": "^5.0.0",
- "@csstools/selector-resolve-nested": "^4.0.0",
+ "@csstools/selector-resolve-nested": "^4.0.1",
"@csstools/selector-specificity": "^6.0.0",
- "colord": "^2.9.3",
+ "colord": "^2.10.0",
"cosmiconfig": "^9.0.2",
"css-functions-list": "^3.3.3",
"css-tree": "^3.2.1",
@@ -5761,21 +5720,21 @@
"fastest-levenshtein": "^1.0.16",
"file-entry-cache": "^11.1.5",
"global-modules": "^2.0.0",
- "globby": "^16.2.1",
+ "globby": "^16.2.4",
"globjoin": "^0.1.4",
"html-tags": "^5.1.0",
- "ignore": "^7.0.5",
+ "ignore": "^7.0.6",
"import-meta-resolve": "^4.2.0",
"mathml-tag-names": "^4.0.0",
"meow": "^14.1.0",
"micromatch": "^4.0.8",
"normalize-path": "^3.0.0",
"picocolors": "^1.1.1",
- "postcss": "^8.5.16",
+ "postcss": "^8.5.26",
"postcss-safe-parser": "^7.0.1",
- "postcss-selector-parser": "^7.1.4",
+ "postcss-selector-parser": "^7.1.5",
"postcss-value-parser": "^4.2.0",
- "string-width": "^8.2.1",
+ "string-width": "^8.2.2",
"supports-hyperlinks": "^4.5.0",
"svg-tags": "^1.0.0",
"table": "^6.9.0",
@@ -5866,9 +5825,9 @@
}
},
"node_modules/stylelint/node_modules/@csstools/selector-resolve-nested": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-4.0.0.tgz",
- "integrity": "sha512-9vAPxmp+Dx3wQBIUwc1v7Mdisw1kbbaGqXUM8QLTgWg7SoPGYtXBsMXvsFs/0Bn5yoFhcktzxNZGNaUt0VjgjA==",
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-4.0.1.tgz",
+ "integrity": "sha512-j3vdQu0XwLME5qOTWxm8cnmvsf423R2YL6DbKklCHZwkDm7UdKNu6RPlw4REIJhSlKBICY3B70/7QZdicLqZgg==",
"dev": true,
"funding": [
{
@@ -5912,9 +5871,9 @@
}
},
"node_modules/stylelint/node_modules/ansi-regex": {
- "version": "6.2.2",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
- "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.3.0.tgz",
+ "integrity": "sha512-WpDfL7NO6j7tH88IDBNVdUJxDh9nmCteAVW9dsep846XdwF4naCBK+/tGLX3KJgcpgMRXCFlTM2hKGoK9FsdrQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -5924,32 +5883,10 @@
"url": "https://github.com/chalk/ansi-regex?sponsor=1"
}
},
- "node_modules/stylelint/node_modules/file-entry-cache": {
- "version": "11.1.5",
- "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz",
- "integrity": "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "flat-cache": "^6.1.23"
- }
- },
- "node_modules/stylelint/node_modules/flat-cache": {
- "version": "6.1.23",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.23.tgz",
- "integrity": "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "cacheable": "^2.5.0",
- "flatted": "^3.4.2",
- "hookified": "^1.15.0"
- }
- },
"node_modules/stylelint/node_modules/ignore": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
- "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+ "version": "7.0.9",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.9.tgz",
+ "integrity": "sha512-brTTsvFRt5C1gGHtPst/281UjPD5t9fBqbgoMPlVWy11ZLTPfu7HxK4ZYqO9H7o/yC9rSTCI85EaQ4OoY12qYw==",
"dev": true,
"license": "MIT",
"engines": {
@@ -5971,9 +5908,9 @@
}
},
"node_modules/stylelint/node_modules/string-width": {
- "version": "8.2.1",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz",
- "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==",
+ "version": "8.2.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz",
+ "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -6250,9 +6187,9 @@
}
},
"node_modules/update-browserslist-db": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.1.tgz",
- "integrity": "sha512-ZZ61DsRsOnakl74HAmp3oSN4aXUmEWXf+i/yv0h7tIBfICc3VdrFErQKUUKPgu3AMsTUMbcongALEN4l6GSUrQ==",
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz",
+ "integrity": "sha512-pJ2sYawQS0R/WI928Gj5GlPhTGzbMelq0+4INtSYNDV9ErKJcX6xjGWkoG/VnB3dpUm00zALaqkrUD77pO5TDQ==",
"dev": true,
"funding": [
{
@@ -6298,16 +6235,16 @@
"license": "MIT"
},
"node_modules/vite": {
- "version": "8.2.2",
- "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.2.tgz",
- "integrity": "sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q==",
+ "version": "8.3.0",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.0.tgz",
+ "integrity": "sha512-lhZBVvEHefgE+HQZC9O7EBJgCU/nVzFNl7vkS4RE0APtWLP02/8QVIkQtzBxPquh7lq5/78NHipTj7ODQ6XuyQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"lightningcss": "^1.33.0",
- "picomatch": "^4.0.5",
- "postcss": "^8.5.26",
- "rolldown": "~1.2.4",
+ "picomatch": "^4.0.7",
+ "postcss": "^8.5.28",
+ "rolldown": "~1.2.6",
"tinyglobby": "^0.2.17"
},
"bin": {
@@ -6324,7 +6261,7 @@
},
"peerDependencies": {
"@types/node": "^20.19.0 || >=22.12.0",
- "@vitejs/devtools": "^0.4.0 || ^0.5.0",
+ "@vitejs/devtools": "^0.7.1",
"esbuild": "^0.27.0 || ^0.28.0",
"jiti": ">=1.21.0",
"less": "^4.0.0",
diff --git a/themes/develop/package.json b/themes/develop/package.json
index 6f6a89b..2ef81d2 100644
--- a/themes/develop/package.json
+++ b/themes/develop/package.json
@@ -1,6 +1,6 @@
{
"name": "develop",
- "version": "1.1.6",
+ "version": "1.1.7",
"description": "Webサイト制作プロジェクト",
"type": "module",
"main": "index.js",
@@ -25,26 +25,26 @@
"@tailwindcss/typography": "^0.5.20",
"@tailwindcss/vite": "^4.3.3",
"@zackad/prettier-plugin-twig": "^0.17.0",
- "browserslist": "^4.28.8",
- "eslint": "^10.9.1",
- "globals": "^17.11.0",
- "prettier": "^3.9.6",
+ "browserslist": "^4.29.0",
+ "eslint": "^10.11.0",
+ "globals": "^17.12.0",
+ "prettier": "^3.9.8",
"rollup-plugin-visualizer": "^7.1.1",
- "stylelint": "^17.14.1",
+ "stylelint": "^17.15.0",
"stylelint-config-recess-order": "^7.8.0",
"stylelint-config-standard": "^40.0.0",
"stylelint-order": "^8.1.1",
"tailwindcss": "^4.2.4",
- "vite": "^8.2.2",
+ "vite": "^8.3.0",
"vite-plugin-eslint2": "^5.3.0",
"vite-plugin-static-copy": "^4.1.1",
"vite-plugin-stylelint": "^6.3.0"
},
"dependencies": {
- "@ablogcms/pdf": "^3.2.29",
- "@ablogcms/validator": "^3.2.29",
+ "@ablogcms/pdf": "^3.2.35",
+ "@ablogcms/validator": "^3.2.35",
"a-dispatcher": "^1.0.1",
- "alpinejs": "^3.16.3",
+ "alpinejs": "^3.17.3",
"document-outliner": "^1.1.3",
"dom-content-loaded": "^1.0.2",
"flatpickr": "^4.6.13",
@@ -53,12 +53,12 @@
"leaflet": "^1.9.4",
"leaflet-gesture-handling": "^1.2.2",
"modal-video": "^2.4.8",
- "query-string": "^9.5.0",
+ "query-string": "^9.5.1",
"scroll-hint": "^1.2.9",
- "smartphoto": "^2.1.8"
+ "smartphoto": "^2.1.17"
},
"optionalDependencies": {
- "@rollup/rollup-linux-x64-gnu": "4.63.1",
+ "@rollup/rollup-linux-x64-gnu": "4.63.3",
"@tailwindcss/oxide-linux-x64-gnu": "^4.2.4",
"lightningcss-linux-x64-gnu": "^1.33.0"
}
diff --git a/themes/develop/src/js/admin.js b/themes/develop/src/js/admin.js
index 92ffbca..209ff84 100644
--- a/themes/develop/src/js/admin.js
+++ b/themes/develop/src/js/admin.js
@@ -1,4 +1,3 @@
/**
- * スタイルの読み込み
+ * 管理画面用のJavaScript
*/
-import '../style/editor.css';
diff --git a/themes/develop/src/js/main.js b/themes/develop/src/js/main.js
index 9b6b0d5..b6adc6e 100755
--- a/themes/develop/src/js/main.js
+++ b/themes/develop/src/js/main.js
@@ -77,14 +77,6 @@ async function main() {
window.dispatch = createBuildInJsDispatcher();
if (window.ACMS === undefined) {
window.dispatch(document);
- // htmx (htmx_load_strategy: static) でスワップされたコンテンツに対しても組み込みJSを
- // 再初期化する。ACMS読み込み時は window.dispatch === ACMS.Dispatch であり、コア側の
- // afterSwap リスナー(main.php)がそちらを呼ぶため、ここでは未読込時のみ実行して二重初期化を避ける。
- window.addEventListener('htmx:afterSwap', (event) => {
- if (event.target instanceof HTMLElement) {
- window.dispatch(event.target);
- }
- });
}
/**
diff --git a/themes/develop/src/style/editor.css b/themes/develop/src/style/editor.css
index e8f603d..13ae9e1 100644
--- a/themes/develop/src/style/editor.css
+++ b/themes/develop/src/style/editor.css
@@ -10,3 +10,41 @@
@plugin "@tailwindcss/typography";
@config '../../tailwind.config.js';
+
+/* ------------------------------
+ 埋め込みカード(埋め込みユニット・埋め込みブロック共通):md 以上で横並びにする
+ ------------------------------ */
+/* stylelint-disable-next-line media-query-no-invalid */
+@media (width >= theme(--breakpoint-md)) {
+ .prose :where([class*='column-embed'] .acms-embed-link, [data-type='embedBlock'] .embed-block-card) {
+ display: flex;
+ }
+
+ .prose :where([class*='column-embed'] .acms-embed-link-image-container) {
+ flex: none;
+ width: calc(100% / 3);
+ }
+
+ .prose :where([class*='column-embed'] .acms-embed-link-image-container img) {
+ height: 100%;
+ object-fit: cover;
+ }
+
+ .prose :where([data-type='embedBlock'] .embed-block-card > img) {
+ flex: none;
+ width: calc(100% / 3);
+ object-fit: cover;
+ }
+
+ .prose :where([class*='column-embed'] .acms-embed-link-content, [data-type='embedBlock'] .embed-block-card-content) {
+ width: calc(100% / 3 * 2);
+ }
+}
+
+/* ------------------------------
+ 本文の埋め込みコンテンツ(ブロックエディターのプレビュー用)
+ ------------------------------ */
+:where(acms-isolated-preview-root) :where(iframe, video, object, embed) {
+ box-sizing: border-box; /* 枠線を含めて本文幅に収める */
+ max-width: 100%;
+}
diff --git a/themes/develop/stylelint.config.js b/themes/develop/stylelint.config.js
index 68d89f4..3f8aa5f 100644
--- a/themes/develop/stylelint.config.js
+++ b/themes/develop/stylelint.config.js
@@ -1,41 +1,16 @@
+/** tailwindcss v4 の at-rule */
+const tailwindAtRules = ['theme', 'source', 'utility', 'variant', 'custom-variant', 'plugin', 'apply', 'config'];
+
/** @type {import('stylelint').Config} */
export default {
extends: ['stylelint-config-standard', 'stylelint-config-recess-order'],
rules: {
'no-descending-specificity': null,
'import-notation': null,
- 'at-rule-no-unknown': [
- true,
- {
- ignoreAtRules: [
- /** tailwindcss v4 */
- 'theme',
- 'source',
- 'utility',
- 'variant',
- 'custom-variant',
- 'plugin',
- 'apply',
- 'config',
- ],
- },
- ],
- 'at-rule-no-deprecated': [
- true,
- {
- ignoreAtRules: [
- /** tailwindcss v4 */
- 'theme',
- 'source',
- 'utility',
- 'variant',
- 'custom-variant',
- 'plugin',
- 'apply',
- 'config',
- ],
- },
- ],
+ 'at-rule-no-unknown': [true, { ignoreAtRules: tailwindAtRules }],
+ 'at-rule-no-deprecated': [true, { ignoreAtRules: tailwindAtRules }],
+ // @apply のユーティリティクラス列は CSS の構文として解釈できないため除外する
+ 'at-rule-prelude-no-invalid': [true, { ignoreAtRules: tailwindAtRules }],
'function-no-unknown': [
true,
{
diff --git a/themes/develop/tailwind.config.js b/themes/develop/tailwind.config.js
index 6d1bfe3..f556227 100644
--- a/themes/develop/tailwind.config.js
+++ b/themes/develop/tailwind.config.js
@@ -204,12 +204,13 @@ module.exports = {
// ------------------------------
// 埋め込みカード
// ------------------------------
- "[class*='column-embed']": {
+ "[class*='column-embed'], [data-type='embedBlock']": {
// Align with media/figure rhythm: 32px -> 2em
marginTop: em(32, 16),
marginBottom: em(32, 16),
},
- "[class*='column-embed'] .acms-embed-link": {
+ "[class*='column-embed'] .acms-embed-link, [data-type='embedBlock'] .embed-block-card": {
+ position: 'relative',
overflow: 'hidden',
display: 'block',
padding: '0',
@@ -223,24 +224,15 @@ module.exports = {
textDecoration: 'none',
transitionProperty: 'opacity',
},
- [`@media (min-width: ${theme('breakpoint.md')})`]: {
- "[class*='column-embed'] .acms-embed-link": {
- display: 'flex',
- transitionProperty: 'opacity',
- },
- "[class*='column-embed'] .acms-embed-link-image-container": {
- width: '33.333333%',
- flex: 'none',
- },
- "[class*='column-embed'] .acms-embed-link-image-container img": {
- height: '100%',
- objectFit: 'cover',
- },
- "[class*='column-embed'] .acms-embed-link-content": {
- width: '66.666667%',
- },
+ // カードの画像の角丸を打ち消す
+ "[data-type='embedBlock'] .embed-block-card > img": {
+ display: 'block',
+ width: '100%',
+ margin: '0',
+ borderRadius: '0',
},
- "[class*='column-embed'] .acms-embed-link:hover": {
+ // md 以上でカードを横並びにする指定は src/style/editor.css にある
+ "[class*='column-embed'] .acms-embed-link:hover, [data-type='embedBlock'] .embed-block-card:hover": {
opacity: '0.7',
},
"[class*='column-embed'] .acms-embed-link-image-container": {
@@ -251,14 +243,49 @@ module.exports = {
width: '100%',
margin: '0',
},
- "[class*='column-embed'] .acms-embed-link-content": {
+ "[data-type='embedBlock'] .embed-block-card-title, [data-type='embedBlock'] .embed-block-card-provider": {
+ display: 'block',
+ },
+ "[data-type='embedBlock'] a.embed-block-card-title::before": {
+ content: '""',
+ position: 'absolute',
+ inset: '0',
+ },
+ // キーボード操作時のフォーカスの枠をカード全体に出す
+ "[data-type='embedBlock'] a.embed-block-card-title:focus-visible": {
+ outline: 'none',
+ },
+ "[data-type='embedBlock'] .embed-block-card:has(a.embed-block-card-title:focus-visible)": {
+ outline: 'auto 1px',
+ outlineColor: '-webkit-focus-ring-color',
+ outlineOffset: '1px',
+ },
+ // 埋め込みブロックの figure の余白を打ち消す
+ "[data-type='embedBlock'] > figure": {
+ marginTop: '0',
+ marginBottom: '0',
+ },
+ // 中央・右揃えでは、figure(表示サイズまで広がる)より狭い埋め込み(X のウィジェット等)も同じ向きに寄せる。
+ // Why not 子要素に margin-inline: auto: Instagram 等は margin をインラインで指定しており上書きできない
+ ":where([data-type='embedBlock'][data-align='center'], [data-type='embedBlock'][data-align='right']) [data-embed-content]":
+ {
+ display: 'flex',
+ flexDirection: 'column',
+ },
+ ":where([data-type='embedBlock'][data-align='center']) [data-embed-content]": {
+ alignItems: 'center',
+ },
+ ":where([data-type='embedBlock'][data-align='right']) [data-embed-content]": {
+ alignItems: 'flex-end',
+ },
+ "[class*='column-embed'] .acms-embed-link-content, [data-type='embedBlock'] .embed-block-card-content": {
display: 'flex',
flexDirection: 'column',
maxWidth: 'none',
padding: '2em',
backgroundColor: 'var(--color-white)',
},
- "[class*='column-embed'] .acms-embed-link-title": {
+ "[class*='column-embed'] .acms-embed-link-title, [data-type='embedBlock'] .embed-block-card-title": {
marginBottom: '.375em',
marginTop: '0',
fontSize: 'var(--text-base)',
@@ -267,7 +294,7 @@ module.exports = {
color: 'var(--color-gray-700)',
textDecoration: 'none',
},
- "[class*='column-embed'] .acms-embed-link-site-name": {
+ "[class*='column-embed'] .acms-embed-link-site-name, [data-type='embedBlock'] .embed-block-card-provider": {
order: '-1',
padding: '0',
marginTop: '0',
@@ -275,13 +302,14 @@ module.exports = {
color: 'var(--color-gray-700)',
fontSize: 'var(--text-sm)',
},
- "[class*='column-embed'] .acms-embed-link-description": {
- padding: '0',
- margin: '0',
- fontSize: 'var(--text-xs)',
- color: 'var(--color-gray-500)',
- lineHeight: 'var(--leading-relaxed)',
- },
+ "[class*='column-embed'] .acms-embed-link-description, [data-type='embedBlock'] .embed-block-card-description":
+ {
+ padding: '0',
+ margin: '0',
+ fontSize: 'var(--text-xs)',
+ color: 'var(--color-gray-500)',
+ lineHeight: 'var(--leading-relaxed)',
+ },
// ------------------------------
// カラムレイアウト
@@ -299,6 +327,41 @@ module.exports = {
gridTemplateColumns: 'repeat(3, minmax(0, 1fr))',
},
+ // ------------------------------
+ // グループ
+ // ------------------------------
+ "[data-type='group']": {
+ boxSizing: 'border-box',
+ marginTop: em(32, 16),
+ marginBottom: em(32, 16),
+ },
+ // 先頭・末尾の子ブロックの余白を打ち消す
+ "[data-type='group'] > :first-child": {
+ marginTop: '0',
+ },
+ "[data-type='group'] > :last-child": {
+ marginBottom: '0',
+ },
+ // カラーパレットで背景色を付けたグループの内側の余白
+ "[data-type='group'][style*='background-color']": {
+ padding: em(24, 16),
+ },
+
+ // ------------------------------
+ // 本文の埋め込みコンテンツ(iframe・video・object・embed)
+ // ------------------------------
+ // 本文より広いときは幅を縮める
+ 'iframe, video, object, embed': {
+ boxSizing: 'border-box', // 枠線を含めて本文幅に収める
+ maxWidth: '100%',
+ },
+ // 前後の余白(外枠が余白を持つ埋め込みブロック・配置(align-*)の中は除く)
+ ":is(iframe, video, object, embed):not(:is([data-type='embedBlock'], [class^='align-'], [class*=' align-']) *)":
+ {
+ marginTop: em(32, 16),
+ marginBottom: em(32, 16),
+ },
+
// ------------------------------
// 配置
// ------------------------------
diff --git a/themes/develop/vite.config.js b/themes/develop/vite.config.js
index d643d10..9f91813 100644
--- a/themes/develop/vite.config.js
+++ b/themes/develop/vite.config.js
@@ -65,6 +65,8 @@ export default defineConfig(({ command, mode }) => ({
input: {
bundle: resolve(import.meta.dirname, 'src/js/main.js'),
admin: resolve(import.meta.dirname, 'src/js/admin.js'),
+ // 管理画面の editor-css から CSS 単体のエントリーとして読み込む(admin.html 参照)
+ editor: resolve(import.meta.dirname, 'src/style/editor.css'),
},
output: {
manualChunks(id) {