diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bcba7d6e703..8732abbaa64 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,19 +25,24 @@ jobs:
os:
- ubuntu-latest
rails:
+ - rails_80
- rails_72
- rails_71
- rails_70
+ exclude:
+ - ruby: '3.1'
+ os: ubuntu-latest
+ rails: rails_80
steps:
- uses: actions/checkout@v4
- name: Configure bundler (default)
run: |
echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
- if: matrix.rails == 'rails_72'
+ if: matrix.rails == 'rails_80'
- name: Configure bundler (alternative)
run: |
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.rails }}/Gemfile" >> "$GITHUB_ENV"
- if: matrix.rails != 'rails_72'
+ if: matrix.rails != 'rails_80'
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml
index aee31461632..a660dbc37a3 100644
--- a/.github/workflows/eslint.yml
+++ b/.github/workflows/eslint.yml
@@ -29,5 +29,5 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
filter_mode: nofilter # added (default), diff_context, file, nofilter
- fail_on_error: true
+ fail_level: any
reporter: github-pr-check
diff --git a/.github/workflows/github-actions-lint.yml b/.github/workflows/github-actions-lint.yml
index 83e6458c61d..bfeac0937d5 100644
--- a/.github/workflows/github-actions-lint.yml
+++ b/.github/workflows/github-actions-lint.yml
@@ -18,7 +18,7 @@ jobs:
- uses: reviewdog/action-actionlint@v1
if: steps.changed-files.outputs.any_changed == 'true'
with:
- fail_on_error: true
+ fail_level: any
filter_mode: nofilter # added (default), diff_context, file, nofilter
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-check
diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
index 66200ba71db..ed23c0a687d 100644
--- a/.github/workflows/markdown-lint.yml
+++ b/.github/workflows/markdown-lint.yml
@@ -24,6 +24,6 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
filter_mode: nofilter # added (default), diff_context, file, nofilter
- fail_on_error: true
+ fail_level: any
markdownlint_flags: ${{ env.MARKDOWNLINT_FLAGS }}
reporter: github-pr-check
diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
index 856287bf707..1e884027c17 100644
--- a/.github/workflows/rubocop.yml
+++ b/.github/workflows/rubocop.yml
@@ -37,7 +37,7 @@ jobs:
- uses: reviewdog/action-rubocop@v2
if: steps.changed-files.outputs.any_changed == 'true'
with:
- fail_on_error: true
+ fail_level: any
filter_mode: nofilter # added (default), diff_context, file, nofilter
github_token: ${{ secrets.GITHUB_TOKEN }}
skip_install: true
diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
index 30930e84187..58326526b4f 100644
--- a/.github/workflows/yaml-lint.yml
+++ b/.github/workflows/yaml-lint.yml
@@ -18,7 +18,7 @@ jobs:
- uses: reviewdog/action-yamllint@v1
if: steps.changed-files.outputs.any_changed == 'true'
with:
- fail_on_error: true
+ fail_level: any
filter_mode: nofilter # added (default), diff_context, file, nofilter
github_token: ${{ secrets.GITHUB_TOKEN }}
reporter: github-pr-check
diff --git a/Gemfile b/Gemfile
index c2ccbde4fb2..2ee6627530e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ group :development, :test do
gem "draper"
gem "devise"
- gem "rails", "~> 7.2.0"
+ gem "rails", "~> 8.0.0"
gem "sprockets-rails"
gem "ransack", ">= 4.2.0"
@@ -18,9 +18,6 @@ group :development, :test do
gem "cssbundling-rails"
gem "importmap-rails"
-
- # FIXME: relax this dependency when Ruby 3.1 support will be dropped
- gem "zeitwerk", "~> 2.6.18"
end
group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 72d8328c83d..23a65acf084 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- activeadmin (4.0.0.beta14)
+ activeadmin (4.0.0.beta15)
arbre (~> 2.0)
csv
formtastic (>= 3.1)
@@ -14,70 +14,69 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- actioncable (7.2.2)
- actionpack (= 7.2.2)
- activesupport (= 7.2.2)
+ actioncable (8.0.0)
+ actionpack (= 8.0.0)
+ activesupport (= 8.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
- actionmailbox (7.2.2)
- actionpack (= 7.2.2)
- activejob (= 7.2.2)
- activerecord (= 7.2.2)
- activestorage (= 7.2.2)
- activesupport (= 7.2.2)
+ actionmailbox (8.0.0)
+ actionpack (= 8.0.0)
+ activejob (= 8.0.0)
+ activerecord (= 8.0.0)
+ activestorage (= 8.0.0)
+ activesupport (= 8.0.0)
mail (>= 2.8.0)
- actionmailer (7.2.2)
- actionpack (= 7.2.2)
- actionview (= 7.2.2)
- activejob (= 7.2.2)
- activesupport (= 7.2.2)
+ actionmailer (8.0.0)
+ actionpack (= 8.0.0)
+ actionview (= 8.0.0)
+ activejob (= 8.0.0)
+ activesupport (= 8.0.0)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
- actionpack (7.2.2)
- actionview (= 7.2.2)
- activesupport (= 7.2.2)
+ actionpack (8.0.0)
+ actionview (= 8.0.0)
+ activesupport (= 8.0.0)
nokogiri (>= 1.8.5)
- racc
- rack (>= 2.2.4, < 3.2)
+ rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
- actiontext (7.2.2)
- actionpack (= 7.2.2)
- activerecord (= 7.2.2)
- activestorage (= 7.2.2)
- activesupport (= 7.2.2)
+ actiontext (8.0.0)
+ actionpack (= 8.0.0)
+ activerecord (= 8.0.0)
+ activestorage (= 8.0.0)
+ activesupport (= 8.0.0)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.2.2)
- activesupport (= 7.2.2)
+ actionview (8.0.0)
+ activesupport (= 8.0.0)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
- activejob (7.2.2)
- activesupport (= 7.2.2)
+ activejob (8.0.0)
+ activesupport (= 8.0.0)
globalid (>= 0.3.6)
- activemodel (7.2.2)
- activesupport (= 7.2.2)
+ activemodel (8.0.0)
+ activesupport (= 8.0.0)
activemodel-serializers-xml (1.0.3)
activemodel (>= 5.0.0.a)
activesupport (>= 5.0.0.a)
builder (~> 3.1)
- activerecord (7.2.2)
- activemodel (= 7.2.2)
- activesupport (= 7.2.2)
+ activerecord (8.0.0)
+ activemodel (= 8.0.0)
+ activesupport (= 8.0.0)
timeout (>= 0.4.0)
- activestorage (7.2.2)
- actionpack (= 7.2.2)
- activejob (= 7.2.2)
- activerecord (= 7.2.2)
- activesupport (= 7.2.2)
+ activestorage (8.0.0)
+ actionpack (= 8.0.0)
+ activejob (= 8.0.0)
+ activerecord (= 8.0.0)
+ activesupport (= 8.0.0)
marcel (~> 1.0)
- activesupport (7.2.2)
+ activesupport (8.0.0)
base64
benchmark (>= 0.3)
bigdecimal
@@ -89,6 +88,7 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
+ uri (>= 0.13.1)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
arbre (2.0.2)
@@ -96,7 +96,7 @@ GEM
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.20)
- benchmark (0.3.0)
+ benchmark (0.4.0)
bigdecimal (3.1.8)
builder (3.3.0)
cancancan (3.6.1)
@@ -141,10 +141,10 @@ GEM
cucumber-html-formatter (21.7.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
- cucumber-rails (3.0.0)
+ cucumber-rails (3.1.0)
capybara (>= 3.11, < 4)
cucumber (>= 5, < 10)
- railties (>= 5.2, < 8)
+ railties (>= 5.2, < 9)
cucumber-tag-expressions (6.1.1)
cuprite (0.15.1)
capybara (~> 3.0)
@@ -153,7 +153,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
- date (3.4.0)
+ date (3.4.1)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
@@ -213,13 +213,13 @@ GEM
has_scope (>= 0.6)
railties (>= 6.0)
responders (>= 2)
- io-console (0.7.2)
+ io-console (0.8.0)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso (0.4.0)
i18n
- json (2.7.5)
+ json (2.9.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
@@ -236,7 +236,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
- logger (1.6.1)
+ logger (1.6.2)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -248,9 +248,9 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
mini_mime (1.1.5)
- minitest (5.25.1)
+ minitest (5.25.2)
multi_test (1.1.0)
- net-imap (0.5.0)
+ net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
@@ -260,22 +260,23 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
- nokogiri (1.16.7-aarch64-linux)
+ nokogiri (1.16.8-aarch64-linux)
racc (~> 1.4)
- nokogiri (1.16.7-arm64-darwin)
+ nokogiri (1.16.8-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.16.7-x86_64-darwin)
+ nokogiri (1.16.8-x86_64-darwin)
racc (~> 1.4)
- nokogiri (1.16.7-x86_64-linux)
+ nokogiri (1.16.8-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
- parser (3.3.5.1)
+ parser (3.3.6.0)
ast (~> 2.4.1)
racc
- psych (5.1.2)
+ psych (5.2.1)
+ date
stringio
public_suffix (6.0.1)
pundit (2.4.0)
@@ -286,35 +287,35 @@ GEM
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
- rackup (2.2.0)
+ rackup (2.2.1)
rack (>= 3)
- rails (7.2.2)
- actioncable (= 7.2.2)
- actionmailbox (= 7.2.2)
- actionmailer (= 7.2.2)
- actionpack (= 7.2.2)
- actiontext (= 7.2.2)
- actionview (= 7.2.2)
- activejob (= 7.2.2)
- activemodel (= 7.2.2)
- activerecord (= 7.2.2)
- activestorage (= 7.2.2)
- activesupport (= 7.2.2)
+ rails (8.0.0)
+ actioncable (= 8.0.0)
+ actionmailbox (= 8.0.0)
+ actionmailer (= 8.0.0)
+ actionpack (= 8.0.0)
+ actiontext (= 8.0.0)
+ actionview (= 8.0.0)
+ activejob (= 8.0.0)
+ activemodel (= 8.0.0)
+ activerecord (= 8.0.0)
+ activestorage (= 8.0.0)
+ activesupport (= 8.0.0)
bundler (>= 1.15.0)
- railties (= 7.2.2)
+ railties (= 8.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
- rails-html-sanitizer (1.6.0)
+ rails-html-sanitizer (1.6.1)
loofah (~> 2.21)
- nokogiri (~> 1.14)
- rails-i18n (7.0.10)
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+ rails-i18n (8.0.1)
i18n (>= 0.7, < 2)
- railties (>= 6.0.0, < 8)
- railties (7.2.2)
- actionpack (= 7.2.2)
- activesupport (= 7.2.2)
+ railties (>= 8.0.0, < 9)
+ railties (8.0.0)
+ actionpack (= 8.0.0)
+ activesupport (= 8.0.0)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
@@ -326,10 +327,10 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
- rdoc (6.7.0)
+ rdoc (6.8.1)
psych (>= 4.0.0)
- regexp_parser (2.9.2)
- reline (0.5.10)
+ regexp_parser (2.9.3)
+ reline (0.5.12)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
@@ -345,7 +346,7 @@ GEM
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
- rspec-rails (7.0.1)
+ rspec-rails (7.1.0)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
@@ -353,24 +354,24 @@ GEM
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
- rspec-support (3.13.1)
- rubocop (1.68.0)
+ rspec-support (3.13.2)
+ rubocop (1.69.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 2.4, < 3.0)
- rubocop-ast (>= 1.32.2, < 2.0)
+ regexp_parser (>= 2.9.3, < 3.0)
+ rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (>= 2.4.0, < 3.0)
- rubocop-ast (1.33.0)
+ unicode-display_width (>= 2.4.0, < 4.0)
+ rubocop-ast (1.36.2)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-packaging (0.5.2)
rubocop (>= 1.33, < 2.0)
- rubocop-performance (1.22.1)
+ rubocop-performance (1.23.0)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.27.0)
@@ -382,7 +383,7 @@ GEM
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
- securerandom (0.3.1)
+ securerandom (0.4.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
@@ -399,30 +400,31 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
- sqlite3 (2.2.0-aarch64-linux-gnu)
- sqlite3 (2.2.0-arm64-darwin)
- sqlite3 (2.2.0-x86_64-darwin)
- sqlite3 (2.2.0-x86_64-linux-gnu)
- stringio (3.1.1)
- sys-uname (1.3.0)
+ sqlite3 (2.3.1-aarch64-linux-gnu)
+ sqlite3 (2.3.1-arm64-darwin)
+ sqlite3 (2.3.1-x86_64-darwin)
+ sqlite3 (2.3.1-x86_64-linux-gnu)
+ stringio (3.1.2)
+ sys-uname (1.3.1)
ffi (~> 1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.2)
- timeout (0.4.1)
+ timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
+ uri (1.0.2)
useragent (0.16.10)
warden (1.2.9)
rack (>= 2.0.9)
- webrick (1.9.0)
+ webrick (1.9.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.6.18)
+ zeitwerk (2.7.1)
PLATFORMS
aarch64-linux
@@ -448,7 +450,7 @@ DEPENDENCIES
launchy
parallel_tests
pundit
- rails (~> 7.2.0)
+ rails (~> 8.0.0)
rails-i18n
rake
ransack (>= 4.2.0)
@@ -464,7 +466,6 @@ DEPENDENCIES
sprockets-rails
sqlite3
webrick
- zeitwerk (~> 2.6.18)
BUNDLED WITH
2.5.22
diff --git a/UPGRADING.md b/UPGRADING.md
index e59d1ebd15a..bb7600c74cb 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -8,14 +8,14 @@ ActiveAdmin v4 uses TailwindCSS. It has **mobile web, dark mode and RTL support*
These instructions assume the `cssbundling-rails` and `importmap-rails` gems are already installed and you have run their install commands in your app. If you haven't done so, please do before continuing.
-Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta14"` and then run `gem install activeadmin --pre`.
+Update your `Gemfile` with `gem "activeadmin", "4.0.0.beta15"` and then run `gem install activeadmin --pre`.
Now, run `rails generate active_admin:assets` to replace the old assets with the new files.
Then add the npm package and update the `build:css` script.
```
-yarn add @activeadmin/activeadmin@4.0.0-beta14
+yarn add @activeadmin/activeadmin@4.0.0-beta15
npm pkg set scripts.build:css="tailwindcss -i ./app/assets/stylesheets/active_admin.css -o ./app/assets/builds/active_admin.css --minify -c tailwind-active_admin.config.js"
```
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 914c2353a95..4ffac8713ea 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1,10 +1,27 @@
ar:
+ activerecord:
+ models:
+ comment:
+ one: "تعليق"
+ other: "تعليقات"
+ active_admin/comment:
+ one: "تعليق"
+ other: "تعليقات"
+ attributes:
+ active_admin/comment:
+ author_type: "نوع الكاتب"
+ body: "المحتوى"
+ created_at: "وقت الإنشاء"
+ namespace: "النطاق"
+ resource_type: "نوع المصدر"
+ updated_at: "وقت التعديل"
active_admin:
- dashboard: "لوحة تحكم"
+ dashboard: "لوحة التحكم"
view: "عرض"
edit: "تعديل"
delete: "حذف"
delete_confirmation: "هل تريد تأكيد الحذف؟"
+ create_another: "انشاء %{model} آخر"
new_model: "%{model} جديد"
edit_model: "تعديل %{model}"
delete_model: "حذف %{model}"
@@ -17,71 +34,88 @@ ar:
has_many_new: "إضافة %{model} جديد"
has_many_delete: "حذف"
has_many_remove: "إزالة"
+ move: "نقل"
filters:
buttons:
- filter: "تصفية"
- clear: "تفريغ التصفية"
+ filter: "فرز"
+ clear: "إلغاء الفرز"
+ predicates:
+ from: "من"
+ to: "إلى"
+ scopes:
+ all: "الكل"
search_status:
- no_current_filters: "بدون"
+ title: "الفرز الحالي"
+ title_with_scope: "الفرز الحالي لـ %{name}"
+ no_current_filters: "بدون فرز"
status_tag:
"yes": "نعم"
"no": "لا"
- "unset": "لا"
+ "unset": "غير محدد"
+ toggle_dark_mode: "تبديل الوضع الليلي"
+ toggle_main_navigation_menu: "عرض القائمة الرئيسية"
+ toggle_section: "عرض القسم"
+ toggle_user_menu: "عرض قائمة المستخدم"
logout: "تسجيل الخروج"
- powered_by: "تنفيذ %{active_admin} %{version}"
+ powered_by: "بواسطة %{active_admin} %{version}"
sidebars:
filters: "المُرشحات"
- search_status: "حالات البحث"
+ search_status: "حالة البحث"
pagination:
- empty: "لا يوجد %{model} "
- one: "عرض 1 %{model}"
- one_page: "عرض all %{n} %{model}"
- multiple: "عرض %{model} %{from} - %{to} من %{total} بالمجمل"
- multiple_without_total: "عرض %{model} %{from} - %{to}"
+ empty: "لا يوجد %{model}"
+ one: "عرض 1 من 1"
+ one_page: "عرض كل %{n}"
+ multiple: "عرض %{from}-%{to} من %{total}"
+ multiple_without_total: "عرض %{from}-%{to}"
+ per_page: "لكل صفحة "
+ previous: "السابق"
+ next: "التالي"
entry:
one: "مدخل"
other: "مدخلات"
any: "أي"
blank_slate:
- content: "لايوجد %{resource_name} بعد."
+ content: "لا يوجد %{resource_name}"
link: "إنشاء"
batch_actions:
- button_label: "إجراءات متعددة"
+ button_label: "إجراء جماعي"
default_confirmation: "هل أنت متأكّد؟"
delete_confirmation: "هل أنت متأكّد من حذف هذه %{plural_model}؟"
succesfully_destroyed:
- one: "حُذف بنجاح 1 %{model}"
+ one: "حُذف بنجاح %{model}"
other: "حُذف بنجاح %{count} %{plural_model}"
- selection_toggle_explanation: "(تتبيث الخيار)"
+ selection_toggle_explanation: "(تبديل التحديد)"
action_label: "اُختير %{title}"
labels:
destroy: "حذف"
comments:
+ created_at: "أُنشئ"
resource_type: "نوع المصدر"
author_type: "نوع الؤلّف"
- body: "هيكل"
+ body: "المحتوى"
author: "مؤلّف"
add: "إضافة تعليق"
- resource: "مصدر"
- no_comments_yet: "لا يوجد تعليقات بعد."
- author_missing: "مجهول"
- title_content: "تعليقات (%{count})"
+ delete: "حذف تعليق"
+ delete_confirmation: "هل أنت متأكّد من حذف التعليق؟"
+ resource: "مدخل"
+ no_comments_yet: "لا يوجد تعليقات."
+ author_missing: "المؤلف مجهول"
+ title_content: "التعليقات (%{count})"
errors:
empty_text: "لم يُحفظ التعليق، النص فارغ."
- created_at: "أُنشئ"
- delete: "حذف تعليق"
- delete_confirmation: "هل أنت متأكّد من حذف هذه التعليقات؟"
devise:
username:
title: "اسم المستخدم"
email:
title: "البريد الإلكترونيّ"
subdomain:
- title: "مجال فرعي"
+ title: "النطاق الفرعي"
password:
title: "كلمة المرور"
+ password_confirmation:
+ title: "تأكيد كلمة المرور"
sign_up:
- title: "تسجيل"
+ title: "التسجيل"
submit: "تسجيل"
login:
title: "تسجيل الدخول"
@@ -91,22 +125,22 @@ ar:
title: "هل نسيت كلمة المرور؟"
submit: "استرجاع كلمة المرور"
change_password:
- title: "تغير كلمة المرور خاصتك"
- submit: "تغير كلمة المرور خاصتي"
+ title: "تغير كلمة المرور"
+ submit: "تغير كلمة المرور"
unlock:
- title: "إعادة إرسال تعليمات فك الحظر"
- submit: "إعادة إرسال تعليمات فك الحظر"
+ title: "إعادة إرسال تعليمات تنشيط الحساب"
+ submit: "إعادة إرسال تعليمات تنشيط الحساب"
resend_confirmation_instructions:
- title: "إعادة ارسال تعليمات التأكيد"
- submit: "إعادة ارسال تعليمات التأكيد"
+ title: "إعادة ارسال تعليمات تأكيد البريد الإلكتروني"
+ submit: "إعادة ارسال تعليمات تأكيد البريد الإلكتروني"
links:
sign_up: "التسجيل"
sign_in: "تسجيل الدخول"
forgot_your_password: "هل نسيت كلمة المرور؟"
sign_in_with_omniauth_provider: "تسجيل الدخول بـ %{provider}"
resend_unlock_instructions: "إعادة إرسال تعليمات تنشيط الحساب"
- resend_confirmation_instructions: "إعادة إرسال تعليمات تأكيد الحساب"
+ resend_confirmation_instructions: "إعادة إرسال تعليمات تأكيد البريد الإلكتروني"
access_denied:
- message: "لم يُصرّح لك بهذا الإجراء."
+ message: "غير مصرح لك تنفيذ هذا الإجراء."
index_list:
table: "جدول"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 0d7c3ac13b0..f6c95aa7fea 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1,34 +1,63 @@
ko:
+ activerecord:
+ models:
+ comment:
+ one: "댓글"
+ other: "댓글들"
+ active_admin/comment:
+ one: "댓글"
+ other: "댓글들"
+ attributes:
+ active_admin/comment:
+ author_type: "글쓴이 유형"
+ body: "본문"
+ created_at: "작성시간"
+ namespace: "네임스페이스"
+ resource_type: "첨부파일 형태"
+ updated_at: "수정시간"
active_admin:
dashboard: "대시보드"
view: "보기"
edit: "수정"
delete: "삭제"
delete_confirmation: "정말로 삭제 하시겠습니까?"
+ create_another: "다른 %{model} 생성"
new_model: "%{model} 추가"
edit_model: "%{model} 수정"
delete_model: "%{model} 삭제"
details: "%{model} 상세보기"
cancel: "취소"
- empty: "내용이 없습니다"
+ empty: "비어있음"
previous: "이전"
next: "다음"
download: "다운로드:"
- has_many_new: "%{model} 추가"
+ has_many_new: "새 %{model} 추가"
has_many_delete: "삭제"
has_many_remove: "삭제"
+ move: "이동"
filters:
buttons:
filter: "필터"
clear: "필터 초기화"
+ predicates:
+ from: "시작"
+ to: "끝"
+ scopes:
+ all: "전체"
search_status:
+ title: "검색 중"
+ title_with_scope: "%{name} 검색 중"
no_current_filters: "현재 적용된 필터가 없습니다"
status_tag:
"yes": "있음"
"no": "없음"
- "unset": "없음"
+ "unset": "알 수 없음"
+ toggle_dark_mode: "다크모드 전환"
+ toggle_main_navigation_menu: "메인 메뉴 전환"
+ toggle_section: "섹션 전환"
+ toggle_user_menu: "사용자 메뉴 전환"
logout: "로그아웃"
- powered_by: "Powered by %{active_admin} %{version}"
+ powered_by: "%{active_admin} %{version} 제공"
sidebars:
filters: "필터 목록"
search_status: "검색 상태"
@@ -38,6 +67,9 @@ ko:
one_page: "%{n}개 %{model} 표시중"
multiple: "%{total}개 중 %{from} - %{to} %{model} 표시중"
multiple_without_total: "%{from} - %{to} %{model} 표시중"
+ per_page: "페이지당 "
+ previous: "이전"
+ next: "다음"
entry:
one: "항목"
other: "항목들"
@@ -59,13 +91,16 @@ ko:
comments:
created_at: "작성시간"
resource_type: "첨부파일 형태"
- author_type: "글쓴이 종류"
- body: "내용"
+ author_type: "글쓴이 유형"
+ body: "본문"
author: "글쓴이"
add: "댓글 추가"
+ delete: "댓글 삭제"
+ delete_confirmation: "정말로 이 댓글을 삭제하시겠습니까?"
resource: "첨부파일"
no_comments_yet: "아직 댓글이 없습니다."
- title_content: "댓글 (%{count})"
+ author_missing: "익명"
+ title_content: "댓글 (%{count}개)"
errors:
empty_text: "댓글이 저장되지 않았습니다. 내용을 입력해주세요."
devise:
@@ -77,8 +112,10 @@ ko:
title: "서브도메인"
password:
title: "비밀번호"
+ password_confirmation:
+ title: "비밀번호 확인"
sign_up:
- title: "가입하기"
+ title: "회원가입"
submit: "가입하기"
login:
title: "로그인"
@@ -97,8 +134,13 @@ ko:
title: "계정 승인 요청하기"
submit: "계정 승인 요청하기"
links:
+ sign_up: "회원가입"
sign_in: "로그인"
forgot_your_password: "비밀번호를 잊으셨나요?"
sign_in_with_omniauth_provider: "%{provider} 으로 로그인"
resend_unlock_instructions: "계정 잠금 해제하기"
resend_confirmation_instructions: "계정 승인 요청하기"
+ access_denied:
+ message: "이 작업을 수행할 권한이 없습니다."
+ index_list:
+ table: "테이블"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ed7aa5e5697..873fd1bf819 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1,10 +1,31 @@
ru:
+ activerecord:
+ models:
+ comment:
+ one: "Комментарий"
+ few: "Комментария"
+ many: "Комментариев"
+ other: "Комментариев"
+ active_admin/comment:
+ one: "Комментарий"
+ few: "Комментария"
+ many: "Комментариев"
+ other: "Комментариев"
+ attributes:
+ active_admin/comment:
+ author_type: "Тип автора"
+ body: "Текст"
+ created_at: "Дата создания"
+ namespace: "Пространство имён"
+ resource_type: "Тип ресурса"
+ updated_at: "Дата обновления"
active_admin:
dashboard: "Панель управления"
view: "Открыть"
edit: "Изменить"
delete: "Удалить"
delete_confirmation: "Вы уверены, что хотите удалить это?"
+ create_another: "Создать ещё %{model}"
new_model: "Создать %{model}"
edit_model: "Изменить %{model}"
delete_model: "Удалить %{model}"
@@ -17,6 +38,7 @@ ru:
has_many_new: "Добавить %{model}"
has_many_delete: "Удалить"
has_many_remove: "Убрать"
+ move: "Переместить"
filters:
buttons:
filter: "Фильтровать"
@@ -24,12 +46,20 @@ ru:
predicates:
from: "От"
to: "До"
+ scopes:
+ all: "Все"
search_status:
+ title: "Текущий поиск"
+ title_with_scope: "Текущий поиск %{name}"
no_current_filters: "Ни один"
status_tag:
"yes": "Да"
"no": "Нет"
"unset": "Нет"
+ toggle_dark_mode: "Переключить тёмную тему"
+ toggle_main_navigation_menu: "Переключить главное меню"
+ toggle_section: "Переключить секцию"
+ toggle_user_menu: "Переключить пользовательское меню"
logout: "Выйти"
powered_by: "Работает на %{active_admin} %{version}"
sidebars:
@@ -41,6 +71,9 @@ ru:
one_page: "Результат: %{n} %{model}"
multiple: "Результат: %{model} %{from} - %{to} из %{total}"
multiple_without_total: "Результат: %{model} %{from} - %{to}"
+ per_page: "На странице "
+ previous: "Предыдущая"
+ next: "Следующая"
entry:
one: "запись"
few: "записи"
@@ -87,6 +120,8 @@ ru:
title: "Поддомен"
password:
title: "Пароль"
+ password_confirmation:
+ title: "Подтверждение пароля"
sign_up:
title: "Зарегистрироваться"
submit: "Зарегистрироваться"
diff --git a/gemfiles/rails_70/Gemfile.lock b/gemfiles/rails_70/Gemfile.lock
index 558f87d223e..55e364913e5 100644
--- a/gemfiles/rails_70/Gemfile.lock
+++ b/gemfiles/rails_70/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
- activeadmin (4.0.0.beta14)
+ activeadmin (4.0.0.beta15)
arbre (~> 2.0)
csv
formtastic (>= 3.1)
@@ -132,10 +132,10 @@ GEM
cucumber-html-formatter (21.7.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
- cucumber-rails (3.0.0)
+ cucumber-rails (3.1.0)
capybara (>= 3.11, < 4)
cucumber (>= 5, < 10)
- railties (>= 5.2, < 8)
+ railties (>= 5.2, < 9)
cucumber-tag-expressions (6.1.1)
cuprite (0.15.1)
capybara (~> 3.0)
@@ -144,7 +144,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
- date (3.4.0)
+ date (3.4.1)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
@@ -202,7 +202,7 @@ GEM
has_scope (>= 0.6)
railties (>= 6.0)
responders (>= 2)
- io-console (0.7.2)
+ io-console (0.8.0)
iso (0.4.0)
i18n
kaminari (1.2.2)
@@ -220,7 +220,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
- logger (1.6.1)
+ logger (1.6.2)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -233,10 +233,10 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
- mini_portile2 (2.8.7)
- minitest (5.25.1)
+ mini_portile2 (2.8.8)
+ minitest (5.25.2)
multi_test (1.1.0)
- net-imap (0.5.0)
+ net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
@@ -246,18 +246,18 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
- nokogiri (1.16.7)
+ nokogiri (1.16.8)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- nokogiri (1.16.7-arm64-darwin)
+ nokogiri (1.16.8-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.16.7-x86_64-linux)
+ nokogiri (1.16.8-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
- parser (3.3.5.1)
+ parser (3.3.6.0)
ast (~> 2.4.1)
racc
public_suffix (6.0.1)
@@ -285,9 +285,9 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
- rails-html-sanitizer (1.6.0)
+ rails-html-sanitizer (1.6.1)
loofah (~> 2.21)
- nokogiri (~> 1.14)
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (7.0.10)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
@@ -304,8 +304,8 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
- regexp_parser (2.9.2)
- reline (0.5.10)
+ regexp_parser (2.9.3)
+ reline (0.5.12)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
@@ -321,7 +321,7 @@ GEM
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
- rspec-rails (7.0.1)
+ rspec-rails (7.1.0)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
@@ -329,7 +329,7 @@ GEM
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
- rspec-support (3.13.1)
+ rspec-support (3.13.2)
ruby2_keywords (0.0.5)
simplecov (0.22.0)
docile (~> 1.1)
@@ -351,18 +351,18 @@ GEM
mini_portile2 (~> 2.8.0)
sqlite3 (1.7.3-arm64-darwin)
sqlite3 (1.7.3-x86_64-linux)
- sys-uname (1.3.0)
+ sys-uname (1.3.1)
ffi (~> 1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.2)
- timeout (0.4.1)
+ timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
warden (1.2.9)
rack (>= 2.0.9)
- webrick (1.9.0)
+ webrick (1.9.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
diff --git a/gemfiles/rails_71/Gemfile.lock b/gemfiles/rails_71/Gemfile.lock
index 5580da77524..7833016308c 100644
--- a/gemfiles/rails_71/Gemfile.lock
+++ b/gemfiles/rails_71/Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: ../..
specs:
- activeadmin (4.0.0.beta14)
+ activeadmin (4.0.0.beta15)
arbre (~> 2.0)
csv
formtastic (>= 3.1)
@@ -102,7 +102,7 @@ GEM
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.20)
- benchmark (0.3.0)
+ benchmark (0.4.0)
bigdecimal (3.1.8)
builder (3.3.0)
cancancan (3.6.1)
@@ -147,10 +147,10 @@ GEM
cucumber-html-formatter (21.7.0)
cucumber-messages (> 19, < 27)
cucumber-messages (22.0.0)
- cucumber-rails (3.0.0)
+ cucumber-rails (3.1.0)
capybara (>= 3.11, < 4)
cucumber (>= 5, < 10)
- railties (>= 5.2, < 8)
+ railties (>= 5.2, < 9)
cucumber-tag-expressions (6.1.1)
cuprite (0.15.1)
capybara (~> 3.0)
@@ -159,7 +159,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
- date (3.4.0)
+ date (3.4.1)
devise (4.9.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
@@ -218,7 +218,7 @@ GEM
has_scope (>= 0.6)
railties (>= 6.0)
responders (>= 2)
- io-console (0.7.2)
+ io-console (0.8.0)
irb (1.14.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
@@ -239,7 +239,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
- logger (1.6.1)
+ logger (1.6.2)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -251,11 +251,11 @@ GEM
marcel (1.0.4)
matrix (0.4.2)
mini_mime (1.1.5)
- mini_portile2 (2.8.7)
- minitest (5.25.1)
+ mini_portile2 (2.8.8)
+ minitest (5.25.2)
multi_test (1.1.0)
- mutex_m (0.2.0)
- net-imap (0.5.0)
+ mutex_m (0.3.0)
+ net-imap (0.5.1)
date
net-protocol
net-pop (0.1.2)
@@ -265,21 +265,22 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
- nokogiri (1.16.7)
+ nokogiri (1.16.8)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- nokogiri (1.16.7-arm64-darwin)
+ nokogiri (1.16.8-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.16.7-x86_64-linux)
+ nokogiri (1.16.8-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
- parser (3.3.5.1)
+ parser (3.3.6.0)
ast (~> 2.4.1)
racc
- psych (5.1.2)
+ psych (5.2.1)
+ date
stringio
public_suffix (6.0.1)
pundit (2.4.0)
@@ -290,7 +291,7 @@ GEM
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
- rackup (2.2.0)
+ rackup (2.2.1)
rack (>= 3)
rails (7.1.5)
actioncable (= 7.1.5)
@@ -310,9 +311,9 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
- rails-html-sanitizer (1.6.0)
+ rails-html-sanitizer (1.6.1)
loofah (~> 2.21)
- nokogiri (~> 1.14)
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (7.0.10)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
@@ -330,10 +331,10 @@ GEM
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
i18n
- rdoc (6.7.0)
+ rdoc (6.8.1)
psych (>= 4.0.0)
- regexp_parser (2.9.2)
- reline (0.5.10)
+ regexp_parser (2.9.3)
+ reline (0.5.12)
io-console (~> 0.5)
request_store (1.7.0)
rack (>= 1.4)
@@ -349,7 +350,7 @@ GEM
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
- rspec-rails (7.0.1)
+ rspec-rails (7.1.0)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
@@ -357,9 +358,9 @@ GEM
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
- rspec-support (3.13.1)
+ rspec-support (3.13.2)
ruby2_keywords (0.0.5)
- securerandom (0.3.1)
+ securerandom (0.4.0)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
@@ -376,23 +377,23 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
- sqlite3 (2.2.0)
+ sqlite3 (2.3.1)
mini_portile2 (~> 2.8.0)
- sqlite3 (2.2.0-arm64-darwin)
- sqlite3 (2.2.0-x86_64-linux-gnu)
- stringio (3.1.1)
- sys-uname (1.3.0)
+ sqlite3 (2.3.1-arm64-darwin)
+ sqlite3 (2.3.1-x86_64-linux-gnu)
+ stringio (3.1.2)
+ sys-uname (1.3.1)
ffi (~> 1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.2)
- timeout (0.4.1)
+ timeout (0.4.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
warden (1.2.9)
rack (>= 2.0.9)
- webrick (1.9.0)
+ webrick (1.9.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
diff --git a/gemfiles/rails_72/Gemfile b/gemfiles/rails_72/Gemfile
new file mode 100644
index 00000000000..6665e5ad4ec
--- /dev/null
+++ b/gemfiles/rails_72/Gemfile
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+group :development, :test do
+ gem "rake"
+
+ gem "cancancan"
+ gem "pundit"
+
+ gem "draper"
+ gem "devise"
+
+ gem "rails", "~> 7.2.0"
+
+ gem "sprockets-rails"
+ gem "ransack", ">= 4.1.0"
+ gem "formtastic", ">= 5.0.0"
+
+ gem "cssbundling-rails"
+ gem "importmap-rails"
+
+ # FIXME: relax this dependency when Ruby 3.1 support will be dropped
+ gem "zeitwerk", "~> 2.6.18"
+end
+
+group :test do
+ gem "cuprite"
+ gem "capybara"
+ gem "webrick"
+
+ gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
+ gem "simplecov-cobertura", require: false
+ gem "cucumber-rails", require: false
+ gem "cucumber"
+ gem "database_cleaner-active_record"
+ gem "launchy"
+ gem "parallel_tests"
+ gem "rspec-rails"
+ gem "sqlite3", platform: :mri
+
+ # Translations
+ gem "i18n-tasks"
+ gem "i18n-spec"
+ gem "rails-i18n" # Provides default i18n for many languages
+end
+
+gemspec path: "../.."
diff --git a/gemfiles/rails_72/Gemfile.lock b/gemfiles/rails_72/Gemfile.lock
new file mode 100644
index 00000000000..79f72c0fb4d
--- /dev/null
+++ b/gemfiles/rails_72/Gemfile.lock
@@ -0,0 +1,434 @@
+PATH
+ remote: ../..
+ specs:
+ activeadmin (4.0.0.beta15)
+ arbre (~> 2.0)
+ csv
+ formtastic (>= 3.1)
+ formtastic_i18n (>= 0.4)
+ inherited_resources (~> 2.0)
+ kaminari (>= 1.2.1)
+ railties (>= 7.0)
+ ransack (>= 4.0)
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actioncable (7.2.2)
+ actionpack (= 7.2.2)
+ activesupport (= 7.2.2)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ zeitwerk (~> 2.6)
+ actionmailbox (7.2.2)
+ actionpack (= 7.2.2)
+ activejob (= 7.2.2)
+ activerecord (= 7.2.2)
+ activestorage (= 7.2.2)
+ activesupport (= 7.2.2)
+ mail (>= 2.8.0)
+ actionmailer (7.2.2)
+ actionpack (= 7.2.2)
+ actionview (= 7.2.2)
+ activejob (= 7.2.2)
+ activesupport (= 7.2.2)
+ mail (>= 2.8.0)
+ rails-dom-testing (~> 2.2)
+ actionpack (7.2.2)
+ actionview (= 7.2.2)
+ activesupport (= 7.2.2)
+ nokogiri (>= 1.8.5)
+ racc
+ rack (>= 2.2.4, < 3.2)
+ rack-session (>= 1.0.1)
+ rack-test (>= 0.6.3)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ useragent (~> 0.16)
+ actiontext (7.2.2)
+ actionpack (= 7.2.2)
+ activerecord (= 7.2.2)
+ activestorage (= 7.2.2)
+ activesupport (= 7.2.2)
+ globalid (>= 0.6.0)
+ nokogiri (>= 1.8.5)
+ actionview (7.2.2)
+ activesupport (= 7.2.2)
+ builder (~> 3.1)
+ erubi (~> 1.11)
+ rails-dom-testing (~> 2.2)
+ rails-html-sanitizer (~> 1.6)
+ activejob (7.2.2)
+ activesupport (= 7.2.2)
+ globalid (>= 0.3.6)
+ activemodel (7.2.2)
+ activesupport (= 7.2.2)
+ activemodel-serializers-xml (1.0.3)
+ activemodel (>= 5.0.0.a)
+ activesupport (>= 5.0.0.a)
+ builder (~> 3.1)
+ activerecord (7.2.2)
+ activemodel (= 7.2.2)
+ activesupport (= 7.2.2)
+ timeout (>= 0.4.0)
+ activestorage (7.2.2)
+ actionpack (= 7.2.2)
+ activejob (= 7.2.2)
+ activerecord (= 7.2.2)
+ activesupport (= 7.2.2)
+ marcel (~> 1.0)
+ activesupport (7.2.2)
+ base64
+ benchmark (>= 0.3)
+ bigdecimal
+ concurrent-ruby (~> 1.0, >= 1.3.1)
+ connection_pool (>= 2.2.5)
+ drb
+ i18n (>= 1.6, < 2)
+ logger (>= 1.4.2)
+ minitest (>= 5.1)
+ securerandom (>= 0.3)
+ tzinfo (~> 2.0, >= 2.0.5)
+ addressable (2.8.7)
+ public_suffix (>= 2.0.2, < 7.0)
+ arbre (2.0.2)
+ activesupport (>= 3.0.0)
+ ast (2.4.2)
+ base64 (0.2.0)
+ bcrypt (3.1.20)
+ benchmark (0.4.0)
+ bigdecimal (3.1.8)
+ builder (3.3.0)
+ cancancan (3.6.1)
+ capybara (3.40.0)
+ addressable
+ matrix
+ mini_mime (>= 0.1.3)
+ nokogiri (~> 1.11)
+ rack (>= 1.6.0)
+ rack-test (>= 0.6.3)
+ regexp_parser (>= 1.5, < 3.0)
+ xpath (~> 3.2)
+ childprocess (5.1.0)
+ logger (~> 1.5)
+ concurrent-ruby (1.3.4)
+ connection_pool (2.4.1)
+ crass (1.0.6)
+ cssbundling-rails (1.4.1)
+ railties (>= 6.0.0)
+ csv (3.3.0)
+ cucumber (9.2.0)
+ builder (~> 3.2)
+ cucumber-ci-environment (> 9, < 11)
+ cucumber-core (> 13, < 14)
+ cucumber-cucumber-expressions (~> 17.0)
+ cucumber-gherkin (> 24, < 28)
+ cucumber-html-formatter (> 20.3, < 22)
+ cucumber-messages (> 19, < 25)
+ diff-lcs (~> 1.5)
+ mini_mime (~> 1.1)
+ multi_test (~> 1.1)
+ sys-uname (~> 1.2)
+ cucumber-ci-environment (10.0.1)
+ cucumber-core (13.0.3)
+ cucumber-gherkin (>= 27, < 28)
+ cucumber-messages (>= 20, < 23)
+ cucumber-tag-expressions (> 5, < 7)
+ cucumber-cucumber-expressions (17.1.0)
+ bigdecimal
+ cucumber-gherkin (27.0.0)
+ cucumber-messages (>= 19.1.4, < 23)
+ cucumber-html-formatter (21.7.0)
+ cucumber-messages (> 19, < 27)
+ cucumber-messages (22.0.0)
+ cucumber-rails (3.1.0)
+ capybara (>= 3.11, < 4)
+ cucumber (>= 5, < 10)
+ railties (>= 5.2, < 9)
+ cucumber-tag-expressions (6.1.1)
+ cuprite (0.15.1)
+ capybara (~> 3.0)
+ ferrum (~> 0.15.0)
+ database_cleaner-active_record (2.2.0)
+ activerecord (>= 5.a)
+ database_cleaner-core (~> 2.0.0)
+ database_cleaner-core (2.0.1)
+ date (3.4.1)
+ devise (4.9.4)
+ bcrypt (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (>= 4.1.0)
+ responders
+ warden (~> 1.2.3)
+ diff-lcs (1.5.1)
+ docile (1.4.1)
+ draper (4.0.2)
+ actionpack (>= 5.0)
+ activemodel (>= 5.0)
+ activemodel-serializers-xml (>= 1.0)
+ activesupport (>= 5.0)
+ request_store (>= 1.0)
+ ruby2_keywords
+ drb (2.2.1)
+ erubi (1.13.0)
+ ferrum (0.15)
+ addressable (~> 2.5)
+ concurrent-ruby (~> 1.1)
+ webrick (~> 1.7)
+ websocket-driver (~> 0.7)
+ ffi (1.17.0)
+ ffi (1.17.0-arm64-darwin)
+ ffi (1.17.0-x86_64-linux-gnu)
+ formtastic (5.0.0)
+ actionpack (>= 6.0.0)
+ formtastic_i18n (0.7.0)
+ globalid (1.2.1)
+ activesupport (>= 6.1)
+ has_scope (0.8.2)
+ actionpack (>= 5.2)
+ activesupport (>= 5.2)
+ highline (3.1.1)
+ reline
+ i18n (1.14.6)
+ concurrent-ruby (~> 1.0)
+ i18n-spec (0.6.0)
+ iso
+ i18n-tasks (1.0.14)
+ activesupport (>= 4.0.2)
+ ast (>= 2.1.0)
+ erubi
+ highline (>= 2.0.0)
+ i18n
+ parser (>= 3.2.2.1)
+ rails-i18n
+ rainbow (>= 2.2.2, < 4.0)
+ terminal-table (>= 1.5.1)
+ importmap-rails (2.0.3)
+ actionpack (>= 6.0.0)
+ activesupport (>= 6.0.0)
+ railties (>= 6.0.0)
+ inherited_resources (2.0.1)
+ actionpack (>= 6.0)
+ has_scope (>= 0.6)
+ railties (>= 6.0)
+ responders (>= 2)
+ io-console (0.8.0)
+ irb (1.14.1)
+ rdoc (>= 4.0.0)
+ reline (>= 0.4.2)
+ iso (0.4.0)
+ i18n
+ kaminari (1.2.2)
+ activesupport (>= 4.1.0)
+ kaminari-actionview (= 1.2.2)
+ kaminari-activerecord (= 1.2.2)
+ kaminari-core (= 1.2.2)
+ kaminari-actionview (1.2.2)
+ actionview
+ kaminari-core (= 1.2.2)
+ kaminari-activerecord (1.2.2)
+ activerecord
+ kaminari-core (= 1.2.2)
+ kaminari-core (1.2.2)
+ launchy (3.0.1)
+ addressable (~> 2.8)
+ childprocess (~> 5.0)
+ logger (1.6.2)
+ loofah (2.23.1)
+ crass (~> 1.0.2)
+ nokogiri (>= 1.12.0)
+ mail (2.8.1)
+ mini_mime (>= 0.1.1)
+ net-imap
+ net-pop
+ net-smtp
+ marcel (1.0.4)
+ matrix (0.4.2)
+ mini_mime (1.1.5)
+ mini_portile2 (2.8.8)
+ minitest (5.25.2)
+ multi_test (1.1.0)
+ net-imap (0.5.1)
+ date
+ net-protocol
+ net-pop (0.1.2)
+ net-protocol
+ net-protocol (0.2.2)
+ timeout
+ net-smtp (0.5.0)
+ net-protocol
+ nio4r (2.7.4)
+ nokogiri (1.16.8)
+ mini_portile2 (~> 2.8.2)
+ racc (~> 1.4)
+ nokogiri (1.16.8-arm64-darwin)
+ racc (~> 1.4)
+ nokogiri (1.16.8-x86_64-linux)
+ racc (~> 1.4)
+ orm_adapter (0.5.0)
+ parallel (1.26.3)
+ parallel_tests (4.7.2)
+ parallel
+ parser (3.3.6.0)
+ ast (~> 2.4.1)
+ racc
+ psych (5.2.1)
+ date
+ stringio
+ public_suffix (6.0.1)
+ pundit (2.4.0)
+ activesupport (>= 3.0.0)
+ racc (1.8.1)
+ rack (3.1.8)
+ rack-session (2.0.0)
+ rack (>= 3.0.0)
+ rack-test (2.1.0)
+ rack (>= 1.3)
+ rackup (2.2.1)
+ rack (>= 3)
+ rails (7.2.2)
+ actioncable (= 7.2.2)
+ actionmailbox (= 7.2.2)
+ actionmailer (= 7.2.2)
+ actionpack (= 7.2.2)
+ actiontext (= 7.2.2)
+ actionview (= 7.2.2)
+ activejob (= 7.2.2)
+ activemodel (= 7.2.2)
+ activerecord (= 7.2.2)
+ activestorage (= 7.2.2)
+ activesupport (= 7.2.2)
+ bundler (>= 1.15.0)
+ railties (= 7.2.2)
+ rails-dom-testing (2.2.0)
+ activesupport (>= 5.0.0)
+ minitest
+ nokogiri (>= 1.6)
+ rails-html-sanitizer (1.6.1)
+ loofah (~> 2.21)
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+ rails-i18n (7.0.10)
+ i18n (>= 0.7, < 2)
+ railties (>= 6.0.0, < 8)
+ railties (7.2.2)
+ actionpack (= 7.2.2)
+ activesupport (= 7.2.2)
+ irb (~> 1.13)
+ rackup (>= 1.0.0)
+ rake (>= 12.2)
+ thor (~> 1.0, >= 1.2.2)
+ zeitwerk (~> 2.6)
+ rainbow (3.1.1)
+ rake (13.2.1)
+ ransack (4.2.1)
+ activerecord (>= 6.1.5)
+ activesupport (>= 6.1.5)
+ i18n
+ rdoc (6.8.1)
+ psych (>= 4.0.0)
+ regexp_parser (2.9.3)
+ reline (0.5.12)
+ io-console (~> 0.5)
+ request_store (1.7.0)
+ rack (>= 1.4)
+ responders (3.1.1)
+ actionpack (>= 5.2)
+ railties (>= 5.2)
+ rexml (3.3.9)
+ rspec-core (3.13.2)
+ rspec-support (~> 3.13.0)
+ rspec-expectations (3.13.3)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.13.0)
+ rspec-mocks (3.13.2)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.13.0)
+ rspec-rails (7.1.0)
+ actionpack (>= 7.0)
+ activesupport (>= 7.0)
+ railties (>= 7.0)
+ rspec-core (~> 3.13)
+ rspec-expectations (~> 3.13)
+ rspec-mocks (~> 3.13)
+ rspec-support (~> 3.13)
+ rspec-support (3.13.2)
+ ruby2_keywords (0.0.5)
+ securerandom (0.4.0)
+ simplecov (0.22.0)
+ docile (~> 1.1)
+ simplecov-html (~> 0.11)
+ simplecov_json_formatter (~> 0.1)
+ simplecov-cobertura (2.1.0)
+ rexml
+ simplecov (~> 0.19)
+ simplecov-html (0.13.1)
+ simplecov_json_formatter (0.1.4)
+ sprockets (4.2.1)
+ concurrent-ruby (~> 1.0)
+ rack (>= 2.2.4, < 4)
+ sprockets-rails (3.5.2)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
+ sprockets (>= 3.0.0)
+ sqlite3 (2.3.1)
+ mini_portile2 (~> 2.8.0)
+ sqlite3 (2.3.1-arm64-darwin)
+ sqlite3 (2.3.1-x86_64-linux-gnu)
+ stringio (3.1.2)
+ sys-uname (1.3.1)
+ ffi (~> 1.1)
+ terminal-table (3.0.2)
+ unicode-display_width (>= 1.1.1, < 3)
+ thor (1.3.2)
+ timeout (0.4.2)
+ tzinfo (2.0.6)
+ concurrent-ruby (~> 1.0)
+ unicode-display_width (2.6.0)
+ useragent (0.16.10)
+ warden (1.2.9)
+ rack (>= 2.0.9)
+ webrick (1.9.1)
+ websocket-driver (0.7.6)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.5)
+ xpath (3.2.0)
+ nokogiri (~> 1.8)
+ zeitwerk (2.6.18)
+
+PLATFORMS
+ arm64-darwin
+ ruby
+ x86_64-linux
+
+DEPENDENCIES
+ activeadmin!
+ cancancan
+ capybara
+ cssbundling-rails
+ cucumber
+ cucumber-rails
+ cuprite
+ database_cleaner-active_record
+ devise
+ draper
+ formtastic (>= 5.0.0)
+ i18n-spec
+ i18n-tasks
+ importmap-rails
+ launchy
+ parallel_tests
+ pundit
+ rails (~> 7.2.0)
+ rails-i18n
+ rake
+ ransack (>= 4.1.0)
+ rspec-rails
+ simplecov
+ simplecov-cobertura
+ sprockets-rails
+ sqlite3
+ webrick
+ zeitwerk (~> 2.6.18)
+
+BUNDLED WITH
+ 2.5.22
diff --git a/lib/active_admin/version.rb b/lib/active_admin/version.rb
index 44cc26713c1..4669d121b6e 100644
--- a/lib/active_admin/version.rb
+++ b/lib/active_admin/version.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module ActiveAdmin
- VERSION = "4.0.0.beta14"
+ VERSION = "4.0.0.beta15"
end
diff --git a/lib/generators/active_admin/assets/templates/tailwind.config.js b/lib/generators/active_admin/assets/templates/tailwind.config.js
index 57cc4f963f5..59bb743bf27 100644
--- a/lib/generators/active_admin/assets/templates/tailwind.config.js
+++ b/lib/generators/active_admin/assets/templates/tailwind.config.js
@@ -1,7 +1,9 @@
-const execSync = require('child_process').execSync;
+import { execSync } from 'child_process';
+import activeAdminPlugin from '@activeadmin/activeadmin/plugin';
+
const activeAdminPath = execSync('bundle show activeadmin', { encoding: 'utf-8' }).trim();
-module.exports = {
+export default {
content: [
`${activeAdminPath}/vendor/javascript/flowbite.js`,
`${activeAdminPath}/plugin.js`,
@@ -14,6 +16,6 @@ module.exports = {
],
darkMode: "selector",
plugins: [
- require(`@activeadmin/activeadmin/plugin`)
+ activeAdminPlugin
]
}
diff --git a/package.json b/package.json
index e7bb7c8ef97..42a65f7cd02 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@activeadmin/activeadmin",
- "version": "4.0.0-beta14",
+ "version": "4.0.0-beta15",
"description": "The administration framework for Ruby on Rails.",
"main": "dist/active_admin.js",
"type": "module",
diff --git a/spec/support/rails_template.rb b/spec/support/rails_template.rb
index a03f7026980..187ba4a00e0 100644
--- a/spec/support/rails_template.rb
+++ b/spec/support/rails_template.rb
@@ -2,6 +2,9 @@
# Rails template to build the sample app for specs
gem "cssbundling-rails"
+
+create_file "app/assets/config/manifest.js"
+
rails_command "css:install:tailwind"
rails_command "importmap:install"
@@ -94,7 +97,7 @@ def self.ransackable_associations(auth_object=nil)
gsub_file "tailwind-active_admin.config.js", /^.*const activeAdminPath.*$/, <<~JS
const activeAdminPath = '../../../';
JS
-gsub_file "tailwind-active_admin.config.js", /@activeadmin\/activeadmin/, "${activeAdminPath}"
+gsub_file "tailwind-active_admin.config.js", Regexp.new("@activeadmin/activeadmin/plugin"), "../../../plugin"
# Force strong parameters to raise exceptions
inject_into_file "config/application.rb", after: "class Application < Rails::Application" do
diff --git a/tasks/bug_report_template.rb b/tasks/bug_report_template.rb
index 18211de92ff..065300f6258 100644
--- a/tasks/bug_report_template.rb
+++ b/tasks/bug_report_template.rb
@@ -13,7 +13,7 @@
end
# Change Rails version if necessary.
- gem "rails", "~> 7.2.0"
+ gem "rails", "~> 8.0.0"
gem "sprockets", "~> 4.0"
gem "importmap-rails", "~> 2.0"
diff --git a/tasks/test_application.rb b/tasks/test_application.rb
index 308f093cbf1..28e3c87fe5c 100644
--- a/tasks/test_application.rb
+++ b/tasks/test_application.rb
@@ -45,9 +45,12 @@ def generate
--skip-git
--skip-hotwire
--skip-jbuilder
+ --skip-kamal
--skip-rubocop
+ --skip-solid
--skip-system-test
--skip-test
+ --skip-thruster
--javascript=importmap
)
@@ -81,7 +84,7 @@ def base_dir
end
def app_name
- return "rails_72" if main_app?
+ return "rails_80" if main_app?
File.basename(File.dirname(gemfile))
end
diff --git a/yarn.lock b/yarn.lock
index bd8788e71f8..e28d0d3ae97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -326,29 +326,29 @@
dependencies:
eslint-visitor-keys "^3.3.0"
-"@eslint-community/regexpp@^4.11.0":
- version "4.11.0"
- resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
- integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
+"@eslint-community/regexpp@^4.12.1":
+ version "4.12.1"
+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+ integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
-"@eslint/config-array@^0.18.0":
- version "0.18.0"
- resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d"
- integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==
+"@eslint/config-array@^0.19.0":
+ version "0.19.0"
+ resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.0.tgz#3251a528998de914d59bb21ba4c11767cf1b3519"
+ integrity sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==
dependencies:
"@eslint/object-schema" "^2.1.4"
debug "^4.3.1"
minimatch "^3.1.2"
-"@eslint/core@^0.7.0":
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.7.0.tgz#a1bb4b6a4e742a5ff1894b7ee76fbf884ec72bd3"
- integrity sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==
+"@eslint/core@^0.9.0":
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.0.tgz#168ee076f94b152c01ca416c3e5cf82290ab4fcd"
+ integrity sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==
-"@eslint/eslintrc@^3.1.0":
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
- integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
+"@eslint/eslintrc@^3.2.0":
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c"
+ integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==
dependencies:
ajv "^6.12.4"
debug "^4.3.2"
@@ -360,17 +360,17 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"
-"@eslint/js@9.13.0":
- version "9.13.0"
- resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.13.0.tgz#c5f89bcd57eb54d5d4fa8b77693e9c28dc97e547"
- integrity sha512-IFLyoY4d72Z5y/6o/BazFBezupzI/taV8sGumxTAVw3lXG9A6md1Dc34T9s1FoD/an9pJH8RHbAxsaEbBed9lA==
+"@eslint/js@9.16.0":
+ version "9.16.0"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.16.0.tgz#3df2b2dd3b9163056616886c86e4082f45dbf3f4"
+ integrity sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==
"@eslint/object-schema@^2.1.4":
version "2.1.4"
resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843"
integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
-"@eslint/plugin-kit@^0.2.0":
+"@eslint/plugin-kit@^0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.3.tgz#812980a6a41ecf3a8341719f92a6d1e784a2e0e8"
integrity sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==
@@ -382,7 +382,7 @@
resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
-"@humanfs/node@^0.16.5":
+"@humanfs/node@^0.16.6":
version "0.16.6"
resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
@@ -395,11 +395,28 @@
resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
-"@humanwhocodes/retry@^0.3.0", "@humanwhocodes/retry@^0.3.1":
+"@humanwhocodes/retry@^0.3.0":
version "0.3.1"
resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
+"@humanwhocodes/retry@^0.4.1":
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b"
+ integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==
+
+"@iconify-json/simple-icons@^1.2.10":
+ version "1.2.13"
+ resolved "https://registry.yarnpkg.com/@iconify-json/simple-icons/-/simple-icons-1.2.13.tgz#256dc8a2a87e48311b5662d147b6a55be1f26abc"
+ integrity sha512-rRQjMoIt/kPfaD+fnBC9YZQpso3hkn8xPeadl+YWhscJ5SVUCdB9oTeR9VIpt+/5Yi8vEkh2UOWFPq4lz3ee2A==
+ dependencies:
+ "@iconify/types" "*"
+
+"@iconify/types@*":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"
+ integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==
+
"@isaacs/cliui@^8.0.2":
version "8.0.2"
resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -543,95 +560,95 @@
resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.1.tgz#53601d88cda8b1577aa130b4a6e452283605bf26"
integrity sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==
-"@rollup/rollup-android-arm-eabi@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz#49a2a9808074f2683667992aa94b288e0b54fc82"
- integrity sha512-ufb2CH2KfBWPJok95frEZZ82LtDl0A6QKTa8MoM+cWwDZvVGl5/jNb79pIhRvAalUu+7LD91VYR0nwRD799HkQ==
-
-"@rollup/rollup-android-arm64@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.3.tgz#197e3bc01c228d3c23591e0fcedca91f8f398ec1"
- integrity sha512-iAHpft/eQk9vkWIV5t22V77d90CRofgR2006UiCjHcHJFVI1E0oBkQIAbz+pLtthFw3hWEmVB4ilxGyBf48i2Q==
-
-"@rollup/rollup-darwin-arm64@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.3.tgz#16772c0309d0dc3cca716580cdac7a1c560ddf46"
- integrity sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==
-
-"@rollup/rollup-darwin-x64@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.3.tgz#4e98120a1c4cda7d4043ccce72347cee53784140"
- integrity sha512-KO0pN5x3+uZm1ZXeIfDqwcvnQ9UEGN8JX5ufhmgH5Lz4ujjZMAnxQygZAVGemFWn+ZZC0FQopruV4lqmGMshow==
-
-"@rollup/rollup-freebsd-arm64@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.24.3.tgz#27145e414986e216e0d9b9a8d488028f33c39566"
- integrity sha512-CsC+ZdIiZCZbBI+aRlWpYJMSWvVssPuWqrDy/zi9YfnatKKSLFCe6fjna1grHuo/nVaHG+kiglpRhyBQYRTK4A==
-
-"@rollup/rollup-freebsd-x64@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.24.3.tgz#67e75fd87a903090f038b212273c492e5ca6b32f"
- integrity sha512-F0nqiLThcfKvRQhZEzMIXOQG4EeX61im61VYL1jo4eBxv4aZRmpin6crnBJQ/nWnCsjH5F6J3W6Stdm0mBNqBg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.3.tgz#bb45ebadbb9496298ab5461373bde357e8f33e88"
- integrity sha512-KRSFHyE/RdxQ1CSeOIBVIAxStFC/hnBgVcaiCkQaVC+EYDtTe4X7z5tBkFyRoBgUGtB6Xg6t9t2kulnX6wJc6A==
-
-"@rollup/rollup-linux-arm-musleabihf@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.3.tgz#384276c23feb0a4d6ffa603a9a760decce8b4118"
- integrity sha512-h6Q8MT+e05zP5BxEKz0vi0DhthLdrNEnspdLzkoFqGwnmOzakEHSlXfVyA4HJ322QtFy7biUAVFPvIDEDQa6rw==
-
-"@rollup/rollup-linux-arm64-gnu@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.3.tgz#89e5a4570ddd9eca908324a6de60bd64f904e3f0"
- integrity sha512-fKElSyXhXIJ9pqiYRqisfirIo2Z5pTTve5K438URf08fsypXrEkVmShkSfM8GJ1aUyvjakT+fn2W7Czlpd/0FQ==
-
-"@rollup/rollup-linux-arm64-musl@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.3.tgz#9ffd7cd6c6c6670d8c039056d6a49ad9f1f66949"
- integrity sha512-YlddZSUk8G0px9/+V9PVilVDC6ydMz7WquxozToozSnfFK6wa6ne1ATUjUvjin09jp34p84milxlY5ikueoenw==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.3.tgz#4d32ce982e2d25e3b8116336ad5ce6e270b5a024"
- integrity sha512-yNaWw+GAO8JjVx3s3cMeG5Esz1cKVzz8PkTJSfYzE5u7A+NvGmbVFEHP+BikTIyYWuz0+DX9kaA3pH9Sqxp69g==
-
-"@rollup/rollup-linux-riscv64-gnu@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.3.tgz#f43d4e0572397e3d3acd82d77d79ce021dea3310"
- integrity sha512-lWKNQfsbpv14ZCtM/HkjCTm4oWTKTfxPmr7iPfp3AHSqyoTz5AgLemYkWLwOBWc+XxBbrU9SCokZP0WlBZM9lA==
-
-"@rollup/rollup-linux-s390x-gnu@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.3.tgz#264f8a4c206173945bdab2a676d638b7945106a9"
- integrity sha512-HoojGXTC2CgCcq0Woc/dn12wQUlkNyfH0I1ABK4Ni9YXyFQa86Fkt2Q0nqgLfbhkyfQ6003i3qQk9pLh/SpAYw==
-
-"@rollup/rollup-linux-x64-gnu@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.3.tgz#e86172a407b2edd41540ec2ae636e497fadccff6"
- integrity sha512-mnEOh4iE4USSccBOtcrjF5nj+5/zm6NcNhbSEfR3Ot0pxBwvEn5QVUXcuOwwPkapDtGZ6pT02xLoPaNv06w7KQ==
-
-"@rollup/rollup-linux-x64-musl@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.3.tgz#8ae9bf78986d1b16ccbc89ab6f2dfa96807d3178"
- integrity sha512-rMTzawBPimBQkG9NKpNHvquIUTQPzrnPxPbCY1Xt+mFkW7pshvyIS5kYgcf74goxXOQk0CP3EoOC1zcEezKXhw==
-
-"@rollup/rollup-win32-arm64-msvc@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.3.tgz#11d6a59f651a3c2a9e5eaab0a99367b77a29c319"
- integrity sha512-2lg1CE305xNvnH3SyiKwPVsTVLCg4TmNCF1z7PSHX2uZY2VbUpdkgAllVoISD7JO7zu+YynpWNSKAtOrX3AiuA==
-
-"@rollup/rollup-win32-ia32-msvc@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.3.tgz#7ff146e53dc6e388b60329b7ec3335501d2b0f98"
- integrity sha512-9SjYp1sPyxJsPWuhOCX6F4jUMXGbVVd5obVpoVEi8ClZqo52ViZewA6eFz85y8ezuOA+uJMP5A5zo6Oz4S5rVQ==
-
-"@rollup/rollup-win32-x64-msvc@4.24.3":
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.3.tgz#7687335781efe6bee14d6ed8eff9746a9f24c9cd"
- integrity sha512-HGZgRFFYrMrP3TJlq58nR1xy8zHKId25vhmm5S9jETEfDf6xybPxsavFTJaufe2zgOGYJBskGlj49CwtEuFhWQ==
+"@rollup/rollup-android-arm-eabi@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.0.tgz#462e7ecdd60968bc9eb95a20d185e74f8243ec1b"
+ integrity sha512-wLJuPLT6grGZsy34g4N1yRfYeouklTgPhH1gWXCYspenKYD0s3cR99ZevOGw5BexMNywkbV3UkjADisozBmpPQ==
+
+"@rollup/rollup-android-arm64@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.28.0.tgz#78a2b8a8a55f71a295eb860a654ae90a2b168f40"
+ integrity sha512-eiNkznlo0dLmVG/6wf+Ifi/v78G4d4QxRhuUl+s8EWZpDewgk7PX3ZyECUXU0Zq/Ca+8nU8cQpNC4Xgn2gFNDA==
+
+"@rollup/rollup-darwin-arm64@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.28.0.tgz#5b783af714f434f1e66e3cdfa3817e0b99216d84"
+ integrity sha512-lmKx9yHsppblnLQZOGxdO66gT77bvdBtr/0P+TPOseowE7D9AJoBw8ZDULRasXRWf1Z86/gcOdpBrV6VDUY36Q==
+
+"@rollup/rollup-darwin-x64@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.28.0.tgz#f72484e842521a5261978034e18e20f778a2850d"
+ integrity sha512-8hxgfReVs7k9Js1uAIhS6zq3I+wKQETInnWQtgzt8JfGx51R1N6DRVy3F4o0lQwumbErRz52YqwjfvuwRxGv1w==
+
+"@rollup/rollup-freebsd-arm64@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.28.0.tgz#3c919dff72b2fe344811a609c674a8347b033f62"
+ integrity sha512-lA1zZB3bFx5oxu9fYud4+g1mt+lYXCoch0M0V/xhqLoGatbzVse0wlSQ1UYOWKpuSu3gyN4qEc0Dxf/DII1bhQ==
+
+"@rollup/rollup-freebsd-x64@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.28.0.tgz#b62a3a8365b363b3fdfa6da11a9188b6ab4dca7c"
+ integrity sha512-aI2plavbUDjCQB/sRbeUZWX9qp12GfYkYSJOrdYTL/C5D53bsE2/nBPuoiJKoWp5SN78v2Vr8ZPnB+/VbQ2pFA==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.28.0.tgz#0d02cc55bd229bd8ca5c54f65f916ba5e0591c94"
+ integrity sha512-WXveUPKtfqtaNvpf0iOb0M6xC64GzUX/OowbqfiCSXTdi/jLlOmH0Ba94/OkiY2yTGTwteo4/dsHRfh5bDCZ+w==
+
+"@rollup/rollup-linux-arm-musleabihf@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.28.0.tgz#c51d379263201e88a60e92bd8e90878f0c044425"
+ integrity sha512-yLc3O2NtOQR67lI79zsSc7lk31xjwcaocvdD1twL64PK1yNaIqCeWI9L5B4MFPAVGEVjH5k1oWSGuYX1Wutxpg==
+
+"@rollup/rollup-linux-arm64-gnu@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.28.0.tgz#93ce2addc337b5cfa52b84f8e730d2e36eb4339b"
+ integrity sha512-+P9G9hjEpHucHRXqesY+3X9hD2wh0iNnJXX/QhS/J5vTdG6VhNYMxJ2rJkQOxRUd17u5mbMLHM7yWGZdAASfcg==
+
+"@rollup/rollup-linux-arm64-musl@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.28.0.tgz#730af6ddc091a5ba5baac28a3510691725dc808b"
+ integrity sha512-1xsm2rCKSTpKzi5/ypT5wfc+4bOGa/9yI/eaOLW0oMs7qpC542APWhl4A37AENGZ6St6GBMWhCCMM6tXgTIplw==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.28.0.tgz#b5565aac20b4de60ca1e557f525e76478b5436af"
+ integrity sha512-zgWxMq8neVQeXL+ouSf6S7DoNeo6EPgi1eeqHXVKQxqPy1B2NvTbaOUWPn/7CfMKL7xvhV0/+fq/Z/J69g1WAQ==
+
+"@rollup/rollup-linux-riscv64-gnu@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.28.0.tgz#d488290bf9338bad4ae9409c4aa8a1728835a20b"
+ integrity sha512-VEdVYacLniRxbRJLNtzwGt5vwS0ycYshofI7cWAfj7Vg5asqj+pt+Q6x4n+AONSZW/kVm+5nklde0qs2EUwU2g==
+
+"@rollup/rollup-linux-s390x-gnu@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.28.0.tgz#eb2e3f3a06acf448115045c11a5a96868c95a556"
+ integrity sha512-LQlP5t2hcDJh8HV8RELD9/xlYtEzJkm/aWGsauvdO2ulfl3QYRjqrKW+mGAIWP5kdNCBheqqqYIGElSRCaXfpw==
+
+"@rollup/rollup-linux-x64-gnu@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.28.0.tgz#065952ef2aea7e837dc7e02aa500feeaff4fc507"
+ integrity sha512-Nl4KIzteVEKE9BdAvYoTkW19pa7LR/RBrT6F1dJCV/3pbjwDcaOq+edkP0LXuJ9kflW/xOK414X78r+K84+msw==
+
+"@rollup/rollup-linux-x64-musl@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.28.0.tgz#3435d484d05f5c4d1ffd54541b4facce2887103a"
+ integrity sha512-eKpJr4vBDOi4goT75MvW+0dXcNUqisK4jvibY9vDdlgLx+yekxSm55StsHbxUsRxSTt3JEQvlr3cGDkzcSP8bw==
+
+"@rollup/rollup-win32-arm64-msvc@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.28.0.tgz#69682a2a10d9fedc334f87583cfca83c39c08077"
+ integrity sha512-Vi+WR62xWGsE/Oj+mD0FNAPY2MEox3cfyG0zLpotZdehPFXwz6lypkGs5y38Jd/NVSbOD02aVad6q6QYF7i8Bg==
+
+"@rollup/rollup-win32-ia32-msvc@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.28.0.tgz#b64470f9ac79abb386829c56750b9a4711be3332"
+ integrity sha512-kN/Vpip8emMLn/eOza+4JwqDZBL6MPNpkdaEsgUtW1NYN3DZvZqSQrbKzJcTL6hd8YNmFTn7XGWMwccOcJBL0A==
+
+"@rollup/rollup-win32-x64-msvc@4.28.0":
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.28.0.tgz#cb313feef9ac6e3737067fdf34f42804ac65a6f2"
+ integrity sha512-Bvno2/aZT6usSa7lRDL2+hMjVAGjuqaymF1ApZm31JXzniR/hvr14jpU+/z4X6Gt5BPlzosscyJZGUvguXIqeQ==
"@shikijs/core@1.22.2", "@shikijs/core@^1.22.2":
version "1.22.2"
@@ -1060,7 +1077,7 @@ character-entities-legacy@^3.0.0:
resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz#76bc83a90738901d7bc223a9e93759fdd560125b"
integrity sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==
-chokidar@^3.5.3:
+chokidar@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -1119,10 +1136,10 @@ core-js@3.33.1:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.1.tgz#ef3766cfa382482d0a2c2bc5cb52c6d88805da52"
integrity sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==
-cross-spawn@^7.0.0, cross-spawn@^7.0.2:
- version "7.0.5"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.5.tgz#910aac880ff5243da96b728bc6521a5f6c2f2f82"
- integrity sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==
+cross-spawn@^7.0.0, cross-spawn@^7.0.5:
+ version "7.0.6"
+ resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+ integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
@@ -1235,7 +1252,7 @@ escape-string-regexp@^4.0.0:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-eslint-scope@^8.1.0:
+eslint-scope@^8.2.0:
version "8.2.0"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442"
integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==
@@ -1248,36 +1265,36 @@ eslint-visitor-keys@^3.3.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
-eslint-visitor-keys@^4.1.0, eslint-visitor-keys@^4.2.0:
+eslint-visitor-keys@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
eslint@^9.8.0:
- version "9.13.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.13.0.tgz#7659014b7dda1ff876ecbd990f726e11c61596e6"
- integrity sha512-EYZK6SX6zjFHST/HRytOdA/zE72Cq/bfw45LSyuwrdvcclb/gqV8RRQxywOBEWO2+WDpva6UZa4CcDeJKzUCFA==
+ version "9.16.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.16.0.tgz#66832e66258922ac0a626f803a9273e37747f2a6"
+ integrity sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
- "@eslint-community/regexpp" "^4.11.0"
- "@eslint/config-array" "^0.18.0"
- "@eslint/core" "^0.7.0"
- "@eslint/eslintrc" "^3.1.0"
- "@eslint/js" "9.13.0"
- "@eslint/plugin-kit" "^0.2.0"
- "@humanfs/node" "^0.16.5"
+ "@eslint-community/regexpp" "^4.12.1"
+ "@eslint/config-array" "^0.19.0"
+ "@eslint/core" "^0.9.0"
+ "@eslint/eslintrc" "^3.2.0"
+ "@eslint/js" "9.16.0"
+ "@eslint/plugin-kit" "^0.2.3"
+ "@humanfs/node" "^0.16.6"
"@humanwhocodes/module-importer" "^1.0.1"
- "@humanwhocodes/retry" "^0.3.1"
+ "@humanwhocodes/retry" "^0.4.1"
"@types/estree" "^1.0.6"
"@types/json-schema" "^7.0.15"
ajv "^6.12.4"
chalk "^4.0.0"
- cross-spawn "^7.0.2"
+ cross-spawn "^7.0.5"
debug "^4.3.2"
escape-string-regexp "^4.0.0"
- eslint-scope "^8.1.0"
- eslint-visitor-keys "^4.1.0"
- espree "^10.2.0"
+ eslint-scope "^8.2.0"
+ eslint-visitor-keys "^4.2.0"
+ espree "^10.3.0"
esquery "^1.5.0"
esutils "^2.0.2"
fast-deep-equal "^3.1.3"
@@ -1292,9 +1309,8 @@ eslint@^9.8.0:
minimatch "^3.1.2"
natural-compare "^1.4.0"
optionator "^0.9.3"
- text-table "^0.2.0"
-espree@^10.0.1, espree@^10.2.0:
+espree@^10.0.1, espree@^10.3.0:
version "10.3.0"
resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
@@ -1337,7 +1353,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
-fast-glob@^3.3.0:
+fast-glob@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -1634,10 +1650,10 @@ jackspeak@^2.3.5:
optionalDependencies:
"@pkgjs/parseargs" "^0.11.0"
-jiti@^1.21.0:
- version "1.21.0"
- resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d"
- integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==
+jiti@^1.21.6:
+ version "1.21.6"
+ resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.6.tgz#6c7f7398dd4b3142767f9a168af2f317a428d268"
+ integrity sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==
js-yaml@^4.1.0:
version "4.1.0"
@@ -1782,7 +1798,7 @@ micromark-util-types@^2.0.0:
resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.0.tgz#63b4b7ffeb35d3ecf50d1ca20e68fc7caa36d95e"
integrity sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==
-micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.4, micromatch@^4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
@@ -1943,10 +1959,10 @@ perfect-debounce@^1.0.0:
resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz#9c2e8bc30b169cc984a58b7d5b28049839591d2a"
integrity sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==
-picocolors@^1.0.0, picocolors@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
- integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
+picocolors@^1.1.0, picocolors@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+ integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
version "2.3.1"
@@ -1979,7 +1995,7 @@ postcss-js@^4.0.1:
dependencies:
camelcase-css "^2.0.1"
-postcss-load-config@^4.0.1:
+postcss-load-config@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
@@ -1987,17 +2003,17 @@ postcss-load-config@^4.0.1:
lilconfig "^3.0.0"
yaml "^2.3.4"
-postcss-nested@^6.0.1:
- version "6.0.1"
- resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c"
- integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==
+postcss-nested@^6.2.0:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.2.0.tgz#4c2d22ab5f20b9cb61e2c5c5915950784d068131"
+ integrity sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==
dependencies:
- postcss-selector-parser "^6.0.11"
+ postcss-selector-parser "^6.1.1"
-postcss-selector-parser@^6.0.11:
- version "6.0.15"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535"
- integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==
+postcss-selector-parser@^6.1.1, postcss-selector-parser@^6.1.2:
+ version "6.1.2"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+ integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@@ -2007,7 +2023,7 @@ postcss-value-parser@^4.0.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-postcss@^8.4.23, postcss@^8.4.43, postcss@^8.4.47:
+postcss@^8.4.43, postcss@^8.4.47:
version "8.4.47"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.47.tgz#5bf6c9a010f3e724c503bf03ef7947dcb0fea365"
integrity sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==
@@ -2084,7 +2100,7 @@ resolve-from@^4.0.0:
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
-resolve@^1.1.7, resolve@^1.22.2:
+resolve@^1.1.7, resolve@^1.22.8:
version "1.22.8"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -2104,30 +2120,30 @@ rfdc@^1.4.1:
integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
rollup@^4.19.2, rollup@^4.20.0:
- version "4.24.3"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.24.3.tgz#8b259063740af60b0030315f88665ba2041789b8"
- integrity sha512-HBW896xR5HGmoksbi3JBDtmVzWiPAYqp7wip50hjQ67JbDz61nyoMPdqu1DvVW9asYb2M65Z20ZHsyJCMqMyDg==
+ version "4.28.0"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.28.0.tgz#eb8d28ed43ef60a18f21d0734d230ee79dd0de77"
+ integrity sha512-G9GOrmgWHBma4YfCcX8PjH0qhXSdH8B4HDE2o4/jaxj93S4DPCIDoLcXz99eWMji4hB29UFCEd7B2gwGJDR9cQ==
dependencies:
"@types/estree" "1.0.6"
optionalDependencies:
- "@rollup/rollup-android-arm-eabi" "4.24.3"
- "@rollup/rollup-android-arm64" "4.24.3"
- "@rollup/rollup-darwin-arm64" "4.24.3"
- "@rollup/rollup-darwin-x64" "4.24.3"
- "@rollup/rollup-freebsd-arm64" "4.24.3"
- "@rollup/rollup-freebsd-x64" "4.24.3"
- "@rollup/rollup-linux-arm-gnueabihf" "4.24.3"
- "@rollup/rollup-linux-arm-musleabihf" "4.24.3"
- "@rollup/rollup-linux-arm64-gnu" "4.24.3"
- "@rollup/rollup-linux-arm64-musl" "4.24.3"
- "@rollup/rollup-linux-powerpc64le-gnu" "4.24.3"
- "@rollup/rollup-linux-riscv64-gnu" "4.24.3"
- "@rollup/rollup-linux-s390x-gnu" "4.24.3"
- "@rollup/rollup-linux-x64-gnu" "4.24.3"
- "@rollup/rollup-linux-x64-musl" "4.24.3"
- "@rollup/rollup-win32-arm64-msvc" "4.24.3"
- "@rollup/rollup-win32-ia32-msvc" "4.24.3"
- "@rollup/rollup-win32-x64-msvc" "4.24.3"
+ "@rollup/rollup-android-arm-eabi" "4.28.0"
+ "@rollup/rollup-android-arm64" "4.28.0"
+ "@rollup/rollup-darwin-arm64" "4.28.0"
+ "@rollup/rollup-darwin-x64" "4.28.0"
+ "@rollup/rollup-freebsd-arm64" "4.28.0"
+ "@rollup/rollup-freebsd-x64" "4.28.0"
+ "@rollup/rollup-linux-arm-gnueabihf" "4.28.0"
+ "@rollup/rollup-linux-arm-musleabihf" "4.28.0"
+ "@rollup/rollup-linux-arm64-gnu" "4.28.0"
+ "@rollup/rollup-linux-arm64-musl" "4.28.0"
+ "@rollup/rollup-linux-powerpc64le-gnu" "4.28.0"
+ "@rollup/rollup-linux-riscv64-gnu" "4.28.0"
+ "@rollup/rollup-linux-s390x-gnu" "4.28.0"
+ "@rollup/rollup-linux-x64-gnu" "4.28.0"
+ "@rollup/rollup-linux-x64-musl" "4.28.0"
+ "@rollup/rollup-win32-arm64-msvc" "4.28.0"
+ "@rollup/rollup-win32-ia32-msvc" "4.28.0"
+ "@rollup/rollup-win32-x64-msvc" "4.28.0"
fsevents "~2.3.2"
run-parallel@^1.1.9:
@@ -2265,7 +2281,7 @@ strip-json-comments@^3.1.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
-sucrase@^3.32.0:
+sucrase@^3.35.0:
version "3.35.0"
resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
@@ -2303,37 +2319,32 @@ tabbable@^6.2.0:
integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
tailwindcss@^3.3.5:
- version "3.4.14"
- resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.14.tgz#6dd23a7f54ec197b19159e91e3bb1e55e7aa73ac"
- integrity sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==
+ version "3.4.15"
+ resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.15.tgz#04808bf4bf1424b105047d19e7d4bfab368044a9"
+ integrity sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==
dependencies:
"@alloc/quick-lru" "^5.2.0"
arg "^5.0.2"
- chokidar "^3.5.3"
+ chokidar "^3.6.0"
didyoumean "^1.2.2"
dlv "^1.1.3"
- fast-glob "^3.3.0"
+ fast-glob "^3.3.2"
glob-parent "^6.0.2"
is-glob "^4.0.3"
- jiti "^1.21.0"
+ jiti "^1.21.6"
lilconfig "^2.1.0"
- micromatch "^4.0.5"
+ micromatch "^4.0.8"
normalize-path "^3.0.0"
object-hash "^3.0.0"
- picocolors "^1.0.0"
- postcss "^8.4.23"
+ picocolors "^1.1.1"
+ postcss "^8.4.47"
postcss-import "^15.1.0"
postcss-js "^4.0.1"
- postcss-load-config "^4.0.1"
- postcss-nested "^6.0.1"
- postcss-selector-parser "^6.0.11"
- resolve "^1.22.2"
- sucrase "^3.32.0"
-
-text-table@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
- integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
+ postcss-load-config "^4.0.2"
+ postcss-nested "^6.2.0"
+ postcss-selector-parser "^6.1.2"
+ resolve "^1.22.8"
+ sucrase "^3.35.0"
thenify-all@^1.0.0:
version "1.6.0"
@@ -2466,12 +2477,13 @@ vite@^5.4.10:
fsevents "~2.3.3"
vitepress@^1.4.0:
- version "1.4.3"
- resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-1.4.3.tgz#2658ad684c776762694a160a8e2777dd2e797a6a"
- integrity sha512-956c2K2Mr0ubY9bTc2lCJD3g0mgo0mARB1iJC/BqUt4s0AM8Wl60wSU4zbFnzV7X2miFK1XJDKzGZnuEN90umw==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/vitepress/-/vitepress-1.5.0.tgz#61870b27dc9a580e46cea92989f64cdcb550dc23"
+ integrity sha512-q4Q/G2zjvynvizdB3/bupdYkCJe2umSAMv9Ju4d92E6/NXJ59z70xB0q5p/4lpRyAwflDsbwy1mLV9Q5+nlB+g==
dependencies:
"@docsearch/css" "^3.6.2"
"@docsearch/js" "^3.6.2"
+ "@iconify-json/simple-icons" "^1.2.10"
"@shikijs/core" "^1.22.2"
"@shikijs/transformers" "^1.22.2"
"@shikijs/types" "^1.22.2"