From c3e25f00fadc1ddc4f7e2b467653c28789d33a6c Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Mon, 4 May 2020 15:19:23 +0900
Subject: [PATCH 01/88] =?UTF-8?q?[fix]=20refs=20#113=20dtb=5Fbaseinfo=20?=
 =?UTF-8?q?=E3=81=AE=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=81=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/helper/SC_Helper_DB.php            | 92 ++++++++++++++-----
 .../pages/admin/basis/LC_Page_Admin_Basis.php |  2 +-
 data/class/pages/error/LC_Page_Error.php      |  2 +-
 .../pages/error/LC_Page_Error_DispError.php   |  2 +-
 4 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php
index 179edc2fc2..45c7b9cd66 100644
--- a/data/class/helper/SC_Helper_DB.php
+++ b/data/class/helper/SC_Helper_DB.php
@@ -30,6 +30,8 @@
  */
 class SC_Helper_DB
 {
+    const BASIS_DATA_CACHE_REALFILE = MASTER_DATA_REALDIR . 'dtb_baseinfo.serial';
+
     /** ルートカテゴリ取得フラグ */
     public $g_root_on;
 
@@ -116,20 +118,32 @@ public static function sfDataExists($tableName, $where, $arrWhereVal)
     /**
      * 店舗基本情報を取得する.
      *
-     * 引数 $force が false の場合は, 初回のみ DB 接続し,
-     * 2回目以降はキャッシュされた結果を使用する.
+     * 引数 $force が false の場合は, キャッシュされた結果を使用する.
      *
-     * @param  boolean $force 強制的にDB取得するか
+     * @param  boolean $force キャッシュファイルを生成し、ローカルキャッシュを削除するか
      * @return array   店舗基本情報の配列
      */
     public function sfGetBasisData($force = false)
     {
         static $arrData = null;
 
-        if ($force || is_null($arrData)) {
-            $objQuery = SC_Query_Ex::getSingletonInstance();
+        // キャッシュファイルが存在しない場合、キャッシュファイルを生成する
+        if (!$force && !file_exists(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE)) {
+            $force = true;
+        }
 
-            $arrData = $objQuery->getRow('*', 'dtb_baseinfo');
+        if ($force) {
+            // キャッシュファイルを生成
+            $success = SC_Helper_DB_Ex::sfCreateBasisDataCache();
+
+            // ローカルキャッシュを削除
+            $arrData = null;
+        }
+
+        // ローカルキャッシュが無い場合、キャッシュファイルを読み込む
+        if (is_null($arrData)) {
+            // キャッシュデータファイルを読み込む
+            $arrData = SC_Helper_DB_Ex::getBasisDataFromCacheFile();
         }
 
         return $arrData;
@@ -138,29 +152,61 @@ public function sfGetBasisData($force = false)
     /**
      * 基本情報のキャッシュデータを取得する
      *
+     * エラー画面表示で直接呼ばれる。キャッシュファイルが存在しなくとも空の配列を応答することで、(幾らかの情報欠落などはあるかもしれないが) エラー画面の表示できるよう考慮している。
      * @param  boolean $generate キャッシュファイルが無い時、DBのデータを基にキャッシュを生成するか
      * @return array   店舗基本情報の配列
+     * @deprecated 2.17.1 本体で使用されていないため非推奨
      */
     public function sfGetBasisDataCache($generate = false)
     {
-        // テーブル名
-        $name = 'dtb_baseinfo';
-        // キャッシュファイルパス
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
+        $cacheData = [];
+
         // ファイル存在確認
-        if (!file_exists($filepath) && $generate) {
+        if (!file_exists(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE) && $generate) {
             // 存在していなければキャッシュ生成
-            $this->sfCreateBasisDataCache();
+            SC_Helper_DB_Ex::sfCreateBasisDataCache();
         }
-        // 戻り値初期化
-        $cacheData = array();
-        // キャッシュファイルが存在すれば読み込む
-        if (file_exists($filepath)) {
+
+        $cacheData = SC_Helper_DB_Ex::getBasisDataFromCacheFile(true);
+
+        return $cacheData;
+    }
+
+    /**
+     * 基本情報のキャッシュデータを取得する
+     *
+     * エラー画面表示で直接呼ばれる。キャッシュファイルが存在しなくとも空の配列を応答することで、(幾らかの情報欠落などはあるかもしれないが) エラー画面の表示できるよう考慮している。
+     * @param  boolean $ignore_error エラーを無視するか
+     * @return array   店舗基本情報の配列
+     */
+    public function getBasisDataFromCacheFile($ignore_error = false)
+    {
+        $arrReturn = [];
+
+        // ファイル存在確認
+        if (file_exists(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE)) {
             // キャッシュデータファイルを読み込みアンシリアライズした配列を取得
-            $cacheData = unserialize(file_get_contents($filepath));
+            $arrReturn = unserialize(file_get_contents(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE));
         }
-        // return
-        return $cacheData;
+        elseif (!$ignore_error) {
+            throw new Exception('基本情報のキャッシュデータファイルが存在しません。');
+        }
+
+        return $arrReturn;
+    }
+
+    /**
+     * 店舗基本情報をDBから取得する.
+     *
+     * @return array   店舗基本情報の配列
+     */
+    public function getBasisDataFromDB()
+    {
+        $objQuery = SC_Query_Ex::getSingletonInstance();
+
+        $arrReturn = $objQuery->getRow('*', 'dtb_baseinfo');
+
+        return $arrReturn;
     }
 
     /**
@@ -176,16 +222,12 @@ public function sfGetBasisDataCache($generate = false)
      */
     public function sfCreateBasisDataCache()
     {
-        // テーブル名
-        $name = 'dtb_baseinfo';
-        // キャッシュファイルパス
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
         // データ取得
-        $arrData = $this->sfGetBasisData(true);
+        $arrData = SC_Helper_DB_Ex::getBasisDataFromDB();
         // シリアライズ
         $data = serialize($arrData);
         // ファイルを書き出しモードで開く
-        $handle = fopen($filepath, 'w');
+        $handle = fopen(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE, 'w');
         if (!$handle) {
             // ファイル生成失敗
             return false;
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
index f1fc28ccab..c75b4a23e0 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
@@ -108,7 +108,7 @@ public function action()
                 $this->tpl_onload .= "window.alert('SHOPマスターの登録が完了しました。');";
             // breakはつけない
             default:
-                $arrRet = $objDb->sfGetBasisData(true);
+                $arrRet = $objDb->getBasisDataFromDB();
                 $objFormParam->setParam($arrRet);
                 $this->arrForm = $objFormParam->getHashArray();
                 $this->arrForm['regular_holiday_ids'] = explode('|', $this->arrForm['regular_holiday_ids']);
diff --git a/data/class/pages/error/LC_Page_Error.php b/data/class/pages/error/LC_Page_Error.php
index 7b7575b0af..9842c375b3 100644
--- a/data/class/pages/error/LC_Page_Error.php
+++ b/data/class/pages/error/LC_Page_Error.php
@@ -70,7 +70,7 @@ public function init()
         }
 
         // キャッシュから店舗情報取得（DBへの接続は行わない）
-        $this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisDataCache(false);
+        $this->arrSiteInfo = SC_Helper_DB_Ex::getBasisDataFromCacheFile(true);
     }
 
     /**
diff --git a/data/class/pages/error/LC_Page_Error_DispError.php b/data/class/pages/error/LC_Page_Error_DispError.php
index 600e9fa002..9fc6a4a80b 100644
--- a/data/class/pages/error/LC_Page_Error_DispError.php
+++ b/data/class/pages/error/LC_Page_Error_DispError.php
@@ -54,7 +54,7 @@ public function init()
         $objHelperPlugin->arrRegistedPluginActions = array();
 
         // キャッシュから店舗情報取得（DBへの接続は行わない）
-        $this->arrSiteInfo = SC_Helper_DB_Ex::sfGetBasisDataCache(false);
+        $this->arrSiteInfo = SC_Helper_DB_Ex::getBasisDataFromCacheFile(true);
     }
 
     /**

From c3de160d170d83cb09b3926ac8ada1c11610939c Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Mon, 4 May 2020 15:51:59 +0900
Subject: [PATCH 02/88] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SC_Helper_DB_sfGetBasisDataCacheTest.php           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
index 47b6141e57..d99e96f530 100644
--- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
+++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
@@ -57,7 +57,7 @@ public function testSfGetBasisDataCache_キャッシュがなく生成もしな
         $this->verify();
     }
     
-    public function testSfGetBasisDataCache_キャッシュがなく生成する場合_キャッシュの値を返す()
+    public function testSfGetBasisDataCache_キャッシュがなく生成する場合_データベースから生成された値を返す()
     {
         $this->setUpBasisData();
         if (file_exists($this->cashFilePath)) {
@@ -127,7 +127,11 @@ public function testSfGetBasisDataCache_キャッシュがなく生成する場
             'latitude' => '30.0001',
             'longitude' => '45.0001',
             'downloadable_days' => '10',
-            'downloadable_days_unlimited' => '0'
+            'downloadable_days_unlimited' => '0',
+            'zipcode' => null,
+            'country_id' => null,
+            'law_zipcode' => null,
+            'law_country_id' => null,
         );
         $this->actual = $this->helper->sfGetBasisDataCache(true);
         $this->verify();
@@ -181,8 +185,6 @@ public function testSfGetBasisDataCache_キャッシュがある場合_キャッ
             'law_term08' => 'lawterm08',
             'law_term09' => 'lawterm09',
             'law_term10' => 'lawterm10',
-            'tax' => '5',
-            'tax_rule' => '1',
             'email01' => 'test1@test.com',
             'email02' => 'test2@test.com',
             'email03' => 'test3@test.com',

From 0a66c89de465cfa308657eaa628fd5106180cc80 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 7 May 2020 10:38:59 +0900
Subject: [PATCH 03/88] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
index d99e96f530..3272f7d25e 100644
--- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
+++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
@@ -104,8 +104,6 @@ public function testSfGetBasisDataCache_キャッシュがなく生成する場
             'law_term08' => 'lawterm08',
             'law_term09' => 'lawterm09',
             'law_term10' => 'lawterm10',
-            'tax' => '5',
-            'tax_rule' => '1',
             'email01' => 'test1@test.com',
             'email02' => 'test2@test.com',
             'email03' => 'test3@test.com',
@@ -206,7 +204,9 @@ public function testSfGetBasisDataCache_キャッシュがある場合_キャッ
             'latitude' => '30.0001',
             'longitude' => '45.0001',
             'downloadable_days' => '10',
-            'downloadable_days_unlimited' => '0'
+            'downloadable_days_unlimited' => '0',
+            'tax' => '5',
+            'tax_rule' => '1',
         );
         $this->actual = $this->helper->sfGetBasisDataCache();
         unlink($this->cashFilePath);

From 482a6290f0f548a45904d2b6ecc6549a7fbeb591 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 7 May 2020 12:47:31 +0900
Subject: [PATCH 04/88] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/class/SC_SendMailTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/class/SC_SendMailTest.php b/tests/class/SC_SendMailTest.php
index 850359d8c3..05324789a7 100644
--- a/tests/class/SC_SendMailTest.php
+++ b/tests/class/SC_SendMailTest.php
@@ -148,8 +148,10 @@ public function testGetRecip()
      */
     public function testGetBackendParams()
     {
-        $this->objQuery->update('dtb_baseinfo', ['email04' => 'test@example.com']);
         $objDb = new SC_Helper_DB_Ex();
+
+        SC_Helper_DB_Ex::registerBasisData(['email04' => 'test@example.com']);
+
         $objSite = $objDb->sfGetBasisData();
         $this->expected = [
             '-f '.$objSite['email04']

From 9f99d54776331c50d786b50ea019183fd9e24a99 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 7 May 2020 13:28:54 +0900
Subject: [PATCH 05/88] =?UTF-8?q?[fix]=20refs=20#113=20=E5=AF=BE=E5=BF=9C?=
 =?UTF-8?q?=E6=BC=8F=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SC_Helper_DB::registerBasisData() での更新時に、キャッシュデータファイルを生成する。
---
 data/Smarty/templates/admin/basis/point.tpl   |  4 +-
 .../Smarty/templates/admin/basis/tradelaw.tpl |  4 +-
 data/class/helper/SC_Helper_DB.php            |  3 ++
 .../pages/admin/basis/LC_Page_Admin_Basis.php |  2 -
 .../admin/basis/LC_Page_Admin_Basis_Point.php | 38 +++----------------
 .../basis/LC_Page_Admin_Basis_Tradelaw.php    | 33 +++-------------
 6 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/data/Smarty/templates/admin/basis/point.tpl b/data/Smarty/templates/admin/basis/point.tpl
index d8ceaba0a0..30fdceeeaf 100644
--- a/data/Smarty/templates/admin/basis/point.tpl
+++ b/data/Smarty/templates/admin/basis/point.tpl
@@ -24,7 +24,7 @@
 
 <form name="point_form" id="point_form" method="post" action="">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-    <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
+    <input type="hidden" name="mode" value="" />
     <div id="basis" class="contents-main">
         <table>
             <tr>
@@ -51,7 +51,7 @@
 
         <div class="btn-area">
             <ul>
-                <li><a class="btn-action" href="javascript:;" onclick="eccube.fnFormModeSubmit('point_form', '<!--{$tpl_mode}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+                <li><a class="btn-action" href="javascript:;" onclick="eccube.fnFormModeSubmit('point_form', 'update', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
             </ul>
         </div>
     </div>
diff --git a/data/Smarty/templates/admin/basis/tradelaw.tpl b/data/Smarty/templates/admin/basis/tradelaw.tpl
index 0ff6fcd24e..4fd480f338 100644
--- a/data/Smarty/templates/admin/basis/tradelaw.tpl
+++ b/data/Smarty/templates/admin/basis/tradelaw.tpl
@@ -24,7 +24,7 @@
 
 <form name="form1" id="form1" method="post" action="">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-    <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
+    <input type="hidden" name="mode" value="" />
     <div id="basis" class="contents-main">
         <table class="form">
             <tr>
@@ -197,7 +197,7 @@
 
         <div class="btn-area">
             <ul>
-                <li><a class="btn-action" href="javascript:;" onclick="eccube.fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+                <li><a class="btn-action" href="javascript:;" onclick="eccube.fnFormModeSubmit('form1', 'update', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
             </ul>
         </div>
     </div>
diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php
index 45c7b9cd66..743d802f23 100644
--- a/data/class/helper/SC_Helper_DB.php
+++ b/data/class/helper/SC_Helper_DB.php
@@ -1687,6 +1687,9 @@ public static function registerBasisData($arrData)
             $objQuery->insert('dtb_baseinfo', $arrData);
             GC_Utils_Ex::gfPrintLog('dtb_baseinfo に INSERT を実行しました。');
         }
+
+        // キャッシュデータファイルを生成する
+        SC_Helper_DB_Ex::sfCreateBasisDataCache();
     }
 
     /**
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
index c75b4a23e0..9a9c82010f 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
@@ -103,8 +103,6 @@ public function action()
                 $arrData = $objFormParam->getDbArray();
                 SC_Helper_DB_Ex::registerBasisData($arrData);
 
-                // キャッシュファイル更新
-                $objDb->sfCreateBasisDataCache();
                 $this->tpl_onload .= "window.alert('SHOPマスターの登録が完了しました。');";
             // breakはつけない
             default:
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
index ace2d75029..e0e03aee7f 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
@@ -73,11 +73,7 @@ public function action()
         // POST値の取得
         $objFormParam->setParam($_POST);
 
-        if ($objDb->sfGetBasisExists()) {
-            $this->tpl_mode = 'update';
-        } else {
-            $this->tpl_mode = 'insert';
-        }
+        $this->tpl_mode = 'update'; // 旧バージョンテンプレート互換
 
         if (!empty($_POST)) {
             // 入力値の変換
@@ -87,16 +83,15 @@ public function action()
             if (count($this->arrErr) == 0) {
                 switch ($this->getMode()) {
                     case 'update':
-                        $this->lfUpdateData($objFormParam->getHashArray()); // 既存編集
-                        break;
-                    case 'insert':
-                        $this->lfInsertData($objFormParam->getHashArray()); // 新規作成
+                        SC_Helper_DB_Ex::registerBasisData($objFormParam->getHashArray());
+
+                        // 再表示
+                        $this->tpl_onload = "window.alert('ポイント設定が完了しました。');";
+
                         break;
                     default:
                         break;
                 }
-                // 再表示
-                $this->tpl_onload = "window.alert('ポイント設定が完了しました。');";
             }
         } else {
             $arrRet = $objDb->sfGetBasisData();
@@ -115,25 +110,4 @@ public function lfInitParam(&$objFormParam)
         $objFormParam->addParam('ポイント付与率', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('会員登録時付与ポイント', 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
-
-    public function lfUpdateData($post)
-    {
-        // 入力データを渡す。
-        $sqlval = $post;
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        $objQuery = SC_Query_Ex::getSingletonInstance();
-        // UPDATEの実行
-        $objQuery->update('dtb_baseinfo', $sqlval);
-    }
-
-    public function lfInsertData($post)
-    {
-        // 入力データを渡す。
-        $sqlval = $post;
-        $sqlval['id'] = 1;
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        $objQuery = SC_Query_Ex::getSingletonInstance();
-        // INSERTの実行
-        $objQuery->insert('dtb_baseinfo', $sqlval);
-    }
 }
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
index 933b8cd0ce..628e104841 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
@@ -74,11 +74,7 @@ public function action()
         $this->lfInitParam($objFormParam);
         $objFormParam->setParam($_POST);
 
-        if ($objDb->sfGetBasisExists()) {
-            $this->tpl_mode = 'update';
-        } else {
-            $this->tpl_mode = 'insert';
-        }
+        $this->tpl_mode = 'update'; // 旧バージョンテンプレート互換
 
         if (!empty($_POST)) {
             // 入力値の変換
@@ -88,16 +84,15 @@ public function action()
             if (count($this->arrErr) == 0) {
                 switch ($this->getMode()) {
                     case 'update':
-                        $this->lfUpdateData($objFormParam->getHashArray()); // 既存編集
-                        break;
-                    case 'insert':
-                        $this->lfInsertData($objFormParam->getHashArray()); // 新規作成
+                        SC_Helper_DB_Ex::registerBasisData($objFormParam->getHashArray());
+
+                        // 再表示
+                        $this->tpl_onload = "window.alert('特定商取引法の登録が完了しました。');";
+
                         break;
                     default:
                         break;
                 }
-                // 再表示
-                $this->tpl_onload = "window.alert('特定商取引法の登録が完了しました。');";
             }
         } else {
             $arrRet = $objDb->sfGetBasisData();
@@ -136,22 +131,6 @@ public function lfInitParam(&$objFormParam)
         $objFormParam->addParam('返品・交換について', 'law_term06', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
-    public function lfUpdateData($sqlval)
-    {
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        $objQuery = SC_Query_Ex::getSingletonInstance();
-        // UPDATEの実行
-        $objQuery->update('dtb_baseinfo', $sqlval);
-    }
-
-    public function lfInsertData($sqlval)
-    {
-        $sqlval['update_date'] = 'CURRENT_TIMESTAMP';
-        $objQuery = SC_Query_Ex::getSingletonInstance();
-        // INSERTの実行
-        $objQuery->insert('dtb_baseinfo', $sqlval);
-    }
-
     /* 入力内容のチェック */
 
     /**

From 088b4c3d05c2f26a38eea87e037ed94bffebbb94 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sun, 23 Jul 2023 21:50:33 +0900
Subject: [PATCH 06/88] Fix color on iOS

---
 html/user_data/packages/sphone/css/popup.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/user_data/packages/sphone/css/popup.css b/html/user_data/packages/sphone/css/popup.css
index 33368ca349..6276794604 100644
--- a/html/user_data/packages/sphone/css/popup.css
+++ b/html/user_data/packages/sphone/css/popup.css
@@ -133,6 +133,7 @@ input[type="submit"].nav_nonmember {
     border: none;
     display: block;
     text-align: left;
+    color: #000;
 }
 .navBox li:last-child {
     border-bottom: none;

From e8f553700ca4f33fc542361be86c1ac522603c02 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Wed, 2 Aug 2023 16:40:49 +0900
Subject: [PATCH 07/88] =?UTF-8?q?smarty=5Fmodifier=5Fscript=5Fescape=20?=
 =?UTF-8?q?=E3=81=8C=E8=A4=87=E9=9B=91=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E3=80=81=E9=AB=98=E8=B2=A0=E8=8D=B7=E3=81=8C?=
 =?UTF-8?q?=E3=81=8B=E3=81=8B=E3=82=8B=E3=81=AE=E3=82=92=E6=8A=91=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`$tpl_javascript` はエスケープ不要なので `nofilter` を付与
---
 data/Smarty/templates/default/site_frame.tpl | 2 +-
 data/Smarty/templates/sphone/site_frame.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/Smarty/templates/default/site_frame.tpl b/data/Smarty/templates/default/site_frame.tpl
index df9bc2bfc2..c02dcaef4c 100644
--- a/data/Smarty/templates/default/site_frame.tpl
+++ b/data/Smarty/templates/default/site_frame.tpl
@@ -52,7 +52,7 @@
 <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 
 <script type="text/javascript">//<![CDATA[
-    <!--{$tpl_javascript}-->
+    <!--{$tpl_javascript nofilter}-->
     $(function(){
         <!--{$tpl_onload}-->
     });
diff --git a/data/Smarty/templates/sphone/site_frame.tpl b/data/Smarty/templates/sphone/site_frame.tpl
index c69a035751..70732022a2 100755
--- a/data/Smarty/templates/sphone/site_frame.tpl
+++ b/data/Smarty/templates/sphone/site_frame.tpl
@@ -69,7 +69,7 @@
         <link rel="apple-touch-icon" href="<!--{$TPL_URLPATH}-->img/common/apple-touch-icon.png" />
 
         <script type="text/javascript">//<![CDATA[
-            <!--{$tpl_javascript}-->
+            <!--{$tpl_javascript nofilter}-->
             $(function(){
                 <!--{$tpl_onload}-->
             });

From 05931e5145b19d630f0600abfa63e7a0ede246ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 09:08:34 +0000
Subject: [PATCH 08/88] Bump @typescript-eslint/eslint-plugin from 5.48.0 to
 5.62.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.48.0 to 5.62.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 135 +++++++++++++++++++++++----------------------------
 2 files changed, 63 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index b197654df8..4e85a9ae1d 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "@types/date-fns": "^2.6.0",
     "@types/faker": "^6.6.9",
     "@types/tar": "^6.1.4",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.55.0",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.2.5",
diff --git a/yarn.lock b/yarn.lock
index 59d3b404d6..860c8710ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1132,18 +1132,19 @@
     "@types/node" "*"
     minipass "^4.0.0"
 
-"@typescript-eslint/eslint-plugin@^5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.0.tgz#54f8368d080eb384a455f60c2ee044e948a8ce67"
-  integrity sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.48.0"
-    "@typescript-eslint/type-utils" "5.48.0"
-    "@typescript-eslint/utils" "5.48.0"
+"@typescript-eslint/eslint-plugin@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+  dependencies:
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
-    regexpp "^3.2.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
@@ -1157,14 +1158,6 @@
     "@typescript-eslint/typescript-estree" "5.55.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.0.tgz#607731cb0957fbc52fd754fd79507d1b6659cecf"
-  integrity sha512-0AA4LviDtVtZqlyUQnZMVHydDATpD9SAX/RC5qh6cBd3xmyWvmXYF+WT1oOmxkeMnWDlUVTwdODeucUnjz3gow==
-  dependencies:
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/visitor-keys" "5.48.0"
-
 "@typescript-eslint/scope-manager@5.55.0":
   version "5.55.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210"
@@ -1173,38 +1166,33 @@
     "@typescript-eslint/types" "5.55.0"
     "@typescript-eslint/visitor-keys" "5.55.0"
 
-"@typescript-eslint/type-utils@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.48.0.tgz#40496dccfdc2daa14a565f8be80ad1ae3882d6d6"
-  integrity sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.48.0"
-    "@typescript-eslint/utils" "5.48.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.0.tgz#d725da8dfcff320aab2ac6f65c97b0df30058449"
-  integrity sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==
-
 "@typescript-eslint/types@5.55.0":
   version "5.55.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd"
   integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==
 
-"@typescript-eslint/typescript-estree@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.0.tgz#a7f04bccb001003405bb5452d43953a382c2fac2"
-  integrity sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==
-  dependencies:
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/visitor-keys" "5.48.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
 "@typescript-eslint/typescript-estree@5.55.0":
   version "5.55.0"
@@ -1219,28 +1207,33 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.48.0.tgz#eee926af2733f7156ad8d15e51791e42ce300273"
-  integrity sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
   dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.48.0"
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/typescript-estree" "5.48.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.0.tgz#4446d5e7f6cadde7140390c0e284c8702d944904"
-  integrity sha512-5motVPz5EgxQ0bHjut3chzBkJ3Z3sheYVcSwS5BpHZpLqSptSmELNtGixmgj65+rIfhvtQTz5i9OP2vtzdDH7Q==
-  dependencies:
-    "@typescript-eslint/types" "5.48.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.55.0":
   version "5.55.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2"
@@ -1249,6 +1242,14 @@
     "@typescript-eslint/types" "5.55.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -2057,23 +2058,11 @@ eslint-scope@^7.1.1:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
-  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
-  dependencies:
-    eslint-visitor-keys "^2.0.0"
-
 eslint-visitor-keys@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-
 eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
@@ -2448,6 +2437,11 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -3324,11 +3318,6 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
 regexpu-core@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139"

From 5dcf7d71bb5ea9a9daf8396192ca394e384d0ae3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 09:09:14 +0000
Subject: [PATCH 09/88] Bump @typescript-eslint/parser from 5.55.0 to 5.62.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.55.0 to 5.62.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.62.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index b197654df8..650f05bd7d 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@types/faker": "^6.6.9",
     "@types/tar": "^6.1.4",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.55.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.2.5",
     "browser-sync-webpack-plugin": "^2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 59d3b404d6..a8eb50c9b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1147,14 +1147,14 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.55.0.tgz#8c96a0b6529708ace1dcfa60f5e6aec0f5ed2262"
-  integrity sha512-ppvmeF7hvdhUUZWSd2EEWfzcFkjJzgNQzVST22nzg958CR+sphy8A6K7LXQZd6V75m1VKjp+J4g/PCEfSCmzhw==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.55.0"
-    "@typescript-eslint/types" "5.55.0"
-    "@typescript-eslint/typescript-estree" "5.55.0"
+"@typescript-eslint/parser@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.48.0":
@@ -1165,13 +1165,13 @@
     "@typescript-eslint/types" "5.48.0"
     "@typescript-eslint/visitor-keys" "5.48.0"
 
-"@typescript-eslint/scope-manager@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210"
-  integrity sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw==
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
   dependencies:
-    "@typescript-eslint/types" "5.55.0"
-    "@typescript-eslint/visitor-keys" "5.55.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
 
 "@typescript-eslint/type-utils@5.48.0":
   version "5.48.0"
@@ -1188,10 +1188,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.0.tgz#d725da8dfcff320aab2ac6f65c97b0df30058449"
   integrity sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==
 
-"@typescript-eslint/types@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd"
-  integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
 "@typescript-eslint/typescript-estree@5.48.0":
   version "5.48.0"
@@ -1206,13 +1206,13 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.55.0.tgz#8db7c8e47ecc03d49b05362b8db6f1345ee7b575"
-  integrity sha512-I7X4A9ovA8gdpWMpr7b1BN9eEbvlEtWhQvpxp/yogt48fy9Lj3iE3ild/1H3jKBBIYj5YYJmS2+9ystVhC7eaQ==
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
   dependencies:
-    "@typescript-eslint/types" "5.55.0"
-    "@typescript-eslint/visitor-keys" "5.55.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -1241,12 +1241,12 @@
     "@typescript-eslint/types" "5.48.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2"
-  integrity sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
   dependencies:
-    "@typescript-eslint/types" "5.55.0"
+    "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":

From 1c004717b7e6961abedb8ec569cd229bc75807fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 09:31:50 +0000
Subject: [PATCH 10/88] Bump setasign/fpdf from 1.8.5 to 1.8.6

Bumps [setasign/fpdf](https://github.com/Setasign/FPDF) from 1.8.5 to 1.8.6.
- [Release notes](https://github.com/Setasign/FPDF/releases)
- [Changelog](https://github.com/Setasign/FPDF/blob/master/changelog.htm)
- [Commits](https://github.com/Setasign/FPDF/compare/1.8.5...1.8.6)

---
updated-dependencies:
- dependency-name: setasign/fpdf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index e2b3078d0b..6cca548a09 100644
--- a/composer.lock
+++ b/composer.lock
@@ -635,16 +635,16 @@
         },
         {
             "name": "setasign/fpdf",
-            "version": "1.8.5",
+            "version": "1.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDF.git",
-                "reference": "f4104a04c9a3f95c4c26a0a0531abebcc980987a"
+                "reference": "0838e0ee4925716fcbbc50ad9e1799b5edfae0a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDF/zipball/f4104a04c9a3f95c4c26a0a0531abebcc980987a",
-                "reference": "f4104a04c9a3f95c4c26a0a0531abebcc980987a",
+                "url": "https://api.github.com/repos/Setasign/FPDF/zipball/0838e0ee4925716fcbbc50ad9e1799b5edfae0a0",
+                "reference": "0838e0ee4925716fcbbc50ad9e1799b5edfae0a0",
                 "shasum": ""
             },
             "require": {
@@ -675,9 +675,9 @@
                 "pdf"
             ],
             "support": {
-                "source": "https://github.com/Setasign/FPDF/tree/1.8.5"
+                "source": "https://github.com/Setasign/FPDF/tree/1.8.6"
             },
-            "time": "2022-11-18T07:02:00+00:00"
+            "time": "2023-06-26T14:44:25+00:00"
         },
         {
             "name": "setasign/fpdi",

From ee47025e5ab3752120b476fe8d17b9bf04461273 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 09:39:18 +0000
Subject: [PATCH 11/88] Bump svenstaro/upload-release-action from 1.pre.release
 to 2.7.0

Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 1.pre.release to 2.7.0.
- [Release notes](https://github.com/svenstaro/upload-release-action/releases)
- [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenstaro/upload-release-action/compare/v1-release...2.7.0)

---
updated-dependencies:
- dependency-name: svenstaro/upload-release-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 27d5699759..7f6216f207 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -180,7 +180,7 @@ jobs:
 
       - name: Upload binaries to release of TGZ
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz
@@ -189,7 +189,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip
@@ -198,7 +198,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ md5 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.md5
@@ -207,7 +207,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ sha1 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.sha1
@@ -216,7 +216,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ sha256 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.sha256
@@ -225,7 +225,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP md5 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.md5
@@ -234,7 +234,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP sha1 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.sha1
@@ -243,7 +243,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP sha256 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.sha256

From 28af2485adf2ff6cf0440e2ef787ece02de18e5a Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sat, 2 Sep 2023 00:44:21 +0900
Subject: [PATCH 12/88] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9C=E3=82=A4?=
 =?UTF-8?q?=E3=82=B9=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 納品書を4.2系と同様にインボイス準拠するよう対応
- 受注完了メールの「うち消費税」の表記を削除(暫定)
---
 .../default/mail_templates/order_mail.tpl     |  2 +-
 .../mobile/mail_templates/order_mail.tpl      |  2 +-
 data/class/SC_Fpdf.php                        | 37 ++++++++++++++++++-
 data/class/helper/SC_Helper_TaxRule.php       | 22 +++++++++++
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/data/Smarty/templates/default/mail_templates/order_mail.tpl b/data/Smarty/templates/default/mail_templates/order_mail.tpl
index b58cd99a86..5d9d58ae6e 100644
--- a/data/Smarty/templates/default/mail_templates/order_mail.tpl
+++ b/data/Smarty/templates/default/mail_templates/order_mail.tpl
@@ -56,7 +56,7 @@
 
 <!--{/section}-->
 -------------------------------------------------
-小　計 ￥<!--{$arrOrder.subtotal|n2s|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|n2s|default:0}-->)<!--{/if}-->
+小　計 ￥<!--{$arrOrder.subtotal|n2s|default:0}-->
 
 <!--{if $arrOrder.use_point > 0}-->
 値引き ￥<!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|n2s|default:0}-->
diff --git a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
index 84de76be3d..ef2806f60a 100644
--- a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
+++ b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
@@ -49,7 +49,7 @@
 
 <!--{/section}-->
 
-小　計 ￥<!--{$arrOrder.subtotal|n2s|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|n2s|default:0}-->)<!--{/if}-->
+小　計 ￥<!--{$arrOrder.subtotal|n2s|default:0}-->
 
 <!--{if $arrOrder.use_point > 0}-->
 値引き ￥<!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|n2s|default:0}-->
diff --git a/data/class/SC_Fpdf.php b/data/class/SC_Fpdf.php
index 9a2b57af16..886c328372 100644
--- a/data/class/SC_Fpdf.php
+++ b/data/class/SC_Fpdf.php
@@ -155,6 +155,11 @@ private function setShopData()
         //ロゴ画像
         $logo_file = PDF_TEMPLATE_REALDIR . 'logo.png';
         $this->Image($logo_file, 124, 46, 40);
+
+        if (defined('INVOICE_REGISTRATION_NUM')) {
+            $text = '登録番号: '.INVOICE_REGISTRATION_NUM;
+            $this->lfText(125, 87, $text, 8);
+        }
     }
 
     private function setMessageData()
@@ -228,6 +233,8 @@ private function setOrderData()
         $monetary_unit = '円';
         $point_unit = 'Pt';
 
+        $arrTaxableTotal = [];
+        $defaultTaxRule = SC_Helper_TaxRule_Ex::getTaxRule();
         // 購入商品情報
         for ($i = 0; $i < count($this->arrDisp['quantity']); $i++) {
             // 購入数量
@@ -249,9 +256,18 @@ private function setOrderData()
                     $arrOrder[$i][0] .= ' * '.$this->arrDisp['classcategory_name2'][$i].' ]';
                 }
             }
+
+            // 標準税率より低い税率は軽減税率として※を付与
+            if ($this->arrDisp['tax_rate'][$i] < $defaultTaxRule['tax_rate']) {
+                $arrOrder[$i][0] .= ' ※';
+            }
             $arrOrder[$i][1]  = number_format($data[0]);
             $arrOrder[$i][2]  = number_format($data[1]).$monetary_unit;
             $arrOrder[$i][3]  = number_format($data[2]).$monetary_unit;
+            if (array_key_exists($this->arrDisp['tax_rate'][$i], $arrTaxableTotal) === false) {
+                $arrTaxableTotal[$this->arrDisp['tax_rate'][$i]] = 0;
+            }
+            $arrTaxableTotal[$this->arrDisp['tax_rate'][$i]] += $data[2];
         }
 
         $arrOrder[$i][0] = '';
@@ -270,18 +286,21 @@ private function setOrderData()
         $arrOrder[$i][1] = '';
         $arrOrder[$i][2] = '送料';
         $arrOrder[$i][3] = number_format($this->arrDisp['deliv_fee']).$monetary_unit;
+        $arrTaxableTotal[intval($defaultTaxRule['tax_rate'])] += $this->arrDisp['deliv_fee'];
 
         $i++;
         $arrOrder[$i][0] = '';
         $arrOrder[$i][1] = '';
         $arrOrder[$i][2] = '手数料';
         $arrOrder[$i][3] = number_format($this->arrDisp['charge']).$monetary_unit;
+        $arrTaxableTotal[intval($defaultTaxRule['tax_rate'])] += $this->arrDisp['charge'];
 
         $i++;
         $arrOrder[$i][0] = '';
         $arrOrder[$i][1] = '';
         $arrOrder[$i][2] = '値引き';
-        $arrOrder[$i][3] = '- '.number_format(($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount']).$monetary_unit;
+        $discount_total = ($this->arrDisp['use_point'] * POINT_VALUE) + $this->arrDisp['discount'];
+        $arrOrder[$i][3] = '- '.number_format($discount_total).$monetary_unit;
 
         $i++;
         $arrOrder[$i][0] = '';
@@ -311,6 +330,22 @@ private function setOrderData()
         }
 
         $this->FancyTable($this->label_cell, $arrOrder, $this->width_cell);
+
+        $this->SetLineWidth(.3);
+        $this->SetFont('SJIS', '', 6);
+
+        $this->Cell(0, 0, '', 0, 1, 'C', 0, '');
+        // 行頭近くの場合、表示崩れがあるためもう一個字下げする
+        if (270 <= $this->GetY()) {
+            $this->Cell(0, 0, '', 0, 1, 'C', 0, '');
+        }
+        $width = array_reduce($this->width_cell, function ($n, $w) {
+            return $n + $w;
+        });
+        $this->SetX(20);
+
+        $message = SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total);
+        $this->MultiCell($width, 4, $message, 0, 'R', 0, '');
     }
 
     /**
diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index d01b50b54f..d707e5775f 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -62,6 +62,28 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr
         return SC_Helper_TaxRule_Ex::calcTax($price, $arrTaxRule['tax_rate'], $arrTaxRule['tax_rule'], $arrTaxRule['tax_adjust']);
     }
 
+    /**
+     * 消費税の内訳を返す.
+     *
+     * 値引額合計は税率ごとに按分する.
+     *
+     * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額
+     * @param int $discount_total 値引額合計
+     */
+    public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string
+    {
+        ksort($arrTaxableTotal);
+        $tax = [];
+        $taxable_total = array_sum($arrTaxableTotal);
+        $result = '';
+        foreach ($arrTaxableTotal as $rate => $total) {
+            $tax = round(($total - $discount_total * $total / array_sum($arrTaxableTotal)) * ($rate / (100 + $rate)));
+            $result .= '('.$rate.'%対象: '.number_format(round($total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL;
+        }
+
+        return $result;
+    }
+
     /**
      * 設定情報IDに基づいて税金付与した金額を返す
      * (受注データのようにルールが決まっている場合用)

From 1077a191fdbc56dcb58dd43a060c35c9cf2bfa70 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sun, 3 Sep 2023 23:00:38 +0900
Subject: [PATCH 13/88] Fix reduced total

---
 data/class/helper/SC_Helper_TaxRule.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index d707e5775f..9ca5d95fc2 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -77,8 +77,9 @@ public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): stri
         $taxable_total = array_sum($arrTaxableTotal);
         $result = '';
         foreach ($arrTaxableTotal as $rate => $total) {
-            $tax = round(($total - $discount_total * $total / array_sum($arrTaxableTotal)) * ($rate / (100 + $rate)));
-            $result .= '('.$rate.'%対象: '.number_format(round($total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL;
+            $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal);
+            $tax = round($reduced_total * ($rate / (100 + $rate)));
+            $result .= '('.$rate.'%対象: '.number_format(round($reduced_total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL;
         }
 
         return $result;

From 9fde0f29659f42fac53f3ef5b31cc0a8a3225c62 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sat, 9 Sep 2023 01:21:54 +0900
Subject: [PATCH 14/88] =?UTF-8?q?=E7=A8=8E=E9=A1=8D=E9=9B=86=E8=A8=88?=
 =?UTF-8?q?=E3=81=A8=E5=86=85=E8=A8=B3=E5=87=BA=E5=8A=9B=E3=81=AE=E3=83=A1?=
 =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E5=88=86=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/helper/SC_Helper_TaxRule.php | 38 ++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index 9ca5d95fc2..206d6d34cd 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -65,21 +65,51 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr
     /**
      * 消費税の内訳を返す.
      *
+     * 税率ごとに以下のような連想配列を返す.
+     * - total: 値引後の税込み合計金額
+     * - tax: 値引後の税額
      * 値引額合計は税率ごとに按分する.
+     * 課税規則は標準税率の設定を使用する.
      *
      * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額
      * @param int $discount_total 値引額合計
+     * @return array{8?:array{total:int,tax:int}, 10?:array{total:int,tax:int}}
      */
-    public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string
+    public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array
     {
+        $arrDefaultTaxRule = static::getTaxRule();
+
         ksort($arrTaxableTotal);
         $tax = [];
         $taxable_total = array_sum($arrTaxableTotal);
-        $result = '';
+        $result = [];
         foreach ($arrTaxableTotal as $rate => $total) {
             $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal);
-            $tax = round($reduced_total * ($rate / (100 + $rate)));
-            $result .= '('.$rate.'%対象: '.number_format(round($reduced_total)).'円 内消費税: '.number_format($tax).'円)'.PHP_EOL;
+            $tax = $reduced_total * ($rate / (100 + $rate));
+            $result[$rate] = [
+                'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])),
+                'tax' => intval(static::roundByCalcRule($tax, $arrDefaultTaxRule['calc_rule'])),
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * 消費税の内訳の文字列を返す.
+     *
+     * 複数の税率がある場合は改行で区切る.
+     *
+     * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額
+     * @param int $discount_total 値引額合計
+     * @return string (<税率>%対象: <値引後税込合計>円 内消費税: <値引後税額>円)
+     */
+    public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string
+    {
+        $arrTaxPerTaxRate = static::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        $result = '';
+        foreach ($arrTaxPerTaxRate as $rate => $item) {
+            $result .= '('.$rate .'%対象: '. number_format($item['total']).'円 内消費税: '.number_format($item['tax']).'円)'.PHP_EOL;
         }
 
         return $result;

From 70717b99b71d54a4461fa184bd810ca937b80b49 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sat, 9 Sep 2023 01:22:48 +0900
Subject: [PATCH 15/88] Add unit test

---
 data/class/helper/SC_Helper_TaxRule.php       |   4 +-
 .../SC_Helper_TaxRule_TestBase.php            |   2 +-
 .../SC_Helper_TaxRule_getTaxDetailTest.php    | 159 ++++++++++++++++++
 3 files changed, 162 insertions(+), 3 deletions(-)
 create mode 100644 tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index 206d6d34cd..44ca75158b 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -75,7 +75,7 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr
      * @param int $discount_total 値引額合計
      * @return array{8?:array{total:int,tax:int}, 10?:array{total:int,tax:int}}
      */
-    public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array
+    public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total = 0)
     {
         $arrDefaultTaxRule = static::getTaxRule();
 
@@ -104,7 +104,7 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_to
      * @param int $discount_total 値引額合計
      * @return string (<税率>%対象: <値引後税込合計>円 内消費税: <値引後税額>円)
      */
-    public static function getTaxDetail($arrTaxableTotal, $discount_total = 0): string
+    public static function getTaxDetail($arrTaxableTotal, $discount_total = 0)
     {
         $arrTaxPerTaxRate = static::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
         $result = '';
diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php
index a721eaf5ed..22691105d3 100644
--- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php
+++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_TestBase.php
@@ -28,7 +28,7 @@
  * @author Nobuhiko Kimoto
  * @version $Id$
  */
-class SC_Helper_TaxRule_TestBase extends Common_TestCase
+abstract class SC_Helper_TaxRule_TestBase extends Common_TestCase
 {
 
     /**
diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
new file mode 100644
index 0000000000..1f67e12aa7
--- /dev/null
+++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
@@ -0,0 +1,159 @@
+<?php
+require __DIR__.'/SC_Helper_TaxRule_TestBase.php';
+
+class SC_Helper_TaxRule_getDetailTest extends SC_Helper_TaxRule_TestBase
+{
+    private $taxs = [];
+    protected function setUp()
+    {
+        parent::setUp();
+    }
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+    }
+
+    public function testGetTaxPerTaxRateWithRound()
+    {
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '1',
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 724431,
+            8 => 65756,
+        ];
+        $discount_total = 7159;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'total' => 65160,
+                    'tax' => 4827
+                ],
+                10 => [
+                    'total' => 717868,
+                    'tax' => 65261
+                ]
+            ],
+            $actual
+        );
+
+        self::assertSame(
+            '(8%対象: 65,160円 内消費税: 4,827円)'.PHP_EOL.
+                '(10%対象: 717,868円 内消費税: 65,261円)'.PHP_EOL,
+            SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total)
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testGetTaxPerTaxRateWithFloor()
+    {
+        self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly');
+
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '2', // floor
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 724431,
+            8 => 65756,
+        ];
+        $discount_total = 7159;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'total' => 65160,
+                    'tax' => 4826
+                ],
+                10 => [
+                    'total' => 717867,
+                    'tax' => 65260
+                ]
+            ],
+            $actual
+        );
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testGetTaxPerTaxRateWithCeil()
+    {
+        self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly');
+
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '3', // ceil
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 724431,
+            8 => 65756,
+        ];
+        $discount_total = 7159;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'total' => 65161,
+                    'tax' => 4827
+                ],
+                10 => [
+                    'total' => 717868,
+                    'tax' => 65261
+                ]
+            ],
+            $actual
+        );
+    }
+
+    protected function setUpTaxRule(array $taxs = [])
+    {
+        $this->objQuery->delete('dtb_tax_rule');
+        foreach ($taxs as $key => $item) {
+            $this->objQuery->insert('dtb_tax_rule', $item);
+        }
+    }
+}

From e461703593205dc3f2921a04256b26f828aa3a75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 09:27:52 +0000
Subject: [PATCH 16/88] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/coverage.yml          | 2 +-
 .github/workflows/deploy.yml            | 4 ++--
 .github/workflows/dockerbuild.yml       | 2 +-
 .github/workflows/e2e-tests.yml         | 4 ++--
 .github/workflows/main.yml              | 4 ++--
 .github/workflows/penetration-tests.yml | 2 +-
 .github/workflows/phpstan.yml           | 2 +-
 .github/workflows/security-checker.yml  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 2de9bede03..3138926884 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -51,7 +51,7 @@ jobs:
           - 1025:1025
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Get Composer Cache Directory
       id: composer-cache
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 27d5699759..7c7651daf6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -78,10 +78,10 @@ jobs:
 
       - name: Checkout code
         if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'prereleased' )
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout code
         if: github.event_name == 'schedule' && env.DEPLOY == 1
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.TAG_NAME }}
 
diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index e6cdd862bc..a881ef2c55 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -54,7 +54,7 @@ jobs:
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       ## Used when creating multi-platform images
       # - name: Set up QEMU
       #   uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index f12c5d3442..4130d27753 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # - name: Create ADMIN_DIR
     #   run: |
@@ -127,7 +127,7 @@ jobs:
         echo "APCU=apcu" >>  ${GITHUB_ENV}
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup environment
       env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68af623869..16abd4eaf8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -61,7 +61,7 @@ jobs:
           - 1025:1025
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Get Composer Cache Directory
       id: composer-cache
@@ -154,7 +154,7 @@ jobs:
         php: [ 5.5, 5.6, 7.1, 7.2, 7.3, 7.4 ]
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Get Composer Cache Directory
       id: composer-cache
diff --git a/.github/workflows/penetration-tests.yml b/.github/workflows/penetration-tests.yml
index 8c1469dc5b..c5f6a4d150 100644
--- a/.github/workflows/penetration-tests.yml
+++ b/.github/workflows/penetration-tests.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # - name: Create ADMIN_DIR
     #   run: |
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index e31932e55e..1564e9aa39 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -31,7 +31,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Setup PHP
       uses: nanasess/setup-php@master
       with:
diff --git a/.github/workflows/security-checker.yml b/.github/workflows/security-checker.yml
index 132ad217d8..f4aa93b154 100644
--- a/.github/workflows/security-checker.yml
+++ b/.github/workflows/security-checker.yml
@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checking Security Vulnerabilities
         uses: symfonycorp/security-checker-action@v5

From c654b7037081deb0f40d0ac78eeb5ac8d0b45b67 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Wed, 13 Sep 2023 22:41:03 +0900
Subject: [PATCH 17/88] =?UTF-8?q?debian-stretch=20=E3=81=8C=20archive=20?=
 =?UTF-8?q?=E3=81=B8=E7=A7=BB=E5=8B=95=E3=81=97=E3=81=9F=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=20sources.list=20=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

archive.debian.org は遅いので cloudfront の mirror を使用する
---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 3c902a30f7..3e27089bac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,10 @@ ARG FORCE_YES="--force-yes"
 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi
 RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi
 
+RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list
+RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list
+RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
+
 # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev
 # ext-pgsql: libpq-dev
 # ext-zip: libzip-dev zlib1g-dev

From 4a12b8bbbb209e795362f0a30ef51e503ec0d3ae Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sat, 16 Sep 2023 23:19:27 +0900
Subject: [PATCH 18/88] Add PHP8.2

---
 .github/workflows/dockerbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index e6cdd862bc..0bc9876d2f 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
 
     steps:
       - name: downcase REPO

From b13489369bf3448b40ddd8df4bdeafe99677497b Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sun, 17 Sep 2023 02:20:21 +0900
Subject: [PATCH 19/88] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dockerbuild.yml | 14 +++++++++++---
 .github/workflows/e2e-tests.yml   | 16 ++++++++++++++--
 Dockerfile                        | 17 +++++++++++------
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index e6cdd862bc..cfccdb5d3a 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -32,14 +32,22 @@ jobs:
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-          echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+          echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+          echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
       - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+          echo "APCU=" >>  ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php == 7.0 }}
+        run: |
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
       - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index f12c5d3442..ffd5659be2 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -109,22 +109,34 @@ jobs:
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+        echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
     - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+        echo "APCU=" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php == 7.0 }}
+      run: |
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
     - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
     - if: ${{ matrix.php >= 7.4 }}
       run: |
         echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
 
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/Dockerfile b/Dockerfile
index 3e27089bac..a5b6a7c8b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,19 @@ FROM php:${TAG}
 ARG GD_OPTIONS="--with-freetype --with-jpeg"
 ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache"
 ARG APCU="apcu"
-ARG FORCE_YES="--force-yes"
+ARG FORCE_YES=""
+ARG APT_REPO="deb.debian.org"
+ARG APT_SECURITY_REPO="security.debian.org"
+
 # See https://github.com/debuerreotype/debuerreotype/issues/10
 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi
 RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi
 
-RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list
-RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
+RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list;
+RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list;
+RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie
+RUN sed -i '/stretch-updates/d' /etc/apt/sources.list # for stretch
+RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # for jessie
 
 # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev
 # ext-pgsql: libpq-dev
@@ -31,7 +36,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS}
-RUN pecl install ${APCU} && docker-php-ext-enable apcu
+RUN if [[ ${APCU} ]]; then  pecl install ${APCU} && docker-php-ext-enable apcu; fi
 
 # composer
 COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer
@@ -68,4 +73,4 @@ COPY composer.lock ${ECCUBE_PREFIX}/composer.lock
 RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX}
 
 COPY . ${ECCUBE_PREFIX}
-RUN composer dumpautoload -o --apcu
+RUN composer dumpautoload -o

From 9e56bdfa17921408f9b07f3e468be0433217215b Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sun, 17 Sep 2023 02:20:21 +0900
Subject: [PATCH 20/88] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dockerbuild.yml | 26 ++++++++++++++++++++++----
 .github/workflows/e2e-tests.yml   | 28 ++++++++++++++++++++++++----
 Dockerfile                        | 17 +++++++++++------
 3 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index e6cdd862bc..9b07fcb0fe 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -32,26 +32,42 @@ jobs:
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-          echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+          echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+          echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
       - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+          echo "APCU=" >>  ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
-      - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php == 7.0 }}
+        run: |
+          echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+          echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+          echo "APCU=apcu" >>  ${GITHUB_ENV}
+          echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
       - if: ${{ matrix.php >= 7.4 }}
         run: |
           echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -97,6 +113,8 @@ jobs:
             GD_OPTIONS=${{ env.GD_OPTIONS }}
             EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }}
             APCU=${{ env.APCU }}
+            APT_REPO=${{ env.APT_REPO }}
+            APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}
 
       - name: Setup to EC-CUBE
         env:
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index f12c5d3442..27ad0e76c6 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -109,22 +109,42 @@ jobs:
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+        echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
     - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-    - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
+        echo "APCU=" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php == 7.0 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
+      run: |
+        echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+        echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+        echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
     - if: ${{ matrix.php >= 7.4 }}
       run: |
         echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
 
     - name: Checkout
       uses: actions/checkout@v3
@@ -142,7 +162,7 @@ jobs:
         sudo chown -R 1001:1000 zap
         sudo chmod -R g+w zap
         sh -c 'echo "<?php" >> data/config/config.php'
-        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU}" .
+        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU} APT_REPO=${{ env.APT_REPO }} APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}" .
         docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache
         TAG=${PHP_VERSION_TAG}-apache docker-compose up -d
 
diff --git a/Dockerfile b/Dockerfile
index 3e27089bac..a5b6a7c8b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,19 @@ FROM php:${TAG}
 ARG GD_OPTIONS="--with-freetype --with-jpeg"
 ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache"
 ARG APCU="apcu"
-ARG FORCE_YES="--force-yes"
+ARG FORCE_YES=""
+ARG APT_REPO="deb.debian.org"
+ARG APT_SECURITY_REPO="security.debian.org"
+
 # See https://github.com/debuerreotype/debuerreotype/issues/10
 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi
 RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi
 
-RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list
-RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
+RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list;
+RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list;
+RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie
+RUN sed -i '/stretch-updates/d' /etc/apt/sources.list # for stretch
+RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # for jessie
 
 # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev
 # ext-pgsql: libpq-dev
@@ -31,7 +36,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS}
-RUN pecl install ${APCU} && docker-php-ext-enable apcu
+RUN if [[ ${APCU} ]]; then  pecl install ${APCU} && docker-php-ext-enable apcu; fi
 
 # composer
 COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer
@@ -68,4 +73,4 @@ COPY composer.lock ${ECCUBE_PREFIX}/composer.lock
 RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX}
 
 COPY . ${ECCUBE_PREFIX}
-RUN composer dumpautoload -o --apcu
+RUN composer dumpautoload -o

From 0945ae107870fe1ac263c5e2d88953e0c0e945d6 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Sun, 17 Sep 2023 02:20:21 +0900
Subject: [PATCH 21/88] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/dockerbuild.yml | 28 +++++++++++++++++++++++-----
 .github/workflows/e2e-tests.yml   | 30 +++++++++++++++++++++++++-----
 Dockerfile                        | 17 +++++++++++------
 3 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index e6cdd862bc..dd585f1ea7 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
 
     steps:
       - name: downcase REPO
@@ -32,26 +32,42 @@ jobs:
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-          echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+          echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+          echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
       - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+          echo "APCU=" >>  ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
-      - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php == 7.0 }}
+        run: |
+          echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+          echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+          echo "APCU=apcu" >>  ${GITHUB_ENV}
+          echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
       - if: ${{ matrix.php >= 7.4 }}
         run: |
           echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -97,6 +113,8 @@ jobs:
             GD_OPTIONS=${{ env.GD_OPTIONS }}
             EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }}
             APCU=${{ env.APCU }}
+            APT_REPO=${{ env.APT_REPO }}
+            APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}
 
       - name: Setup to EC-CUBE
         env:
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index f12c5d3442..916cd69865 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -89,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         db: [ 'pgsql', 'mysql' ]
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
         include:
           - db: mysql
             dbport: '3306'
@@ -109,22 +109,42 @@ jobs:
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+        echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
     - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-    - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
+        echo "APCU=" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php == 7.0 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
+      run: |
+        echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+        echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+        echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
     - if: ${{ matrix.php >= 7.4 }}
       run: |
         echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
 
     - name: Checkout
       uses: actions/checkout@v3
@@ -142,7 +162,7 @@ jobs:
         sudo chown -R 1001:1000 zap
         sudo chmod -R g+w zap
         sh -c 'echo "<?php" >> data/config/config.php'
-        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU}" .
+        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU} APT_REPO=${{ env.APT_REPO }} APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}" .
         docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache
         TAG=${PHP_VERSION_TAG}-apache docker-compose up -d
 
diff --git a/Dockerfile b/Dockerfile
index 3e27089bac..a5b6a7c8b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,14 +5,19 @@ FROM php:${TAG}
 ARG GD_OPTIONS="--with-freetype --with-jpeg"
 ARG EXT_INSTALL_ARGS="gd zip mysqli pgsql opcache"
 ARG APCU="apcu"
-ARG FORCE_YES="--force-yes"
+ARG FORCE_YES=""
+ARG APT_REPO="deb.debian.org"
+ARG APT_SECURITY_REPO="security.debian.org"
+
 # See https://github.com/debuerreotype/debuerreotype/issues/10
 RUN if [ ! -d /usr/share/man/man1 ]; then mkdir /usr/share/man/man1; fi
 RUN if [ ! -d /usr/share/man/man7 ]; then mkdir /usr/share/man/man7; fi
 
-RUN sed -i s,deb.debian.org,cloudfront.debian.net/debian-archive,g /etc/apt/sources.list
-RUN sed -i 's,security.debian.org,cloudfront.debian.net/debian-archive,g' /etc/apt/sources.list
-RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
+RUN sed -i s,deb.debian.org,${APT_REPO},g /etc/apt/sources.list;
+RUN sed -i s,security.debian.org,${APT_SECURITY_REPO},g /etc/apt/sources.list;
+RUN sed -i s,httpredir.debian.org,${APT_REPO},g /etc/apt/sources.list; # for jessie
+RUN sed -i '/stretch-updates/d' /etc/apt/sources.list # for stretch
+RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # for jessie
 
 # ext-gd: libfreetype6-dev libjpeg62-turbo-dev libpng-dev
 # ext-pgsql: libpq-dev
@@ -31,7 +36,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-configure gd ${GD_OPTIONS} && docker-php-ext-install ${EXT_INSTALL_ARGS}
-RUN pecl install ${APCU} && docker-php-ext-enable apcu
+RUN if [[ ${APCU} ]]; then  pecl install ${APCU} && docker-php-ext-enable apcu; fi
 
 # composer
 COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer
@@ -68,4 +73,4 @@ COPY composer.lock ${ECCUBE_PREFIX}/composer.lock
 RUN composer install --no-scripts --no-autoloader --no-dev -d ${ECCUBE_PREFIX}
 
 COPY . ${ECCUBE_PREFIX}
-RUN composer dumpautoload -o --apcu
+RUN composer dumpautoload -o

From 4b2f76b6bfff33b4094595b881f7ec49e04292a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:36:29 +0000
Subject: [PATCH 22/88] Bump docker/login-action from 2 to 3

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dockerbuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index e6cdd862bc..9d48362c43 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -65,7 +65,7 @@ jobs:
         run: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From 988f46c4c761268f47b2a65d7dc88de49e7ceeda Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Wed, 20 Sep 2023 00:06:16 +0900
Subject: [PATCH 23/88] Fix Division by zero on PHP8.0+

---
 data/class/helper/SC_Helper_TaxRule.php       |  5 ++-
 .../SC_Helper_TaxRule_getTaxDetailTest.php    | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index 44ca75158b..309c5e2f5f 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -84,7 +84,10 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total
         $taxable_total = array_sum($arrTaxableTotal);
         $result = [];
         foreach ($arrTaxableTotal as $rate => $total) {
-            $reduced_total = $total - $discount_total * $total / array_sum($arrTaxableTotal);
+            if ($taxable_total > 0) {
+                $reduced_total = $total - $discount_total * $total / $taxable_total;
+            }
+
             $tax = $reduced_total * ($rate / (100 + $rate));
             $result[$rate] = [
                 'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])),
diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
index 1f67e12aa7..d0e9112b3a 100644
--- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
+++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
@@ -59,6 +59,51 @@ public function testGetTaxPerTaxRateWithRound()
         );
     }
 
+    public function testGetTaxPerTaxRateWithZero()
+    {
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '1',
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 0,
+            8 => 0,
+        ];
+        $discount_total = 0;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'total' => 0,
+                    'tax' => 0
+                ],
+                10 => [
+                    'total' => 0,
+                    'tax' => 0
+                ]
+            ],
+            $actual
+        );
+
+        self::assertSame(
+            '(8%対象: 0円 内消費税: 0円)'.PHP_EOL.
+                '(10%対象: 0円 内消費税: 0円)'.PHP_EOL,
+            SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total)
+        );
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState disabled

From f58bc77f1a5cd9926a273b005d46b8c29e8b1b2c Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 18 Oct 2023 15:46:55 +0900
Subject: [PATCH 24/88] =?UTF-8?q?=E3=83=95=E3=83=AD=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=A7=E5=87=BA=E5=8A=9B=E3=83=90=E3=83=83?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=83=AA=E3=83=B3=E3=82=B0=E3=81=8C=E7=84=A1?=
 =?UTF-8?q?=E5=8A=B9=E3=81=A8=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=20#777?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/require_base.php  | 2 ++
 html/admin/require.php | 1 -
 html/install/index.php | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/require_base.php b/data/require_base.php
index 4c7513583d..3891955f7b 100644
--- a/data/require_base.php
+++ b/data/require_base.php
@@ -21,6 +21,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+ ob_start();
+
 if (!defined('DATA_REALDIR')) {
     define('DATA_REALDIR', HTML_REALDIR . HTML2DATA_DIR);
 }
diff --git a/html/admin/require.php b/html/admin/require.php
index a9cd76b818..0d61d15baf 100644
--- a/html/admin/require.php
+++ b/html/admin/require.php
@@ -29,4 +29,3 @@
 
 require_once HTML_REALDIR . 'define.php';
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
-ob_start();
diff --git a/html/install/index.php b/html/install/index.php
index fb11b432ad..609034fd53 100644
--- a/html/install/index.php
+++ b/html/install/index.php
@@ -41,7 +41,6 @@
 defined('ADMIN_DIR') or define('ADMIN_DIR', '');
 
 require_once HTML_REALDIR . HTML2DATA_DIR . 'require_base.php';
-ob_start();
 // ▲require.php 相当
 
 $ownDir = realpath(dirname(__FILE__)) . '/';

From f2e5f74e051eb66711b17647e47480d63a7d5054 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 19 Oct 2023 22:00:29 +0900
Subject: [PATCH 25/88] =?UTF-8?q?=E3=82=AB=E3=83=B3=E3=83=9E=E5=8C=BA?=
 =?UTF-8?q?=E5=88=87=E3=82=8A=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=80=82?=
 =?UTF-8?q?=E8=AA=A4=E3=81=A3=E3=81=9F=E5=80=A4=E5=BC=95=E3=81=8D=E9=A1=8D?=
 =?UTF-8?q?=E3=81=8C=E5=87=BA=E5=8A=9B=E3=81=95=E3=82=8C=E3=82=8B=E3=80=82?=
 =?UTF-8?q?=20#780?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/Smarty/templates/default/cart/index.tpl                | 2 +-
 data/Smarty/templates/default/mail_templates/order_mail.tpl | 4 ++--
 data/Smarty/templates/mobile/cart/index.tpl                 | 2 +-
 data/Smarty/templates/mobile/mail_templates/order_mail.tpl  | 4 ++--
 data/Smarty/templates/sphone/cart/index.tpl                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/Smarty/templates/default/cart/index.tpl b/data/Smarty/templates/default/cart/index.tpl
index 657b889f90..dc18013678 100644
--- a/data/Smarty/templates/default/cart/index.tpl
+++ b/data/Smarty/templates/default/cart/index.tpl
@@ -136,7 +136,7 @@
                             <!--{/foreach}-->
                             <tr>
                                 <th colspan="5" class="alignR">合計</th>
-                                <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|n2s|h}-->円</span></td>
+                                <td class="alignR"><span class="price"><!--{$arrData[$key].subtotal|n2s|h}-->円</span></td>
                             </tr>
                             <!--{if $smarty.const.USE_POINT !== false}-->
                                 <!--{if $arrData[$key].birth_point > 0}-->
diff --git a/data/Smarty/templates/default/mail_templates/order_mail.tpl b/data/Smarty/templates/default/mail_templates/order_mail.tpl
index b58cd99a86..08a2416735 100644
--- a/data/Smarty/templates/default/mail_templates/order_mail.tpl
+++ b/data/Smarty/templates/default/mail_templates/order_mail.tpl
@@ -58,8 +58,8 @@
 -------------------------------------------------
 小　計 ￥<!--{$arrOrder.subtotal|n2s|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|n2s|default:0}-->)<!--{/if}-->
 
-<!--{if $arrOrder.use_point > 0}-->
-値引き ￥<!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|n2s|default:0}-->
+<!--{if $arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount > 0}-->
+値引き ￥<!--{($arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount)|n2s|default:0}-->
 <!--{/if}-->
 送　料 ￥<!--{$arrOrder.deliv_fee|n2s|default:0}-->
 手数料 ￥<!--{$arrOrder.charge|n2s|default:0}-->
diff --git a/data/Smarty/templates/mobile/cart/index.tpl b/data/Smarty/templates/mobile/cart/index.tpl
index 366c63be08..f69b09017b 100644
--- a/data/Smarty/templates/mobile/cart/index.tpl
+++ b/data/Smarty/templates/mobile/cart/index.tpl
@@ -72,7 +72,7 @@
                     <HR>
                 <!--{/foreach}-->
                 <font color="#FF0000">
-                合計:<!--{$arrData[$key].total-$arrData[$key].deliv_fee|n2s}-->円<br>
+                合計:<!--{$arrData[$key].subtotal|n2s}-->円<br>
                 </font>
                 <br>
                 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
diff --git a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
index 84de76be3d..3c042f9d5c 100644
--- a/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
+++ b/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
@@ -51,8 +51,8 @@
 
 小　計 ￥<!--{$arrOrder.subtotal|n2s|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|n2s|default:0}-->)<!--{/if}-->
 
-<!--{if $arrOrder.use_point > 0}-->
-値引き ￥<!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|n2s|default:0}-->
+<!--{if $arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount > 0}-->
+値引き ￥<!--{($arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount)|n2s|default:0}-->
 <!--{/if}-->
 送　料 ￥<!--{$arrOrder.deliv_fee|n2s|default:0}-->
 手数料 ￥<!--{$arrOrder.charge|n2s|default:0}-->
diff --git a/data/Smarty/templates/sphone/cart/index.tpl b/data/Smarty/templates/sphone/cart/index.tpl
index 6d6859ebb4..349ccac4dd 100644
--- a/data/Smarty/templates/sphone/cart/index.tpl
+++ b/data/Smarty/templates/sphone/cart/index.tpl
@@ -137,7 +137,7 @@
                         <!--▲カートの中の商品一覧ここまで -->
 
                         <div class="total_area">
-                            <div><span class="mini">合計：</span><span class="price fb"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|n2s}--> 円</span></div>
+                            <div><span class="mini">合計：</span><span class="price fb"><!--{$arrData[$key].subtotal|n2s}--> 円</span></div>
                             <!--{if $smarty.const.USE_POINT !== false}-->
                                 <!--{if $arrData[$key].birth_point > 0}-->
                                     <div><span class="mini">お誕生月ポイント：</span> <!--{$arrData[$key].birth_point|n2s}--> Pt</div>

From ad8e9bee3c1027c96acb8741848b393e54aec266 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Fri, 20 Oct 2023 11:23:07 +0900
Subject: [PATCH 26/88] =?UTF-8?q?=E5=BE=8C=E6=96=B9=E4=BA=92=E6=8F=9B?=
 =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E5=AE=9F=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/basis/LC_Page_Admin_Basis_Point.php    | 16 ++++++++++++++++
 .../admin/basis/LC_Page_Admin_Basis_Tradelaw.php | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
index 1c40ae04ab..eb74e99b9e 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php
@@ -109,4 +109,20 @@ public function lfInitParam(&$objFormParam)
         $objFormParam->addParam('ポイント付与率', 'point_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('会員登録時付与ポイント', 'welcome_point', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
+
+    /**
+     * @deprecated SC_Helper_DB_Ex::registerBasisData() を使う。
+     */
+    public function lfUpdateData($post)
+    {
+        SC_Helper_DB_Ex::registerBasisData($post);
+    }
+
+    /**
+     * @deprecated SC_Helper_DB_Ex::registerBasisData() を使う。
+     */
+    public function lfInsertData($post)
+    {
+        SC_Helper_DB_Ex::registerBasisData($post);
+    }
 }
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
index 0ac9ad5414..aaa78c366a 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tradelaw.php
@@ -130,6 +130,22 @@ public function lfInitParam(&$objFormParam)
         $objFormParam->addParam('返品・交換について', 'law_term06', MLTEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
     }
 
+    /**
+     * @deprecated SC_Helper_DB_Ex::registerBasisData() を使う。
+     */
+    public function lfUpdateData($sqlval)
+    {
+        SC_Helper_DB_Ex::registerBasisData($sqlval);
+    }
+
+    /**
+     * @deprecated SC_Helper_DB_Ex::registerBasisData() を使う。
+     */
+    public function lfInsertData($sqlval)
+    {
+        SC_Helper_DB_Ex::registerBasisData($sqlval);
+    }
+
     /* 入力内容のチェック */
 
     /**

From b020e3872225a3d7db0af07dfff8cc3c246777a0 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 2 Nov 2023 19:07:37 +0900
Subject: [PATCH 27/88] =?UTF-8?q?LC=5FPage=5FAdmin=5FProducts=5FReview=20e?=
 =?UTF-8?q?mpty()=20=E3=81=8C=E6=AE=8B=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=20#789?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/admin/products/LC_Page_Admin_Products_Review.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php b/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
index 5ce4358e00..3a697f0430 100644
--- a/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
+++ b/data/class/pages/admin/products/LC_Page_Admin_Products_Review.php
@@ -250,7 +250,7 @@ public function lfGetWhere($arrForm)
         $arrWhereVal = array();
 
         foreach ($arrForm AS $key=>$val) {
-            if (empty($val)) continue;
+            if (SC_Utils_Ex::isBlank($val)) continue;
 
             switch ($key) {
                 case 'search_reviewer_name':

From d0a16f45f501ac0c701701aa444103c6503fa2b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 09:41:39 +0000
Subject: [PATCH 28/88] Bump mobiledetect/mobiledetectlib from 2.8.41 to 2.8.45

Bumps [mobiledetect/mobiledetectlib](https://github.com/serbanghita/Mobile-Detect) from 2.8.41 to 2.8.45.
- [Release notes](https://github.com/serbanghita/Mobile-Detect/releases)
- [Changelog](https://github.com/serbanghita/Mobile-Detect/blob/4.8.x/CHANGELOG.md)
- [Commits](https://github.com/serbanghita/Mobile-Detect/compare/2.8.41...2.8.45)

---
updated-dependencies:
- dependency-name: mobiledetect/mobiledetectlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index e2b3078d0b..6c55f496d3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,23 +8,23 @@
     "packages": [
         {
             "name": "mobiledetect/mobiledetectlib",
-            "version": "2.8.41",
+            "version": "2.8.45",
             "source": {
                 "type": "git",
                 "url": "https://github.com/serbanghita/Mobile-Detect.git",
-                "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1"
+                "reference": "96aaebcf4f50d3d2692ab81d2c5132e425bca266"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1",
-                "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/96aaebcf4f50d3d2692ab81d2c5132e425bca266",
+                "reference": "96aaebcf4f50d3d2692ab81d2c5132e425bca266",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8.35||~5.7"
+                "phpunit/phpunit": "~4.8.36"
             },
             "type": "library",
             "autoload": {
@@ -58,9 +58,15 @@
             ],
             "support": {
                 "issues": "https://github.com/serbanghita/Mobile-Detect/issues",
-                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.41"
+                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.45"
             },
-            "time": "2022-11-08T18:31:26+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/serbanghita",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-11-07T21:57:25+00:00"
         },
         {
             "name": "nanasess/mdb2",
@@ -2072,5 +2078,5 @@
     "platform-overrides": {
         "php": "5.4.16"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

From d3d50759be0a8106bc7611f8bf4aefdb9bb70b6d Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 18 Dec 2023 00:04:57 +0900
Subject: [PATCH 29/88] =?UTF-8?q?Revert=20"ubuntu-22.04=20=E3=81=A7=20PHP?=
 =?UTF-8?q?=20=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89=E3=81=AB=E5=A4=B1?=
 =?UTF-8?q?=E6=95=97=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81=E4=B8=80=E6=97=A6?=
 =?UTF-8?q?20.04=E3=81=AB=E5=A4=89=E6=9B=B4"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 91dce9a7ef31ea5463e0f1c1434f3a449827e84e.
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2a5fc1d4c..b2edde76d5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-20.04 ]
+        operating-system: [ ubuntu-22.04 ]
         php: [ '5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
         db: [ mysql, pgsql ]
         include:

From 588bc5106c9c7a08affd070cbfe6800628a655ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 09:18:18 +0000
Subject: [PATCH 30/88] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/dockerbuild.yml       | 4 ++--
 .github/workflows/e2e-tests.yml         | 8 ++++----
 .github/workflows/main.yml              | 4 ++--
 .github/workflows/penetration-tests.yml | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
index c04555bd91..930a62de22 100644
--- a/.github/workflows/dockerbuild.yml
+++ b/.github/workflows/dockerbuild.yml
@@ -175,13 +175,13 @@ jobs:
 
       - name: Upload evidence
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-php${{ matrix.php }}-evidence
           path: 'test-results/'
       - name: Upload logs
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-php${{ matrix.php }}-logs
           path: data/logs
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index b963cdac09..c7a95d8462 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -72,13 +72,13 @@ jobs:
 
     - name: Upload evidence
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.tag }}-${{ matrix.db }}-evidence
         path: 'test-results/'
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: data/logs
@@ -213,13 +213,13 @@ jobs:
       run: yarn test:e2e e2e-tests/test/installer/installer.test.ts
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: html/install/temp/install.log*
     - name: Upload evidence
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-evidence
         path: 'test-results/'
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2a5fc1d4c..393a16e7c0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -142,7 +142,7 @@ jobs:
 
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: data/logs
@@ -227,7 +227,7 @@ jobs:
         data/vendor/bin/phpunit tests/class/SC_SessionFactoryTest.php
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: windows-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: data\logs
diff --git a/.github/workflows/penetration-tests.yml b/.github/workflows/penetration-tests.yml
index 8c1469dc5b..ef2088be80 100644
--- a/.github/workflows/penetration-tests.yml
+++ b/.github/workflows/penetration-tests.yml
@@ -75,14 +75,14 @@ jobs:
       run: echo "ARTIFACT_NAME=$(echo ${GROUP} | sed 's,/,_,g')" >> $GITHUB_ENV
     - name: Upload evidence
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: zap-${{ env.ARTIFACT_NAME}}-session
         path: zap/sessions
 
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: data/logs

From e332637fa75d4552d0ab589195bf0cced68ab3e9 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 20 Dec 2023 18:56:59 +0900
Subject: [PATCH 31/88] CSS #783 #784 (PC)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- CSS Nesting Module を使った実装 #783
- CSS ファイルをまとめる #784

```
cat \
html/user_data/packages/default/css/reset.css \
html/user_data/packages/default/css/common.css \
html/user_data/packages/default/css/contents.css \
html/user_data/packages/default/css/table.css \
html/user_data/packages/default/css/bloc.css \
html/user_data/packages/default/css/bloc_alpha.css \
html/user_data/packages/default/css/popup.css \
html/user_data/packages/default/css/print.css \
| sass-convert --indent=4 --from=css --to=scss \
> html/user_data/packages/default/style.css
```
---
 .../Smarty/templates/default/popup_header.tpl |    2 +-
 data/Smarty/templates/default/site_frame.tpl  |    2 +-
 html/user_data/packages/default/css/bloc.css  |  421 ----
 .../packages/default/css/bloc_alpha.css       |   88 -
 .../user_data/packages/default/css/common.css |  414 ----
 .../packages/default/css/contents.css         |  731 ------
 .../user_data/packages/default/css/import.css |   14 -
 html/user_data/packages/default/css/popup.css |  111 -
 html/user_data/packages/default/css/print.css |   11 -
 html/user_data/packages/default/css/reset.css |   99 -
 html/user_data/packages/default/css/table.css |   73 -
 html/user_data/packages/default/style.css     | 2148 +++++++++++++++++
 12 files changed, 2150 insertions(+), 1964 deletions(-)
 delete mode 100644 html/user_data/packages/default/css/bloc.css
 delete mode 100644 html/user_data/packages/default/css/bloc_alpha.css
 delete mode 100644 html/user_data/packages/default/css/common.css
 delete mode 100644 html/user_data/packages/default/css/contents.css
 delete mode 100644 html/user_data/packages/default/css/import.css
 delete mode 100644 html/user_data/packages/default/css/popup.css
 delete mode 100644 html/user_data/packages/default/css/print.css
 delete mode 100644 html/user_data/packages/default/css/reset.css
 delete mode 100644 html/user_data/packages/default/css/table.css
 create mode 100644 html/user_data/packages/default/style.css

diff --git a/data/Smarty/templates/default/popup_header.tpl b/data/Smarty/templates/default/popup_header.tpl
index 8196da768d..e10727355f 100644
--- a/data/Smarty/templates/default/popup_header.tpl
+++ b/data/Smarty/templates/default/popup_header.tpl
@@ -26,7 +26,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/import.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->style.css" type="text/css" media="all" />
 <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 <title><!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--></title>
 <link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
diff --git a/data/Smarty/templates/default/site_frame.tpl b/data/Smarty/templates/default/site_frame.tpl
index df9bc2bfc2..ba8aab6534 100644
--- a/data/Smarty/templates/default/site_frame.tpl
+++ b/data/Smarty/templates/default/site_frame.tpl
@@ -41,7 +41,7 @@
 <!--{/if}-->
 <link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
 <link rel="icon" type="image/vnd.microsoft.icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
-<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/import.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->style.css" type="text/css" media="all" />
 <!--{if $tpl_page_class_name === "LC_Page_Products_Detail"}-->
     <link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/theme/jquery.ui.core.css" type="text/css" media="all" />
     <link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/theme/jquery.ui.tooltip.css" type="text/css" media="all" />
diff --git a/html/user_data/packages/default/css/bloc.css b/html/user_data/packages/default/css/bloc.css
deleted file mode 100644
index 67c19f22f4..0000000000
--- a/html/user_data/packages/default/css/bloc.css
+++ /dev/null
@@ -1,421 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- ブロック用
-************************************************ */
-/*** 目次 ***
-
-▼ブロック共通
-リスト
-タイトル
-ヘッダー上、フッター下のブロックエリア
-
-▼各機能ブロックの指定
--新着情報
--現在のカゴの中
--カテゴリ
--ガイドリンク
--ログイン（サイド用）
--検索
--カレンダー
--おすすめ商品
-    * 商品詳細のオススメ商品   [whobought_area]
-*/
-
-
-/* ==============================================
-ブロック共通
-    * #container から指定することで、ヘッダー・フッターには適用していない。
-/* ============================================= */
-.side_column {
-    overflow-x: hidden; /* IE6 表示乱れ防止 */
-}
-.side_column .block_body,
-#main_column .block_body {
-    border: solid 1px #ccc;
-    border-top: none;
-}
-.side_column .block_body .box {
-    border: solid 1px #ccc;
-    width: 145px;
-}
-
-/* 外枠
------------------------------------------------ */
-#container .block_outer {
-    padding: 0 15px 10px; /* #container の背景色を欠けさせないため敢えて padding */
-}
-#container #main_column .block_outer {
-    padding: 0 0 20px;
-}
-#container .side_column .block_outer {
-    padding: 0 7% 10px;
-}
-
-/* リスト
------------------------------------------------ */
-/* ログイン 検索条件 */
-#container .block_outer .block_body dl.formlist {
-    margin-bottom: 8px;
-}
-#container .block_outer .block_body dl.formlist dd {
-    margin-bottom: 5px;
-}
-#container .block_outer .block_body dl.formlist dt {
-    margin-bottom: 3px;
-    padding-left: 15px;
-    background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
-    font-size: 90%;
-}
-#container .block_outer .block_body dl.formlist span {
-    vertical-align: top;
-}
-
-
-/* タイトル
------------------------------------------------ */
-/* タイトルの背景 白 */
-#login_area h2,
-#search_area h2,
-#calender_area h2,
-#cart_area h2,
-#cart h2 {
-    padding: 5px 0 8px 10px;
-    border-style: solid;
-    border-color: #f90 #ccc #ccc;
-    border-width: 1px 1px 0;
-    background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
-    font-size: 14px;
-}
-#category_area h2 {
-    border-top: solid 1px #f90;
-    background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
-    padding: 5px 0 8px 10px;
-    font-size: 14px;
-}
-
-/* タイトルの背景 オレンジ */
-#recommend_area h2,
-#news_area h2 {
-    padding: 5px 0 8px 10px;
-    border-style: solid;
-    border-color: #f90 #ccc #ccc;
-    border-width: 1px 1px 0;
-    background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
-}
-
-
-/* ***********************************************
-▼各機能ブロックの指定
-/*********************************************** */
-
-/* ===============================================
-▼新着情報
-=============================================== */
-#news_area .news_contents {
-    padding: 10px;
-    max-height: 260px;
-    height: auto !important; /* hack? */
-    height: 260px; /* hack? */
-    overflow: auto;
-    overflow-y: scroll;
-}
-#news_area dl.newslist {
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom;
-}
-#news_area dl.newslist:last-child { /* IE9 未満では無効 (影響度合いが低いので黙殺) */
-    background: none;
-}
-#news_area dl.newslist dt {
-    margin-bottom: 5px;
-}
-#news_area dl.newslist dd {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
-}
-
-
-/* ===============================================
-▼現在のカゴの中
-=============================================== */
-#cart_area .information {
-    padding: 10px;
-}
-#cart_area .postage {
-    margin-top: 10px;
-    padding-top: 10px;
-    background: url("../img/background/line_dot_01.gif") repeat-x top;
-}
-#cart_area .postage .point_announce {
-    padding: 2px 0 2px 20px;
-    background: url("../img/icon/ico_price.gif") no-repeat left top;
-}
-#cart_area .btn {
-    padding: 10px 0;
-    background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
-    text-align: center;
-}
-
-
-/* ===============================================
-▼カテゴリ
-=============================================== */
-#container #category_area .block_body {
-    background-color: #fffaf0;
-}
-
-#category_area li {
-    padding-left: 5px;
-}
-#category_area li.level1 {
-    border-bottom: solid 1px #ccc;
-}
-#category_area li.level1 p {
-    padding-left: 20px;
-    margin: 7px 3px;
-}
-#category_area li.level1 p {
-    background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
-}
-#category_area li.level1 li p {
-    background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
-}
-#category_area li a {
-    display: block;
-    padding: 0;
-}
-a.onlink:link {
-    color: #f00;
-    text-decoration: underline;
-}
-a.onlink:visited {
-    color: #f00;
-}
-a.onlink:hover {
-    color: #f00;
-}
-
-
-/* ===============================================
-▼ガイドリンク
-=============================================== */
-#guide_area {
-    border: none;
-}
-#guide_area li {
-    margin-bottom: 5px;
-    letter-spacing: -0.05em;
-}
-ul.button_like li {
-    margin: 0;
-    padding: 0 0 1px 0;
-    background: url("../img/background/bg_btn_list.jpg") bottom repeat-x;
-}
-ul.button_like li a {
-    margin: 0;
-    padding: 10px 15px 10px 10px;
-    border: 1px solid;
-    border-bottom: none;
-    border-color: #ccc;
-    display: block;
-    background: url("../img/icon/ico_arrow_02.gif") no-repeat right;
-    text-decoration: none;
-    outline: none;
-}
-
-
-/* ===============================================
-▼ログイン（サイド用）
-※ヘッダー用はbloc_alpha.css内に記述
-=============================================== */
-#container div#login_area .block_body {
-    padding: 10px;
-}
-
-#container div#login_area .block_body p {
-    margin-bottom: 5px;
-}
-
-#container div#login_area .block_body .btn {
-    text-align: center;
-}
-#container .login_area dl.formlist {
-    margin-bottom: 8px;
-    width: 450px;
-}
-#container .login_area dl.formlist dt {
-    margin-bottom: 3px;
-    padding-left: 15px;
-    color: #333;
-    background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
-    width: 120px;
-    float: left;
-    font-size: 90%;
-}
-#container .login_area dl.formlist dd {
-    margin-bottom: 5px;
-    float: right;
-    width: 300px;
-    vertical-align: bottom;
-    text-align: left;
-}
-#container div#login_area .block_body .mini {
-    margin-top: 5px;
-    letter-spacing: -0.01em;
-}
-
-
-/* ===============================================
-▼検索
-=============================================== */
-#container div#search_area .block_body {
-    padding: 10px;
-}
-#container div#search_area .block_body .btn {
-    text-align: center;
-}
-
-
-/* ===============================================
-▼カレンダー
-=============================================== */
-#calender_area {
-    background-color: transparent;
-    border: none;
-}
-#calender_area .block_body {
-    padding: 10px 0;
-    background-color: #f1f9fc;
-}
-#calender_area table {
-    background: #fff;
-    border: none;
-    width: 150px;
-    margin: 0 auto 5px;
-    font-size: 90%;
-}
-#calender_area table td {
-    padding: 1px 3px;
-    border-top: 1px solid #ccc;
-    border-right: none;
-    text-align: center;
-}
-#calender_area th {
-    padding: 1px 3px;
-    background: #fff;
-    border: none;
-    text-align: center;
-}
-#calender_area table .month {
-    margin-bottom: 5px;
-    padding-left: 12px;
-    background: url("../img/icon/ico_arrow_04.gif") no-repeat left;
-    font-size: 120%;
-}
-#calender_area .off {
-    color: #f00;
-}
-#calender_area .today {
-    background-color: #FFF99D;
-    font-weight: bold;
-}
-#calender_area .information {
-    margin-left: 10px;
-    font-size: 90%;
-}
-
-
-/* ===============================================
-▼おすすめ商品
-=============================================== */
-/*
-   tplファイルのマークアップが同じ項目
-   メインカラム用
-   サイドカラム用           [side_column]
-   商品詳細のオススメ商品   [whobought_area]
-=============================================== */
-/* 共通
------------------------------------------------ */
-#recommend_area .block_body,
-#whobought_area .product_item {
-    padding: 10px 0 10px;
-    border: none;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom;
-}
-
-#recommend_area .block_body p,
-#whobought_area .product_item p {
-    margin: 0 0 5px 0;
-}
-
-#recommend_area .block_body img,
-#whobought_area .product_item img {
-    margin: 0 5px 0 0;
-}
-
-#recommend_area .block_body h3,
-#whobought_area .product_item h3 {
-    font-size: 100%;
-    font-weight: normal;
-}
-
-/* サイドカラム用 */
-.side_column #recommend_area .product_item {
-    margin-bottom: 10px;
-}
-
-
-/* 画像
------------------------------------------------ */
-/* メインカラム用 */
-#main_column #recommend_area .block_body .productImage,
-#whobought_area .product_item .productImage {
-    margin-bottom: 10px;
-    float: left;
-    width: 90px;
-}
-/* サイドカラム用 */
-.side_column #recommend_area .block_body .productImage {
-    float: none;
-    text-align: center;
-    width: auto;
-}
-
-
-/* 左右の振り分け
------------------------------------------------ */
-#main_column #recommend_area .product_item,
-#whobought_area .product_item {
-    float: left;
-    width: 47.5%;
-    padding-left: 1%;
-    padding-right: 1%;
-}
-
-
-/* 商品説明テキスト
------------------------------------------------ */
-/* メインカラム用 1カラム時*/
-#main_column.colnum1 #recommend_area .block_body .productContents {
-    float: right;
-    width: 74%;
-}
-
-/* メインカラム用 2カラム時*/
-#main_column.colnum2 #recommend_area .block_body .productContents,
-#main_column.colnum2 #whobought_area .productContents {
-    float: right;
-    width: 74%;
-}
-
-/* メインカラム用 3カラム時*/
-#main_column.colnum3 #recommend_area .block_body .productContents,
-#main_column.colnum3 #whobought_area .productContents {
-    float: right;
-    width: 67%;
-}
-
-/* サイドカラム用 */
-.side_column #recommend_area .block_body .productContents {
-    clear: both;
-}
diff --git a/html/user_data/packages/default/css/bloc_alpha.css b/html/user_data/packages/default/css/bloc_alpha.css
deleted file mode 100644
index 25087c6ccd..0000000000
--- a/html/user_data/packages/default/css/bloc_alpha.css
+++ /dev/null
@@ -1,88 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- インヘッダーブロック
-************************************************ */
-#headerInternalColumn {
-    margin-top: 5px;
-    float: right;
-    width: 520px;
-    height: 35px;
-}
-
-/* ログイン（ヘッダー用）
------------------------------------------------ */
-#header_login_area {
-    padding: 0 10px;
-    border: solid 1px #ffc979;
-    height: 30px;
-    background: #fef3d3;
-    letter-spacing: -0.075em;
-}
-#header_login_area ul.formlist {
-    margin-top: 5px;
-}
-#header_login_area ul.formlist li {
-    float: left;
-}
-#header_login_area ul.formlist li.mail {
-    padding-left: 28px;
-    width: 155px;
-    background: url("../img/common/ico_arrow_login.gif") no-repeat left;
-    font-size: 90%;
-}
-#header_login_area ul.formlist li.password {
-    padding-right: 5px;
-}
-#header_login_area ul.formlist li.login_memory {
-    padding-right: 5px;
-    font-size: 90%;
-}
-#header_login_area ul.formlist li.forgot {
-    margin-top: 3px;
-    padding-right: 5px;
-    font-size: 90%;
-}
-#header_login_area ul.formlist li.btn {
-    padding-right: 5px;
-    width: 53px;
-}
-#header_login_area p.btn {
-    height: 20px;
-    padding: 5px 0;
-    vertical-align: middle;
-}
-#header_login_area p.btn input[type=image] {
-    vertical-align: middle;
-}
-
-/* ***********************************************
-追加ブロック
-************************************************ */
-/* 共通
------------------------------------------------ */
-#container .block_outer #banner_area .block_body {
-    border: none;
-}
-
-/* 【メイン】バナーエリア_02
------------------------------------------------ */
-#main_column .block_outer #banner_area .block_body ul {
-    width: 100%;
-}
-#main_column .block_outer #banner_area .block_body ul li {
-    float: left;
-}
-#main_column .block_outer #banner_area .block_body ul li.sub_01 {
-    padding-right: 8px;
-}
-
-/* 【サイド】バナーエリア_01
------------------------------------------------ */
-/* 【サイド】バナーエリア_02
------------------------------------------------ */
-#leftcolumn .block_outer #banner_area .block_body ul li,
-#rightcolumn .block_outer #banner_area .block_body ul li {
-    margin-bottom: 8px;
-}
-
diff --git a/html/user_data/packages/default/css/common.css b/html/user_data/packages/default/css/common.css
deleted file mode 100644
index c5826efc01..0000000000
--- a/html/user_data/packages/default/css/common.css
+++ /dev/null
@@ -1,414 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- 共通設定
-************************************************ */
-body {
-    color: #666;
-    font-family: Verdana,Arial,Helvetica,sans-serif;
-    background-color: #f5f5f5;
-    font-size: 72.5%;
-    line-height: 150%;
-    letter-spacing: 0.1em;
-}
-
-/* 写真 */
-img.picture {
-    border: 1px solid #ccc;
-}
-
-
-/* ==============================================
- フレーム
-=============================================== */
-/* 全体を包括 */
-.frame_outer {
-    margin: 0 auto;
-    width: 100%;
-    text-align: center;
-}
-
-/* コンテンツ */
-#container {
-    margin: 0 auto;
-    padding: 0 0 30px;
-    width: 980px;
-    background: #fff;
-    text-align: left;
-}
-
-
-/* ==============================================
- カラム指定
-=============================================== */
-
-/* メイン部
------------------------------------------------ */
-#main_column {
-    padding: 10px 0 0;
-}
-
-/* 1カラム時 */
-#main_column.colnum1 {
-    margin: 0 auto;
-    width: 80%;
-}
-
-/* 2カラム時 (共通) */
-#main_column.colnum2 {
-    width: 78%;
-}
-
-/* 2カラム時 (メイン部が左) */
-#main_column.colnum2.left {
-    padding-left: 1.5%;
-    float: left;
-}
-
-/* 2カラム時 (メイン部が右) */
-#main_column.colnum2.right {
-    padding-right: 1.5%;
-    float: right;
-}
-
-/* 3カラム時 */
-#main_column.colnum3 {
-    padding-left: 0.5%;
-    width: 59%;
-    float: left;
-}
-
-/* サイドカラム
------------------------------------------------ */
-.side_column {
-    padding: 10px 0 0;
-}
-#leftcolumn {
-    float: left;
-    width: 20%;
-}
-#rightcolumn {
-    float: right;
-    width: 20%;
-}
-
-/* 他
------------------------------------------------ */
-/* ヘッダーとフッターの上下 */
-#topcolumn,
-#bottomcolumn,
-#footerbottomcolumn {
-    margin: 0px;
-    background: #fff;
-    text-align: left;
-    clear: both;
-}
-
-/* 下層コンテンツ */
-#undercolumn {
-    width: 100%;
-    margin: 0 0 30px 0;
-}
-
-
-/* ==============================================
- ユーティリティ
-=============================================== */
-/* フロート回り込み解除
------------------------------------------------ */
-.clearfix:after {
-    display: block;
-    clear: both;
-    height: 0px;
-    line-height: 0px;
-    visibility: hidden;
-    content: ".";
-}
-.clearfix {
-    display: block; /* for IE8 */
-}
-.clear {
-    clear: both;
-}
-
-/* リンク指定
------------------------------------------------ */
-a:link,
-a:visited {
-    color: #39c;
-    text-decoration: none;
-}
-a:link:hover,
-a[href]:hover {
-    color: #f60;
-    text-decoration: underline;
-}
-
-
-/* フォント
------------------------------------------------ */
-h1,
-h2,
-h3,
-h4,
-h5 {
-    font-size: 100%;
-    line-height: 150%;
-}
-.sale_price {
-    color: #f00;
-}
-.normal_price {
-    font-size: 90%;
-}
-.point {
-    color: #f00;
-    font-weight: bold;
-}
-.user_name {
-    font-weight: bold;
-}
-.recommend_level {
-    color: #ecbd00;
-}
-
-.attention {
-    color: #f00;
-}
-.attentionSt {
-    color: #f00;
-    font-weight: bold;
-}
-.st {
-    font-weight: bold;
-}
-.mini {
-    font-size: 90%;
-}
-
-
-/* 行揃え
------------------------------------------------ */
-.alignC {
-    text-align: center;
-}
-.alignR {
-    text-align: right;
-}
-.alignL {
-    text-align: left;
-}
-.pricetd em {
-    font-weight: bold;
-}
-
-
-/* フォーム
------------------------------------------------ */
-select {
-    border: solid 1px #ccc;
-}
-input[type='text'],
-input[type='password'] {
-    border: solid 1px #ccc;
-    padding: 2px;
-}
-
-.box40 {
-    width: 40px;
-}
-.box60 {
-    width: 60px;
-}
-.box100 {
-    width: 100px;
-}
-.box120 {
-    width: 120px;
-}
-.box140 {
-    width: 140px;
-}
-.box145 {
-    width: 145px;
-}
-.box150 {
-    width: 150px;
-}
-.box240 {
-    width: 240px;
-}
-.box300 {
-    width: 300px;
-}
-.box320 {
-    width: 320px;
-}
-.box350 {
-    width: 350px;
-}
-.box380 {
-    width: 380px;
-}
-
-/* フォームが縦に重なり合う場合に併用する余白 */
-.top { /* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */
-    margin-bottom: 5px;
-}
-
-
-/* タイトル
------------------------------------------------ */
-h2.title {
-    margin-bottom: 10px;
-    padding: 8px;
-    border-top: solid 1px #ebeced;
-    color: #f60;
-    background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
-    background-color: #fef3d8;
-    font-size: 170%;
-}
-
-#main_column .sub_area h3,
-#undercolumn_login .login_area h3,
-#undercolumn_shopping h3,
-#mypagecolumn h3,
-#undercolumn_cart h3 {
-    margin: 0 0 10px 0;
-    padding: 5px 0 10px;
-    color: #f60;
-    background: url("../img/background/line_01.gif") repeat-x left bottom;
-    font-size: 120%;
-}
-
-div#undercolumn_login .login_area h4 {
-    padding-left: 15px;
-    background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
-}
-
-
-/* ==============================================
- ヘッダー
-=============================================== */
-/* レイアウト
------------------------------------------------ */
-#header_wrap {
-    border-top: solid 3px #f90;
-    min-height: 82px;
-    background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
-}
-#header {
-    margin: auto;
-    width: 980px;
-}
-#header_utility {
-    float: right;
-    width: 580px;
-}
-#errorHeader {
-    color: #F00;
-    font-weight: bold;
-    font-size: 12px;
-    background-color: #FEB;
-    text-align: center;
-    padding: 5px;
-}
-
-
-/* ロゴ
------------------------------------------------ */
-#logo_area {
-    padding-left: 10px;
-    float: left;
-    width: 390px;
-    text-align: left;
-}
-#site_description {
-    font-size: 90%;
-}
-
-
-/* ヘッダーナビ
------------------------------------------------ */
-div#header_navi {
-    float: right;
-    width: 409px;
-    height: 38px;
-}
-div#header_navi ul li {
-    display: block;
-    float: left;
-}
-div#header_navi ul li.mypage,
-div#header_navi ul li.entry {
-    margin-top: 6px;
-}
-
-
-/* ==============================================
- フッター
-=============================================== */
-#footer_wrap {
-    margin: 0 auto;
-    width: 980px;
-    height: 80px;
-    background: #fff;
-}
-#footer {
-    margin: auto;
-    padding-top: 10px;
-    border-top: solid 1px #ccc;
-    width: 950px;
-}
-#pagetop {
-    width: 210px;
-    float: right;
-    text-align: right;
-}
-#copyright {
-    width: 740px;
-    float: left;
-    text-align: left;
-    font-size: 97%;
-}
-
-
-/* ==============================================
- パーツ
-=============================================== */
-/* ボタン
------------------------------------------------ */
-.btn_area {
-    margin-top: 10px;
-    width: 100%;
-    text-align: center;
-}
-
-.btn_area li {
-    padding-right: 10px;
-    display: inline;
-}
-
-
-/* 完了メッセージ
------------------------------------------------ */
-div#complete_area {
-    margin-bottom: 20px;
-}
-div#complete_area .message,
-div#undercolumn_entry .message {
-    margin-bottom: 20px;
-    line-height: 150%;
-    font-weight: bold;
-    font-size: 120%;
-}
-div#complete_area .shop_information {
-    margin-top: 40px;
-    padding: 20px 0 0 0;
-    border-top: solid 1px #ccc;
-}
-div#complete_area .shop_information .name {
-    margin-bottom: 10px;
-    font-weight: bold;
-    font-size: 140%;
-}
diff --git a/html/user_data/packages/default/css/contents.css b/html/user_data/packages/default/css/contents.css
deleted file mode 100644
index 63ace223f9..0000000000
--- a/html/user_data/packages/default/css/contents.css
+++ /dev/null
@@ -1,731 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- 各ページコンテンツ用
-************************************************ */
-/* ==============================================
-▼TOP
-=============================================== */
-/* メインイメージ
------------------------------------------------ */
-#main_image {
-    margin-bottom: 10px;
-    text-align: center;
-}
-
-/* ==============================================
-▼下層
-=============================================== */
-/* ==============================================
-▼ガイド
-=============================================== */
-/* ◎◎について
------------------------------------------------ */
-div#undercolumn_aboutus {
-}
-
-/* 特定商取引法
------------------------------------------------ */
-div#undercolumn_order {
-}
-
-/* お問い合わせ
------------------------------------------------ */
-div#undercolumn_contact {
-    margin: 0 auto;
-    width: 100%;
-}
-
-.zipimg img {
-    vertical-align: middle;
-}
-
-
-/* ==============================================
-▼MYページ
-=============================================== */
-/* 共通設定
------------------------------------------------ */
-div#mypagecolumn {
-    width: 100%;
-}
-
-div#mynavi_area {
-    width: 100%;
-}
-
-div#mycontents_area {
-    width: 100%;
-}
-div#mynavi_area .mynavi_list {
-    margin-bottom: 20px;
-    width: 100%;
-}
-div#mynavi_area .mynavi_list li {
-    margin: 0 15px 5px 0;
-    padding-left: 15px;
-    float: left;
-    background: url('../img/icon/ico_arrow_01.gif') no-repeat left ;
-    font-size: 120%;
-}
-
-div#mynavi_area div.point_announce {
-    margin-bottom: 30px;
-    padding: 10px;
-    border: solid 1px #ffcc62;
-    background-color: #fffaf0;
-}
-div#mynavi_area div.point_announce p {
-    padding-left: 20px;
-    background: url('../img/icon/ico_point.gif') no-repeat left ;
-}
-
-div#mycontents_area p.inforamtion {
-    margin-bottom: 20px;
-}
-
-div#mypagecolumn h4 {
-    margin: 10px auto;
-    border-bottom: 1px solid #999;
-    text-align: left;
-    font-size: 120%;
-}
-
-
-/* 購入履歴一覧/詳細
------------------------------------------------ */
-div#mycontents_area div.mycondition_area {
-    margin: 0 auto 20px 0;
-    padding: 10px;
-    border: solid 1px #ccc;
-    width: 97%;
-    background: #f9f9f9;
-}
-div#mycontents_area div.mycondition_area p {
-    float: left;
-}
-div#mycontents_area div.mycondition_area .btn {
-    width: 160px;
-    margin-top: 15px;
-    float: right;
-}
-.add_address {
-    margin-bottom: 20px;
-}
-
-
-/* 会員登録内容変更/退会
------------------------------------------------ */
-div#mycontents_area .message_area {
-    margin: 30px auto;
-    padding: 30px;
-    border: 1px solid #ccc;
-    text-align: center;
-}
-
-div#mycontents_area .message_area p {
-    margin-bottom: 20px;
-}
-
-/* ==============================================
-▼会員登録
-=============================================== */
-div#undercolumn_entry {
-    width: 100%;
-}
-
-div#undercolumn_entry .kiyaku_text {
-    margin: 20px auto;
-    padding: 10px;
-    border: solid 1px #ccc;
-    width: 94%;
-    background: #fff;
-}
-
-
-/* ==============================================
-▼ログイン
-=============================================== */
-div#undercolumn_login {
-    margin: 0 auto;
-    width: 100%;
-}
-
-div#undercolumn_login .login_area {
-    margin-bottom: 30px;
-}
-
-div#undercolumn_login .login_area .inputbox {
-    margin: 15px auto 15px auto;
-    padding: 15px 20px 10px 20px;
-    background: #f0f0f0;
-}
-
-div#undercolumn_login .login_area .inputbox .btn_area {
-    margin-top: 0;
-}
-
-
-/* ==============================================
-▼エラー
-=============================================== */
-div#undercolumn_error .message_area {
-    width: 80%;
-    margin: 30px auto;
-    padding: 30px;
-    border: 1px solid #ccc;
-    text-align: center;
-}
-
-div#undercolumn_error .message_area .error {
-    padding: 120px 0;
-}
-
-
-/* ==============================================
-▼商品一覧
-=============================================== */
-/* ページ送り
------------------------------------------------ */
-.pagenumber_area {
-    padding-bottom: 10px;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
-}
-.pagecond_area {
-    margin-bottom: 20px;
-    padding: 10px;
-}
-.pagenumber_area {
-    margin: 20px 0;
-}
-.pagecond_area {
-    border: 1px solid #ccc;
-}
-.pagenumber_area .navi {
-    width: 100%;
-    text-align: left;
-}
-.pagenumber_area .navi li {
-    display: inline;
-}
-.pagenumber_area .change {
-    float: right;
-    text-align: right;
-    white-space: nowrap;
-}
-
-
-/* レイアウト
------------------------------------------------ */
-div.list_area {
-    padding: 0 0 30px 0;
-    width: 100%;
-    overflow: auto;
-}
-
-div.listphoto {
-    float: left;
-}
-
-/* メインカラム用 1カラム時*/
-#main_column.colnum1 div.listrightbloc {
-    float: right;
-    width: 74%;
-}
-
-/* メインカラム用 2カラム時*/
-#main_column.colnum2 div.listrightbloc {
-    float: right;
-    width: 80%;
-}
-
-/* メインカラム用 3カラム時*/
-#main_column.colnum3 div.listrightbloc {
-    float: right;
-    width: 74%;
-}
-
-
-/* 商品情報 各種設定
------------------------------------------------ */
-/* 商品ステータス */
-div.listrightbloc ul.status_icon {
-    margin-bottom: 10px;
-    width: 100%;
-}
-div.listrightbloc ul.status_icon li {
-    margin-right: 5px;
-    float: left;
-}
-
-/* 商品名 */
-div.listrightbloc h3 {
-    font-weight: bold;
-    font-size: 120%;
-}
-
-/* コメント */
-div.listrightbloc .listcomment {
-    margin: 0 0 10px 0;
-    text-align: left;
-}
-
-/* 商品詳細を見る */
-div.listrightbloc .detail_btn {
-    margin-bottom: 20px;
-}
-
-/* 価格 */
-div.listrightbloc .pricebox {
-    margin: 0 0 10px 0;
-}
-
-/* 買い物カゴ */
-div.listrightbloc .cart_area {
-    padding: 10px;
-    border: 1px solid #cef0f4;
-    background-color: #ecf5ff;
-    width: 94%;
-}
-
-/* 規格 */
-div.listrightbloc .classlist {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
-    background: url("../img/background/line_dot_02.gif") repeat-x bottom ;
-}
-div.listrightbloc dl {
-    width: 100%;
-}
-div.listrightbloc dt {
-    display: inline-block;
-    vertical-align: top;
-}
-div.listrightbloc dd {
-    padding-bottom: 10px;
-    display: inline-block;
-}
-div.listrightbloc dd p.attention {
-    margin-top: 5px;
-}
-
-/* カゴに入れる */
-div.listrightbloc .cartin {
-    margin: 0;
-    float :right;
-}
-div.listrightbloc .cartin .quantity {
-    padding: 3px 10px 0 0;
-    width: 150px;
-    float :left;
-    text-align: right;
-}
-div.listrightbloc .cartin .quantity .box {
-    width: 70px;
-}
-div.listrightbloc .cartin_btn {
-    width: 160px;
-    float :left;
-}
-
-
-/* ==============================================
-▼商品詳細
-=============================================== */
-/* レイアウト
-
-    tplファイルのマークアップが同じ項目
-        * 1カラム時
-        * 2カラム時
-        * 3カラム時
-
------------------------------------------------ */
-#detailarea,
-.sub_area {
-    margin-bottom: 20px;
-    width: 100%;
-}
-
-/* レイアウト
------------------------------------------------ */
-/* 1カラム用 */
-#main_column.colnum1 div#detailphotobloc {
-    width: 37%;
-    float: left;
-}
-#main_column.colnum1 #detailrightbloc {
-    width: 63%;
-    float: right;
-}
-#main_column.colnum1 div.subtext {
-    margin-bottom: 20px;
-    float: left;
-    width: 69%;
-}
-#main_column.colnum1 div.subphotoimg {
-    float: right;
-    width: 25%;
-    text-align: right;
-}
-#main_column.colnum1 p.subtext {
-    margin-bottom: 20px;
-}
-
-/* 2カラム用 */
-#main_column.colnum2 div#detailphotobloc {
-    float: left;
-    width: 37%;
-}
-#main_column.colnum2 #detailrightbloc {
-    float: right;
-    width: 63%;
-}
-#main_column.colnum2 div.subtext {
-    margin-bottom: 20px;
-    float: left;
-    width: 73%;
-}
-#main_column.colnum2 p.subtext {
-    margin-bottom: 20px;
-}
-#main_column.colnum2 div.subphotoimg {
-    float: right;
-    width: 25%;
-    text-align: right;
-}
-
-/* 3カラム用 */
-#main_column.colnum3 div#detailphotobloc {
-    float: left;
-    width: 49%;
-}
-#main_column.colnum3 #detailrightbloc {
-    float: right;
-    width: 50%;
-}
-#main_column.colnum3 div.subtext {
-    margin-bottom: 20px;
-    float: left;
-    width: 63%;
-}
-#main_column.colnum3 p.subtext {
-    margin-bottom: 20px;
-}
-#main_column.colnum3 div.subphotoimg {
-    float: right;
-    width: 35%;
-    text-align: right;
-}
-
-/* 商品情報 各種設定
------------------------------------------------ */
-#detailrightbloc h2 {
-    margin: 0 0 10px 0;
-    padding: 0 0 15px 0;
-    color: #666;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
-    font-weight: bold;
-    font-size: 160%;
-}
-#detailrightbloc .point,
-#detailrightbloc .relative_cat {
-    margin: 0 0 10px 0;
-    padding: 0 0 10px 0;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
-}
-#detailrightbloc .main_comment {
-    margin-bottom: 20px;
-}
-
-/* 商品コード */
-#detailrightbloc .product_code dt,
-#detailrightbloc .product_code dd {
-    display: inline;
-}
-
-/* 商品ステータス */
-#detailrightbloc ul.status_icon {
-    margin-bottom: 10px;
-    width: 100%;
-}
-#detailrightbloc ul.status_icon li {
-    margin-right: 5px;
-    margin-bottom: 3px;
-    float: left;
-}
-
-/* 通常価格 */
-#detailrightbloc .normal_price dt,
-#detailrightbloc .normal_price dd {
-    display: inline;
-}
-
-/* 販売価格 */
-#detailrightbloc .sale_price dt,
-#detailrightbloc .sale_price dd {
-    display: inline;
-}
-
-/* ポイント */
-#detailrightbloc .point dt,
-#detailrightbloc .point dd {
-    display: inline;
-}
-
-/* 規格 */
-#detailrightbloc div.classlist {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
-    width: 100%;
-    background: url("../img/background/line_dot_02.gif") repeat-x bottom ;
-}
-#detailrightbloc .classlist {
-    margin-bottom: 5px;
-}
-#detailrightbloc ul {
-    margin-bottom: 10px;
-    width: 100%;
-}
-#detailrightbloc ul li {
-    vertical-align: top;
-    float: left;
-}
-
-/* メーカー */
-#detailrightbloc .maker dt,
-#detailrightbloc .maker dd {
-    display: inline;
-}
-
-/* メーカーURL */
-#detailrightbloc .comment1 dt,
-#detailrightbloc .comment1 dd {
-    display: inline;
-}
-
-/* 関連カテゴリ */
-#detailrightbloc .relative_cat dd {
-    margin-left: 1em;
-}
-
-/* 買い物カゴ */
-#detailrightbloc .cart_area {
-    padding: 10px;
-    background-color: #ecf5ff;
-    border: 1px solid #cef0f4;
-}
-#detailrightbloc .quantity dt,
-#detailrightbloc .quantity dd {
-    display: inline;
-}
-#detailrightbloc .cartin {
-    text-align: center;
-}
-#detailrightbloc .cartin_btn {
-    text-align: center;
-}
-#detailrightbloc .favorite_btn {
-    text-align: center;
-    margin-top: 10px;
-}
-
-
-/* お客様の声
------------------------------------------------ */
-div#customervoice_area {
-    clear: both;
-    padding: 35px 0 0 0;
-}
-
-div#customervoice_area h2 {
-    margin-bottom: 20px;
-    padding: 6px 0 8px 10px;
-    border-top: solid 1px #f90;
-    background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
-}
-
-div#customervoice_area .review_bloc {
-    margin-bottom: 20px;
-    padding: 10px;
-    background-color: #f6f6f6;
-}
-
-div#customervoice_area .review_bloc p {
-    padding-top: 3px;
-    margin-right: 10px;
-    float: left;
-}
-
-div#customervoice_area .review_bloc .review_btn {
-    float: right;
-    width: 160px;
-}
-
-div#customervoice_area ul li {
-    padding-bottom: 15px;
-    margin-bottom: 15px;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
-}
-
-div#customervoice_area .voicetitle {
-    margin-bottom: 5px;
-    color: #333;
-    font-weight: bold;
-}
-
-div#customervoice_area .voicedate {
-    margin-bottom: 10px;
-}
-
-
-/* 関連商品（商品部分はbloc.cssのおすすめ商品と共通）
------------------------------------------------ */
-div#whobought_area {
-    clear: both;
-    padding: 35px 0 0 0;
-}
-
-div#whobought_area h2 {
-    border-top: solid 1px #f90;
-    background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
-    padding: 5px 0 8px 10px;
-    font-size: 14px;
-}
-
-
-/* ***********************************************
-▼カートの中
-/*********************************************** */
-/* 現在のカゴの中
------------------------------------------------ */
-div#undercolumn_cart .point_announce {
-    padding: 20px;
-    margin-bottom: 20px;
-    border: solid 1px #ffcc62;
-    background: #fffaf0;
-    font-size: 120%;
-    text-align: center;
-    line-height: 140%;
-}
-div#undercolumn_cart .totalmoney_area {
-    margin-bottom: 20px;
-}
-
-div#undercolumn_cart p {
-    margin: 10px 5px;
-}
-
-div#undercolumn ul#quantity_level li {
-    padding: 3px;
-    display: inline;
-}
-
-div#undercolumn .empty {
-    text-align: left;
-}
-
-div.form_area {
-    margin-bottom: 30px;
-}
-
-
-/* お客様情報入力
------------------------------------------------ */
-div#undercolumn_customer {
-}
-
-.flow_area {
-    margin: 0 0 20px 0;
-}
-
-div#undercolumn_customer th em {
-    color: #000;
-    font-weight: bold;
-}
-
-
-/* お支払い方法・お届け時間等の指定
------------------------------------------------ */
-div#undercolumn_shopping .pay_area {
-    margin: 0 auto 30px;
-    width: 100%;
-}
-div#undercolumn_shopping .pay_area02 {
-    margin: 40px auto 30px auto;
-}
-div#undercolumn_shopping .pay_area02 .txtarea {
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-    width: 99%;
-    height: 150px;
-}
-div#undercolumn_shopping .pay_area02 .select-msg {
-    margin-bottom: 10px;
-}
-
-div#undercolumn_shopping .point_area {
-    margin: 40px auto 0 auto;
-}
-
-div#undercolumn_shopping .point_area .point_announce {
-    padding: 20px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_shopping .point_area p {
-    margin-bottom: 20px;
-}
-
-div#undercolumn_shopping .point_area .point_announce li {
-    margin-bottom: 5px;
-}
-
-
-/* お届け先の指定
------------------------------------------------ */
-#address_area {
-    margin-bottom: 10px;
-    width: 100%;
-}
-
-#address_area .information {
-    width: 65%;
-    float: left;
-}
-
-#undercolumn_shopping .information {
-    margin-bottom: 15px;
-}
-
-#address_area .add_multiple {
-    padding: 15px 10px;
-    border: 1px solid #ffcc62;
-    float: right;
-    width: 30%;
-    color: #555;
-    background: #fffaf0;
-    text-align: center;
-    font-weight: bold;
-}
-
-#address_area .add_multiple p {
-    margin-bottom: 10px;
-}
-
-#address_area p.addbtn {
-    font-weight: bold;
-    font-size: 10px;
-}
-
-
-/* ==============================================
-▼検索結果
-=============================================== */
-p.condition_area {
-    margin: 0 auto;
-    padding: 5px;
-    border: solid 1px #333;
-    width: 566px;
-}
-
diff --git a/html/user_data/packages/default/css/import.css b/html/user_data/packages/default/css/import.css
deleted file mode 100644
index 074fa3e4df..0000000000
--- a/html/user_data/packages/default/css/import.css
+++ /dev/null
@@ -1,14 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- import css
-************************************************ */
-@import url("./reset.css");
-@import url("./common.css");
-@import url("./contents.css");
-@import url("./table.css");
-@import url("./bloc.css");
-@import url("./bloc_alpha.css");
-@import url("./popup.css");
-
-@import url("./print.css");
diff --git a/html/user_data/packages/default/css/popup.css b/html/user_data/packages/default/css/popup.css
deleted file mode 100644
index 7d1d5ac207..0000000000
--- a/html/user_data/packages/default/css/popup.css
+++ /dev/null
@@ -1,111 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- ポップアップウィンドウ
-************************************************ */
-/* 共通
------------------------------------------------ */
-div#windowcolumn {
-    border-top: solid 3px #f90;
-    width: 560px;
-    height: 100%;
-    margin: 15px 15px 0 15px;
-    background: #fff;
-}
-
-div#windowcolumn h2 {
-    margin-bottom: 10px;
-    padding: 8px;
-    border-top: solid 1px #ebeced;
-    color: #f60;
-    background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
-    background-color: #fef3d8;
-    font-size: 170%;
-}
-
-div#window_area {
-    margin: 15px auto 0 auto;
-    padding-bottom: 20px;
-    width: 540px;
-    min-height: 300px;
-    height: auto !important;
-}
-
-div#window_area p.information {
-    margin-bottom: 20px;
-}
-
-div#window_area .message {
-    margin-bottom: 20px;
-    color: #f60;
-    line-height: 150%;
-    font-weight: bold;
-    font-size: 140%;
-}
-div#window_area table {
-    width: 540px;
-}
-
-/* お客様の声の書き込み、新しいお届け先の追加・変更
------------------------------------------------ */
-div#window_area #forgot {
-    margin: 0 auto;
-    padding: 20px;
-    width: 440px;
-    border: 1px solid #ccc;
-    text-align: left;
-}
-div#window_area #forgot .mailaddres {
-    margin-bottom: 10px;
-}
-
-div#window_area #forgot p {
-    text-align: center;
-}
-
-
-/* 商品詳細拡大写真、カート拡大写真
------------------------------------------------ */
-div#bigimage,
-div#cartimage {
-    margin-top: 15px;
-    background-color: #fff;
-    text-align: center;
-}
-
-div#bigimage img,
-div#cartimage img {
-    padding: 10px;
-    background-color: #fff;
-}
-
-/* 郵便番号検索
------------------------------------------------ */
-div#zipsearchcolumn {
-    margin: 15px auto 0 auto;
-    border-top: 5px solid #ffa85c;
-    border-bottom: 5px solid #ffa85c;
-    width: 460px;
-    background-color: #fff;
-}
-
-div#zipsearchcolumn h2 {
-    margin: 0 0 15px 0;
-    width: 460px;
-}
-
-div#zipsearch_area {
-    margin: 15px auto 0 auto;
-    width: 460px;
-}
-
-div#zipsearchcolumn .btn {
-    margin: 15px 0 30px 0;
-    text-align: center;
-}
-
-div#zipsearch_area #completebox p {
-    padding: 60px 5px;
-    text-align: center;
-}
-
diff --git a/html/user_data/packages/default/css/print.css b/html/user_data/packages/default/css/print.css
deleted file mode 100644
index 700fe88029..0000000000
--- a/html/user_data/packages/default/css/print.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- 印刷用
-************************************************ */
-
-@media print {
-    body {
-        zoom: 75%;
-    }
-}
diff --git a/html/user_data/packages/default/css/reset.css b/html/user_data/packages/default/css/reset.css
deleted file mode 100644
index 0e974c9bcc..0000000000
--- a/html/user_data/packages/default/css/reset.css
+++ /dev/null
@@ -1,99 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- ブラウザリセット
-************************************************ */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-font,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-}
-
-table,
-caption,
-th,
-td {
-    margin: 0;
-    padding: 0;
-    border: 0;
-    border-collapse : collapse ;
-    border-spacing: 0px;
-    empty-cells: show;
-    text-align: left;
-    font-weight: normal;
-}
-
-a img,
-iframe {
-    border: none;
-}
-ol,
-ul,
-li {
-    list-style: none;
-}
-
-input,
-textarea,
-select,
-button {
-    font-size: 100%;
-    font-family: inherit;
-}
diff --git a/html/user_data/packages/default/css/table.css b/html/user_data/packages/default/css/table.css
deleted file mode 100644
index 3f5046dd8c..0000000000
--- a/html/user_data/packages/default/css/table.css
+++ /dev/null
@@ -1,73 +0,0 @@
-@charset "utf-8";
-
-/************************************************
- tables
-************************************************ */
-/* デフォルトテーブル
------------------------------------------------ */
-table {
-    margin: 15px auto 20px auto;
-    border-top: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    width: 100%;
-    border-collapse: collapse;
-    text-align: left;
-}
-table th {
-    padding: 8px;
-    border-right: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-    color: #333;
-    background-color: #f0f0f0;
-    font-weight: normal;
-}
-table td {
-    padding: 8px;
-    border-right: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-}
-
-/* 見出し
------------------------------------------------ */
-div#undercolumn_shopping table th[scope=col] {
-    text-align: center;
-}
-div#undercolumn_shopping table.delivname th {
-    width: 155px;
-}
-
-/* MYページ */
-div#mycontents_area table th {
-    text-align: left;
-}
-div#mycontents_area table th.alignR {
-    text-align: right;
-}
-div#mycontents_area table th.alignL {
-    text-align: left;
-}
-div#mycontents_area table th.alignC {
-    text-align: center;
-}
-div#mycontents_area table th.resulttd {
-    text-align: right;
-}
-div#mycontents_area table caption {
-    padding: 8px;
-    border-top: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    color: #000;
-    background-color: #f0f0f0;
-    text-align: left;
-    font-weight: bold;
-}
-
-
-/* その他
------------------------------------------------ */
-table select {
-    margin-bottom: 7px;
-    border: solid 1px #ccc;
-}
-
diff --git a/html/user_data/packages/default/style.css b/html/user_data/packages/default/style.css
new file mode 100644
index 0000000000..81fa73eb28
--- /dev/null
+++ b/html/user_data/packages/default/style.css
@@ -0,0 +1,2148 @@
+@charset "utf-8";
+
+/************************************************
+ ブラウザリセット
+************************************************ */
+
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+    margin: 0;
+    padding: 0;
+    border: 0;
+}
+
+table, caption, th, td {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    border-collapse: collapse;
+    border-spacing: 0px;
+    empty-cells: show;
+    text-align: left;
+    font-weight: normal;
+}
+
+a img, iframe {
+    border: none;
+}
+
+ol, ul, li {
+    list-style: none;
+}
+
+input, textarea, select, button {
+    font-size: 100%;
+    font-family: inherit;
+}
+
+@charset "utf-8";
+
+/************************************************
+ 共通設定
+************************************************ */
+
+body {
+    color: #666;
+    font-family: Verdana,Arial,Helvetica,sans-serif;
+    background-color: #f5f5f5;
+    font-size: 72.5%;
+    line-height: 150%;
+    letter-spacing: 0.1em;
+}
+
+/* 写真 */
+
+img.picture {
+    border: 1px solid #ccc;
+}
+
+/* ==============================================
+ フレーム
+=============================================== */
+/* 全体を包括 */
+
+.frame_outer {
+    margin: 0 auto;
+    width: 100%;
+    text-align: center;
+}
+
+/* コンテンツ */
+
+#container {
+    margin: 0 auto;
+    padding: 0 0 30px;
+    width: 980px;
+    background: #fff;
+    text-align: left;
+}
+
+/* ==============================================
+ カラム指定
+=============================================== */
+
+/* メイン部
+----------------------------------------------- */
+
+#main_column {
+    padding: 10px 0 0;
+
+    &.colnum1 {
+        margin: 0 auto;
+        width: 80%;
+    }
+
+    &.colnum2 {
+        width: 78%;
+
+        &.left {
+            padding-left: 1.5%;
+            float: left;
+        }
+
+        &.right {
+            padding-right: 1.5%;
+            float: right;
+        }
+    }
+
+    &.colnum3 {
+        padding-left: 0.5%;
+        width: 59%;
+        float: left;
+    }
+}
+
+/* 1カラム時 */
+
+/* 2カラム時 (共通) */
+
+/* 2カラム時 (メイン部が左) */
+
+/* 2カラム時 (メイン部が右) */
+
+/* 3カラム時 */
+
+/* サイドカラム
+----------------------------------------------- */
+
+.side_column {
+    padding: 10px 0 0;
+}
+
+#leftcolumn {
+    float: left;
+    width: 20%;
+}
+
+#rightcolumn {
+    float: right;
+    width: 20%;
+}
+
+/* 他
+----------------------------------------------- */
+/* ヘッダーとフッターの上下 */
+
+#topcolumn, #bottomcolumn, #footerbottomcolumn {
+    margin: 0px;
+    background: #fff;
+    text-align: left;
+    clear: both;
+}
+
+/* 下層コンテンツ */
+
+#undercolumn {
+    width: 100%;
+    margin: 0 0 30px 0;
+}
+
+/* ==============================================
+ ユーティリティ
+=============================================== */
+/* フロート回り込み解除
+----------------------------------------------- */
+
+.clearfix {
+    &:after {
+        display: block;
+        clear: both;
+        height: 0px;
+        line-height: 0px;
+        visibility: hidden;
+        content: ".";
+    }
+
+    display: block;
+
+    /* for IE8 */
+}
+
+.clear {
+    clear: both;
+}
+
+/* リンク指定
+----------------------------------------------- */
+
+a {
+    &:link, &:visited {
+        color: #39c;
+        text-decoration: none;
+    }
+
+    &:link:hover, &[href]:hover {
+        color: #f60;
+        text-decoration: underline;
+    }
+}
+
+/* フォント
+----------------------------------------------- */
+
+h1, h2, h3, h4, h5 {
+    font-size: 100%;
+    line-height: 150%;
+}
+
+.sale_price {
+    color: #f00;
+}
+
+.normal_price {
+    font-size: 90%;
+}
+
+.point {
+    color: #f00;
+    font-weight: bold;
+}
+
+.user_name {
+    font-weight: bold;
+}
+
+.recommend_level {
+    color: #ecbd00;
+}
+
+.attention {
+    color: #f00;
+}
+
+.attentionSt {
+    color: #f00;
+    font-weight: bold;
+}
+
+.st {
+    font-weight: bold;
+}
+
+.mini {
+    font-size: 90%;
+}
+
+/* 行揃え
+----------------------------------------------- */
+
+.alignC {
+    text-align: center;
+}
+
+.alignR {
+    text-align: right;
+}
+
+.alignL {
+    text-align: left;
+}
+
+.pricetd em {
+    font-weight: bold;
+}
+
+/* フォーム
+----------------------------------------------- */
+
+select {
+    border: solid 1px #ccc;
+}
+
+input {
+    &[type='text'], &[type='password'] {
+        border: solid 1px #ccc;
+        padding: 2px;
+    }
+}
+
+.box40 {
+    width: 40px;
+}
+
+.box60 {
+    width: 60px;
+}
+
+.box100 {
+    width: 100px;
+}
+
+.box120 {
+    width: 120px;
+}
+
+.box140 {
+    width: 140px;
+}
+
+.box145 {
+    width: 145px;
+}
+
+.box150 {
+    width: 150px;
+}
+
+.box240 {
+    width: 240px;
+}
+
+.box300 {
+    width: 300px;
+}
+
+.box320 {
+    width: 320px;
+}
+
+.box350 {
+    width: 350px;
+}
+
+.box380 {
+    width: 380px;
+}
+
+/* フォームが縦に重なり合う場合に併用する余白 */
+
+.top {
+    /* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */
+    margin-bottom: 5px;
+}
+
+/* タイトル
+----------------------------------------------- */
+
+h2.title {
+    margin-bottom: 10px;
+    padding: 8px;
+    border-top: solid 1px #ebeced;
+    color: #f60;
+    background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
+    background-color: #fef3d8;
+    font-size: 170%;
+}
+
+#main_column .sub_area h3, #undercolumn_login .login_area h3, #undercolumn_shopping h3, #mypagecolumn h3, #undercolumn_cart h3 {
+    margin: 0 0 10px 0;
+    padding: 5px 0 10px;
+    color: #f60;
+    background: url("../img/background/line_01.gif") repeat-x left bottom;
+    font-size: 120%;
+}
+
+div#undercolumn_login .login_area h4 {
+    padding-left: 15px;
+    background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
+}
+
+/* ==============================================
+ ヘッダー
+=============================================== */
+/* レイアウト
+----------------------------------------------- */
+
+#header_wrap {
+    border-top: solid 3px #f90;
+    min-height: 82px;
+    background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
+}
+
+#header {
+    margin: auto;
+    width: 980px;
+}
+
+#header_utility {
+    float: right;
+    width: 580px;
+}
+
+#errorHeader {
+    color: #F00;
+    font-weight: bold;
+    font-size: 12px;
+    background-color: #FEB;
+    text-align: center;
+    padding: 5px;
+}
+
+/* ロゴ
+----------------------------------------------- */
+
+#logo_area {
+    padding-left: 10px;
+    float: left;
+    width: 390px;
+    text-align: left;
+}
+
+#site_description {
+    font-size: 90%;
+}
+
+/* ヘッダーナビ
+----------------------------------------------- */
+
+div#header_navi {
+    float: right;
+    width: 409px;
+    height: 38px;
+
+    ul li {
+        display: block;
+        float: left;
+
+        &.mypage, &.entry {
+            margin-top: 6px;
+        }
+    }
+}
+
+/* ==============================================
+ フッター
+=============================================== */
+
+#footer_wrap {
+    margin: 0 auto;
+    width: 980px;
+    height: 80px;
+    background: #fff;
+}
+
+#footer {
+    margin: auto;
+    padding-top: 10px;
+    border-top: solid 1px #ccc;
+    width: 950px;
+}
+
+#pagetop {
+    width: 210px;
+    float: right;
+    text-align: right;
+}
+
+#copyright {
+    width: 740px;
+    float: left;
+    text-align: left;
+    font-size: 97%;
+}
+
+/* ==============================================
+ パーツ
+=============================================== */
+/* ボタン
+----------------------------------------------- */
+
+.btn_area {
+    margin-top: 10px;
+    width: 100%;
+    text-align: center;
+
+    li {
+        padding-right: 10px;
+        display: inline;
+    }
+}
+
+/* 完了メッセージ
+----------------------------------------------- */
+
+div {
+    &#complete_area {
+        margin-bottom: 20px;
+
+        .message {
+            margin-bottom: 20px;
+            line-height: 150%;
+            font-weight: bold;
+            font-size: 120%;
+        }
+    }
+
+    &#undercolumn_entry .message {
+        margin-bottom: 20px;
+        line-height: 150%;
+        font-weight: bold;
+        font-size: 120%;
+    }
+
+    &#complete_area .shop_information {
+        margin-top: 40px;
+        padding: 20px 0 0 0;
+        border-top: solid 1px #ccc;
+
+        .name {
+            margin-bottom: 10px;
+            font-weight: bold;
+            font-size: 140%;
+        }
+    }
+}
+
+@charset "utf-8";
+
+/************************************************
+ 各ページコンテンツ用
+************************************************ */
+/* ==============================================
+▼TOP
+=============================================== */
+/* メインイメージ
+----------------------------------------------- */
+
+#main_image {
+    margin-bottom: 10px;
+    text-align: center;
+}
+
+/* ==============================================
+▼下層
+=============================================== */
+/* ==============================================
+▼ガイド
+=============================================== */
+/* ◎◎について
+----------------------------------------------- */
+
+div {
+    &#undercolumn_aboutus, &#undercolumn_order {}
+
+    &#undercolumn_contact {
+        margin: 0 auto;
+        width: 100%;
+    }
+}
+
+/* 特定商取引法
+----------------------------------------------- */
+
+/* お問い合わせ
+----------------------------------------------- */
+
+.zipimg img {
+    vertical-align: middle;
+}
+
+/* ==============================================
+▼MYページ
+=============================================== */
+/* 共通設定
+----------------------------------------------- */
+
+div {
+    &#mypagecolumn, &#mynavi_area, &#mycontents_area {
+        width: 100%;
+    }
+
+    &#mynavi_area {
+        .mynavi_list {
+            margin-bottom: 20px;
+            width: 100%;
+
+            li {
+                margin: 0 15px 5px 0;
+                padding-left: 15px;
+                float: left;
+                background: url('../img/icon/ico_arrow_01.gif') no-repeat left;
+                font-size: 120%;
+            }
+        }
+
+        div.point_announce {
+            margin-bottom: 30px;
+            padding: 10px;
+            border: solid 1px #ffcc62;
+            background-color: #fffaf0;
+
+            p {
+                padding-left: 20px;
+                background: url('../img/icon/ico_point.gif') no-repeat left;
+            }
+        }
+    }
+
+    &#mycontents_area p.inforamtion {
+        margin-bottom: 20px;
+    }
+
+    &#mypagecolumn h4 {
+        margin: 10px auto;
+        border-bottom: 1px solid #999;
+        text-align: left;
+        font-size: 120%;
+    }
+
+    &#mycontents_area div.mycondition_area {
+        margin: 0 auto 20px 0;
+        padding: 10px;
+        border: solid 1px #ccc;
+        width: 97%;
+        background: #f9f9f9;
+
+        p {
+            float: left;
+        }
+
+        .btn {
+            width: 160px;
+            margin-top: 15px;
+            float: right;
+        }
+    }
+}
+
+/* 購入履歴一覧/詳細
+----------------------------------------------- */
+
+.add_address {
+    margin-bottom: 20px;
+}
+
+/* 会員登録内容変更/退会
+----------------------------------------------- */
+
+div {
+    &#mycontents_area .message_area {
+        margin: 30px auto;
+        padding: 30px;
+        border: 1px solid #ccc;
+        text-align: center;
+
+        p {
+            margin-bottom: 20px;
+        }
+    }
+
+    &#undercolumn_entry {
+        width: 100%;
+
+        .kiyaku_text {
+            margin: 20px auto;
+            padding: 10px;
+            border: solid 1px #ccc;
+            width: 94%;
+            background: #fff;
+        }
+    }
+
+    &#undercolumn_login {
+        margin: 0 auto;
+        width: 100%;
+
+        .login_area {
+            margin-bottom: 30px;
+
+            .inputbox {
+                margin: 15px auto 15px auto;
+                padding: 15px 20px 10px 20px;
+                background: #f0f0f0;
+
+                .btn_area {
+                    margin-top: 0;
+                }
+            }
+        }
+    }
+
+    &#undercolumn_error .message_area {
+        width: 80%;
+        margin: 30px auto;
+        padding: 30px;
+        border: 1px solid #ccc;
+        text-align: center;
+
+        .error {
+            padding: 120px 0;
+        }
+    }
+}
+
+/* ==============================================
+▼会員登録
+=============================================== */
+
+/* ==============================================
+▼ログイン
+=============================================== */
+
+/* ==============================================
+▼エラー
+=============================================== */
+
+/* ==============================================
+▼商品一覧
+=============================================== */
+/* ページ送り
+----------------------------------------------- */
+
+.pagenumber_area {
+    padding-bottom: 10px;
+    background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+}
+
+.pagecond_area {
+    margin-bottom: 20px;
+    padding: 10px;
+}
+
+.pagenumber_area {
+    margin: 20px 0;
+}
+
+.pagecond_area {
+    border: 1px solid #ccc;
+}
+
+.pagenumber_area {
+    .navi {
+        width: 100%;
+        text-align: left;
+
+        li {
+            display: inline;
+        }
+    }
+
+    .change {
+        float: right;
+        text-align: right;
+        white-space: nowrap;
+    }
+}
+
+/* レイアウト
+----------------------------------------------- */
+
+div {
+    &.list_area {
+        padding: 0 0 30px 0;
+        width: 100%;
+        overflow: auto;
+    }
+
+    &.listphoto {
+        float: left;
+    }
+}
+
+/* メインカラム用 1カラム時*/
+
+#main_column {
+    &.colnum1 div.listrightbloc {
+        float: right;
+        width: 74%;
+    }
+
+    &.colnum2 div.listrightbloc {
+        float: right;
+        width: 80%;
+    }
+
+    &.colnum3 div.listrightbloc {
+        float: right;
+        width: 74%;
+    }
+}
+
+/* メインカラム用 2カラム時*/
+
+/* メインカラム用 3カラム時*/
+
+/* 商品情報 各種設定
+----------------------------------------------- */
+/* 商品ステータス */
+
+div.listrightbloc {
+    ul.status_icon {
+        margin-bottom: 10px;
+        width: 100%;
+
+        li {
+            margin-right: 5px;
+            float: left;
+        }
+    }
+
+    h3 {
+        font-weight: bold;
+        font-size: 120%;
+    }
+
+    .listcomment {
+        margin: 0 0 10px 0;
+        text-align: left;
+    }
+
+    .detail_btn {
+        margin-bottom: 20px;
+    }
+
+    .pricebox {
+        margin: 0 0 10px 0;
+    }
+
+    .cart_area {
+        padding: 10px;
+        border: 1px solid #cef0f4;
+        background-color: #ecf5ff;
+        width: 94%;
+    }
+
+    .classlist {
+        margin-bottom: 10px;
+        padding-bottom: 10px;
+        background: url("../img/background/line_dot_02.gif") repeat-x bottom;
+    }
+
+    dl {
+        width: 100%;
+    }
+
+    dt {
+        display: inline-block;
+        vertical-align: top;
+    }
+
+    dd {
+        padding-bottom: 10px;
+        display: inline-block;
+
+        p.attention {
+            margin-top: 5px;
+        }
+    }
+
+    .cartin {
+        margin: 0;
+        float: right;
+
+        .quantity {
+            padding: 3px 10px 0 0;
+            width: 150px;
+            float: left;
+            text-align: right;
+
+            .box {
+                width: 70px;
+            }
+        }
+    }
+
+    .cartin_btn {
+        width: 160px;
+        float: left;
+    }
+}
+
+/* 商品名 */
+
+/* コメント */
+
+/* 商品詳細を見る */
+
+/* 価格 */
+
+/* 買い物カゴ */
+
+/* 規格 */
+
+/* カゴに入れる */
+
+/* ==============================================
+▼商品詳細
+=============================================== */
+/* レイアウト
+
+    tplファイルのマークアップが同じ項目
+        * 1カラム時
+        * 2カラム時
+        * 3カラム時
+
+----------------------------------------------- */
+
+#detailarea, .sub_area {
+    margin-bottom: 20px;
+    width: 100%;
+}
+
+/* レイアウト
+----------------------------------------------- */
+/* 1カラム用 */
+
+#main_column {
+    &.colnum1 {
+        div#detailphotobloc {
+            width: 37%;
+            float: left;
+        }
+
+        #detailrightbloc {
+            width: 63%;
+            float: right;
+        }
+
+        div {
+            &.subtext {
+                margin-bottom: 20px;
+                float: left;
+                width: 69%;
+            }
+
+            &.subphotoimg {
+                float: right;
+                width: 25%;
+                text-align: right;
+            }
+        }
+
+        p.subtext {
+            margin-bottom: 20px;
+        }
+    }
+
+    &.colnum2 {
+        div#detailphotobloc {
+            float: left;
+            width: 37%;
+        }
+
+        #detailrightbloc {
+            float: right;
+            width: 63%;
+        }
+
+        div.subtext {
+            margin-bottom: 20px;
+            float: left;
+            width: 73%;
+        }
+
+        p.subtext {
+            margin-bottom: 20px;
+        }
+
+        div.subphotoimg {
+            float: right;
+            width: 25%;
+            text-align: right;
+        }
+    }
+
+    &.colnum3 {
+        div#detailphotobloc {
+            float: left;
+            width: 49%;
+        }
+
+        #detailrightbloc {
+            float: right;
+            width: 50%;
+        }
+
+        div.subtext {
+            margin-bottom: 20px;
+            float: left;
+            width: 63%;
+        }
+
+        p.subtext {
+            margin-bottom: 20px;
+        }
+
+        div.subphotoimg {
+            float: right;
+            width: 35%;
+            text-align: right;
+        }
+    }
+}
+
+/* 2カラム用 */
+
+/* 3カラム用 */
+
+/* 商品情報 各種設定
+----------------------------------------------- */
+
+#detailrightbloc {
+    h2 {
+        margin: 0 0 10px 0;
+        padding: 0 0 15px 0;
+        color: #666;
+        background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+        font-weight: bold;
+        font-size: 160%;
+    }
+
+    .point, .relative_cat {
+        margin: 0 0 10px 0;
+        padding: 0 0 10px 0;
+        background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+    }
+
+    .main_comment {
+        margin-bottom: 20px;
+    }
+
+    .product_code {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    ul.status_icon {
+        margin-bottom: 10px;
+        width: 100%;
+
+        li {
+            margin-right: 5px;
+            margin-bottom: 3px;
+            float: left;
+        }
+    }
+
+    .normal_price {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    .sale_price {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    .point {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    div.classlist {
+        margin-bottom: 10px;
+        padding-bottom: 10px;
+        width: 100%;
+        background: url("../img/background/line_dot_02.gif") repeat-x bottom;
+    }
+
+    .classlist {
+        margin-bottom: 5px;
+    }
+
+    ul {
+        margin-bottom: 10px;
+        width: 100%;
+
+        li {
+            vertical-align: top;
+            float: left;
+        }
+    }
+
+    .maker {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    .comment1 {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    .relative_cat dd {
+        margin-left: 1em;
+    }
+
+    .cart_area {
+        padding: 10px;
+        background-color: #ecf5ff;
+        border: 1px solid #cef0f4;
+    }
+
+    .quantity {
+        dt, dd {
+            display: inline;
+        }
+    }
+
+    .cartin, .cartin_btn {
+        text-align: center;
+    }
+
+    .favorite_btn {
+        text-align: center;
+        margin-top: 10px;
+    }
+}
+
+/* 商品コード */
+
+/* 商品ステータス */
+
+/* 通常価格 */
+
+/* 販売価格 */
+
+/* ポイント */
+
+/* 規格 */
+
+/* メーカー */
+
+/* メーカーURL */
+
+/* 関連カテゴリ */
+
+/* 買い物カゴ */
+
+/* お客様の声
+----------------------------------------------- */
+
+div {
+    &#customervoice_area {
+        clear: both;
+        padding: 35px 0 0 0;
+
+        h2 {
+            margin-bottom: 20px;
+            padding: 6px 0 8px 10px;
+            border-top: solid 1px #f90;
+            background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
+        }
+
+        .review_bloc {
+            margin-bottom: 20px;
+            padding: 10px;
+            background-color: #f6f6f6;
+
+            p {
+                padding-top: 3px;
+                margin-right: 10px;
+                float: left;
+            }
+
+            .review_btn {
+                float: right;
+                width: 160px;
+            }
+        }
+
+        ul li {
+            padding-bottom: 15px;
+            margin-bottom: 15px;
+            background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+        }
+
+        .voicetitle {
+            margin-bottom: 5px;
+            color: #333;
+            font-weight: bold;
+        }
+
+        .voicedate {
+            margin-bottom: 10px;
+        }
+    }
+
+    &#whobought_area {
+        clear: both;
+        padding: 35px 0 0 0;
+
+        h2 {
+            border-top: solid 1px #f90;
+            background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
+            padding: 5px 0 8px 10px;
+            font-size: 14px;
+        }
+    }
+
+    &#undercolumn_cart {
+        .point_announce {
+            padding: 20px;
+            margin-bottom: 20px;
+            border: solid 1px #ffcc62;
+            background: #fffaf0;
+            font-size: 120%;
+            text-align: center;
+            line-height: 140%;
+        }
+
+        .totalmoney_area {
+            margin-bottom: 20px;
+        }
+
+        p {
+            margin: 10px 5px;
+        }
+    }
+
+    &#undercolumn {
+        ul#quantity_level li {
+            padding: 3px;
+            display: inline;
+        }
+
+        .empty {
+            text-align: left;
+        }
+    }
+
+    &.form_area {
+        margin-bottom: 30px;
+    }
+
+    &#undercolumn_customer {}
+}
+
+/* 関連商品（商品部分はbloc.cssのおすすめ商品と共通）
+----------------------------------------------- */
+
+/* ***********************************************
+▼カートの中
+/*********************************************** */
+/* 現在のカゴの中
+----------------------------------------------- */
+
+/* お客様情報入力
+----------------------------------------------- */
+
+.flow_area {
+    margin: 0 0 20px 0;
+}
+
+div {
+    &#undercolumn_customer th em {
+        color: #000;
+        font-weight: bold;
+    }
+
+    &#undercolumn_shopping {
+        .pay_area {
+            margin: 0 auto 30px;
+            width: 100%;
+        }
+
+        .pay_area02 {
+            margin: 40px auto 30px auto;
+
+            .txtarea {
+                margin: 5px 0 0 0;
+                padding: 2px;
+                border: 1px solid #ccc;
+                width: 99%;
+                height: 150px;
+            }
+
+            .select-msg {
+                margin-bottom: 10px;
+            }
+        }
+
+        .point_area {
+            margin: 40px auto 0 auto;
+
+            .point_announce {
+                padding: 20px;
+                border: 1px solid #ccc;
+            }
+
+            p {
+                margin-bottom: 20px;
+            }
+
+            .point_announce li {
+                margin-bottom: 5px;
+            }
+        }
+    }
+}
+
+/* お支払い方法・お届け時間等の指定
+----------------------------------------------- */
+
+/* お届け先の指定
+----------------------------------------------- */
+
+#address_area {
+    margin-bottom: 10px;
+    width: 100%;
+
+    .information {
+        width: 65%;
+        float: left;
+    }
+}
+
+#undercolumn_shopping .information {
+    margin-bottom: 15px;
+}
+
+#address_area {
+    .add_multiple {
+        padding: 15px 10px;
+        border: 1px solid #ffcc62;
+        float: right;
+        width: 30%;
+        color: #555;
+        background: #fffaf0;
+        text-align: center;
+        font-weight: bold;
+
+        p {
+            margin-bottom: 10px;
+        }
+    }
+
+    p.addbtn {
+        font-weight: bold;
+        font-size: 10px;
+    }
+}
+
+/* ==============================================
+▼検索結果
+=============================================== */
+
+p.condition_area {
+    margin: 0 auto;
+    padding: 5px;
+    border: solid 1px #333;
+    width: 566px;
+}
+
+@charset "utf-8";
+
+/************************************************
+ tables
+************************************************ */
+/* デフォルトテーブル
+----------------------------------------------- */
+
+table {
+    margin: 15px auto 20px auto;
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    width: 100%;
+    border-collapse: collapse;
+    text-align: left;
+
+    th {
+        padding: 8px;
+        border-right: 1px solid #ccc;
+        border-bottom: 1px solid #ccc;
+        color: #333;
+        background-color: #f0f0f0;
+        font-weight: normal;
+    }
+
+    td {
+        padding: 8px;
+        border-right: 1px solid #ccc;
+        border-bottom: 1px solid #ccc;
+    }
+}
+
+/* 見出し
+----------------------------------------------- */
+
+div {
+    &#undercolumn_shopping table {
+        th[scope=col] {
+            text-align: center;
+        }
+
+        &.delivname th {
+            width: 155px;
+        }
+    }
+
+    &#mycontents_area table {
+        th {
+            text-align: left;
+
+            &.alignR {
+                text-align: right;
+            }
+
+            &.alignL {
+                text-align: left;
+            }
+
+            &.alignC {
+                text-align: center;
+            }
+
+            &.resulttd {
+                text-align: right;
+            }
+        }
+
+        caption {
+            padding: 8px;
+            border-top: 1px solid #ccc;
+            border-right: 1px solid #ccc;
+            border-left: 1px solid #ccc;
+            color: #000;
+            background-color: #f0f0f0;
+            text-align: left;
+            font-weight: bold;
+        }
+    }
+}
+
+/* MYページ */
+
+/* その他
+----------------------------------------------- */
+
+table select {
+    margin-bottom: 7px;
+    border: solid 1px #ccc;
+}
+
+@charset "utf-8";
+
+/************************************************
+ ブロック用
+************************************************ */
+/*** 目次 ***
+
+▼ブロック共通
+リスト
+タイトル
+ヘッダー上、フッター下のブロックエリア
+
+▼各機能ブロックの指定
+-新着情報
+-現在のカゴの中
+-カテゴリ
+-ガイドリンク
+-ログイン（サイド用）
+-検索
+-カレンダー
+-おすすめ商品
+    * 商品詳細のオススメ商品   [whobought_area]
+*/
+
+/* ==============================================
+ブロック共通
+    * #container から指定することで、ヘッダー・フッターには適用していない。
+/* ============================================= */
+
+.side_column {
+    overflow-x: hidden;
+
+    /* IE6 表示乱れ防止 */
+
+    .block_body {
+        border: solid 1px #ccc;
+        border-top: none;
+    }
+}
+
+#main_column .block_body {
+    border: solid 1px #ccc;
+    border-top: none;
+}
+
+.side_column .block_body .box {
+    border: solid 1px #ccc;
+    width: 145px;
+}
+
+/* 外枠
+----------------------------------------------- */
+
+#container {
+    .block_outer {
+        padding: 0 15px 10px;
+
+        /* #container の背景色を欠けさせないため敢えて padding */
+    }
+
+    #main_column .block_outer {
+        padding: 0 0 20px;
+    }
+
+    .side_column .block_outer {
+        padding: 0 7% 10px;
+    }
+
+    .block_outer .block_body dl.formlist {
+        margin-bottom: 8px;
+
+        dd {
+            margin-bottom: 5px;
+        }
+
+        dt {
+            margin-bottom: 3px;
+            padding-left: 15px;
+            background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+            font-size: 90%;
+        }
+
+        span {
+            vertical-align: top;
+        }
+    }
+}
+
+/* リスト
+----------------------------------------------- */
+/* ログイン 検索条件 */
+
+/* タイトル
+----------------------------------------------- */
+/* タイトルの背景 白 */
+
+#login_area h2, #search_area h2, #calender_area h2, #cart_area h2, #cart h2 {
+    padding: 5px 0 8px 10px;
+    border-style: solid;
+    border-color: #f90 #ccc #ccc;
+    border-width: 1px 1px 0;
+    background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
+    font-size: 14px;
+}
+
+#category_area h2 {
+    border-top: solid 1px #f90;
+    background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
+    padding: 5px 0 8px 10px;
+    font-size: 14px;
+}
+
+/* タイトルの背景 オレンジ */
+
+#recommend_area h2 {
+    padding: 5px 0 8px 10px;
+    border-style: solid;
+    border-color: #f90 #ccc #ccc;
+    border-width: 1px 1px 0;
+    background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
+}
+
+#news_area {
+    h2 {
+        padding: 5px 0 8px 10px;
+        border-style: solid;
+        border-color: #f90 #ccc #ccc;
+        border-width: 1px 1px 0;
+        background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
+    }
+
+    .news_contents {
+        padding: 10px;
+        max-height: 260px;
+        height: auto !important;
+
+        /* hack? */
+        height: 260px;
+
+        /* hack? */
+        overflow: auto;
+        overflow-y: scroll;
+    }
+
+    dl.newslist {
+        background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+
+        &:last-child {
+            /* IE9 未満では無効 (影響度合いが低いので黙殺) */
+            background: none;
+        }
+
+        dt {
+            margin-bottom: 5px;
+        }
+
+        dd {
+            margin-bottom: 10px;
+            padding-bottom: 10px;
+        }
+    }
+}
+
+/* ***********************************************
+▼各機能ブロックの指定
+/*********************************************** */
+
+/* ===============================================
+▼新着情報
+=============================================== */
+
+/* ===============================================
+▼現在のカゴの中
+=============================================== */
+
+#cart_area {
+    .information {
+        padding: 10px;
+    }
+
+    .postage {
+        margin-top: 10px;
+        padding-top: 10px;
+        background: url("../img/background/line_dot_01.gif") repeat-x top;
+
+        .point_announce {
+            padding: 2px 0 2px 20px;
+            background: url("../img/icon/ico_price.gif") no-repeat left top;
+        }
+    }
+
+    .btn {
+        padding: 10px 0;
+        background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
+        text-align: center;
+    }
+}
+
+/* ===============================================
+▼カテゴリ
+=============================================== */
+
+#container #category_area .block_body {
+    background-color: #fffaf0;
+}
+
+#category_area li {
+    padding-left: 5px;
+
+    &.level1 {
+        border-bottom: solid 1px #ccc;
+
+        p {
+            padding-left: 20px;
+            margin: 7px 3px;
+            background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
+        }
+
+        li p {
+            background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
+        }
+    }
+
+    a {
+        display: block;
+        padding: 0;
+    }
+}
+
+a.onlink {
+    &:link {
+        color: #f00;
+        text-decoration: underline;
+    }
+
+    &:visited, &:hover {
+        color: #f00;
+    }
+}
+
+/* ===============================================
+▼ガイドリンク
+=============================================== */
+
+#guide_area {
+    border: none;
+
+    li {
+        margin-bottom: 5px;
+        letter-spacing: -0.05em;
+    }
+}
+
+ul.button_like li {
+    margin: 0;
+    padding: 0 0 1px 0;
+    background: url("../img/background/bg_btn_list.jpg") bottom repeat-x;
+
+    a {
+        margin: 0;
+        padding: 10px 15px 10px 10px;
+        border: 1px solid;
+        border-bottom: none;
+        border-color: #ccc;
+        display: block;
+        background: url("../img/icon/ico_arrow_02.gif") no-repeat right;
+        text-decoration: none;
+        outline: none;
+    }
+}
+
+/* ===============================================
+▼ログイン（サイド用）
+※ヘッダー用はbloc_alpha.css内に記述
+=============================================== */
+
+#container {
+    div#login_area .block_body {
+        padding: 10px;
+
+        p {
+            margin-bottom: 5px;
+        }
+
+        .btn {
+            text-align: center;
+        }
+    }
+
+    .login_area dl.formlist {
+        margin-bottom: 8px;
+        width: 450px;
+
+        dt {
+            margin-bottom: 3px;
+            padding-left: 15px;
+            color: #333;
+            background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+            width: 120px;
+            float: left;
+            font-size: 90%;
+        }
+
+        dd {
+            margin-bottom: 5px;
+            float: right;
+            width: 300px;
+            vertical-align: bottom;
+            text-align: left;
+        }
+    }
+
+    div {
+        &#login_area .block_body .mini {
+            margin-top: 5px;
+            letter-spacing: -0.01em;
+        }
+
+        &#search_area .block_body {
+            padding: 10px;
+
+            .btn {
+                text-align: center;
+            }
+        }
+    }
+}
+
+/* ===============================================
+▼検索
+=============================================== */
+
+/* ===============================================
+▼カレンダー
+=============================================== */
+
+#calender_area {
+    background-color: transparent;
+    border: none;
+
+    .block_body {
+        padding: 10px 0;
+        background-color: #f1f9fc;
+    }
+
+    table {
+        background: #fff;
+        border: none;
+        width: 150px;
+        margin: 0 auto 5px;
+        font-size: 90%;
+
+        td {
+            padding: 1px 3px;
+            border-top: 1px solid #ccc;
+            border-right: none;
+            text-align: center;
+        }
+    }
+
+    th {
+        padding: 1px 3px;
+        background: #fff;
+        border: none;
+        text-align: center;
+    }
+
+    table .month {
+        margin-bottom: 5px;
+        padding-left: 12px;
+        background: url("../img/icon/ico_arrow_04.gif") no-repeat left;
+        font-size: 120%;
+    }
+
+    .off {
+        color: #f00;
+    }
+
+    .today {
+        background-color: #FFF99D;
+        font-weight: bold;
+    }
+
+    .information {
+        margin-left: 10px;
+        font-size: 90%;
+    }
+}
+
+/* ===============================================
+▼おすすめ商品
+=============================================== */
+/*
+   tplファイルのマークアップが同じ項目
+   メインカラム用
+   サイドカラム用           [side_column]
+   商品詳細のオススメ商品   [whobought_area]
+=============================================== */
+/* 共通
+----------------------------------------------- */
+
+#recommend_area .block_body, #whobought_area .product_item {
+    padding: 10px 0 10px;
+    border: none;
+    background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+}
+
+#recommend_area .block_body p, #whobought_area .product_item p {
+    margin: 0 0 5px 0;
+}
+
+#recommend_area .block_body img, #whobought_area .product_item img {
+    margin: 0 5px 0 0;
+}
+
+#recommend_area .block_body h3, #whobought_area .product_item h3 {
+    font-size: 100%;
+    font-weight: normal;
+}
+
+/* サイドカラム用 */
+
+.side_column #recommend_area .product_item {
+    margin-bottom: 10px;
+}
+
+/* 画像
+----------------------------------------------- */
+/* メインカラム用 */
+
+#main_column #recommend_area .block_body .productImage, #whobought_area .product_item .productImage {
+    margin-bottom: 10px;
+    float: left;
+    width: 90px;
+}
+
+/* サイドカラム用 */
+
+.side_column #recommend_area .block_body .productImage {
+    float: none;
+    text-align: center;
+    width: auto;
+}
+
+/* 左右の振り分け
+----------------------------------------------- */
+
+#main_column #recommend_area .product_item, #whobought_area .product_item {
+    float: left;
+    width: 47.5%;
+    padding-left: 1%;
+    padding-right: 1%;
+}
+
+/* 商品説明テキスト
+----------------------------------------------- */
+/* メインカラム用 1カラム時*/
+
+#main_column {
+    &.colnum1 #recommend_area .block_body .productContents {
+        float: right;
+        width: 74%;
+    }
+
+    &.colnum2 {
+        #recommend_area .block_body .productContents, #whobought_area .productContents {
+            float: right;
+            width: 74%;
+        }
+    }
+
+    &.colnum3 {
+        #recommend_area .block_body .productContents, #whobought_area .productContents {
+            float: right;
+            width: 67%;
+        }
+    }
+}
+
+/* メインカラム用 2カラム時*/
+
+/* メインカラム用 3カラム時*/
+
+/* サイドカラム用 */
+
+.side_column #recommend_area .block_body .productContents {
+    clear: both;
+}
+
+@charset "utf-8";
+
+/************************************************
+ インヘッダーブロック
+************************************************ */
+
+#headerInternalColumn {
+    margin-top: 5px;
+    float: right;
+    width: 520px;
+    height: 35px;
+}
+
+/* ログイン（ヘッダー用）
+----------------------------------------------- */
+
+#header_login_area {
+    padding: 0 10px;
+    border: solid 1px #ffc979;
+    height: 30px;
+    background: #fef3d3;
+    letter-spacing: -0.075em;
+
+    ul.formlist {
+        margin-top: 5px;
+
+        li {
+            float: left;
+
+            &.mail {
+                padding-left: 28px;
+                width: 155px;
+                background: url("../img/common/ico_arrow_login.gif") no-repeat left;
+                font-size: 90%;
+            }
+
+            &.password {
+                padding-right: 5px;
+            }
+
+            &.login_memory {
+                padding-right: 5px;
+                font-size: 90%;
+            }
+
+            &.forgot {
+                margin-top: 3px;
+                padding-right: 5px;
+                font-size: 90%;
+            }
+
+            &.btn {
+                padding-right: 5px;
+                width: 53px;
+            }
+        }
+    }
+
+    p.btn {
+        height: 20px;
+        padding: 5px 0;
+        vertical-align: middle;
+
+        input[type=image] {
+            vertical-align: middle;
+        }
+    }
+}
+
+/* ***********************************************
+追加ブロック
+************************************************ */
+/* 共通
+----------------------------------------------- */
+
+#container .block_outer #banner_area .block_body {
+    border: none;
+}
+
+/* 【メイン】バナーエリア_02
+----------------------------------------------- */
+
+#main_column .block_outer #banner_area .block_body ul {
+    width: 100%;
+
+    li {
+        float: left;
+
+        &.sub_01 {
+            padding-right: 8px;
+        }
+    }
+}
+
+/* 【サイド】バナーエリア_01
+----------------------------------------------- */
+/* 【サイド】バナーエリア_02
+----------------------------------------------- */
+
+#leftcolumn .block_outer #banner_area .block_body ul li, #rightcolumn .block_outer #banner_area .block_body ul li {
+    margin-bottom: 8px;
+}
+
+@charset "utf-8";
+
+/************************************************
+ ポップアップウィンドウ
+************************************************ */
+/* 共通
+----------------------------------------------- */
+
+div {
+    &#windowcolumn {
+        border-top: solid 3px #f90;
+        width: 560px;
+        height: 100%;
+        margin: 15px 15px 0 15px;
+        background: #fff;
+
+        h2 {
+            margin-bottom: 10px;
+            padding: 8px;
+            border-top: solid 1px #ebeced;
+            color: #f60;
+            background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
+            background-color: #fef3d8;
+            font-size: 170%;
+        }
+    }
+
+    &#window_area {
+        margin: 15px auto 0 auto;
+        padding-bottom: 20px;
+        width: 540px;
+        min-height: 300px;
+        height: auto !important;
+
+        p.information {
+            margin-bottom: 20px;
+        }
+
+        .message {
+            margin-bottom: 20px;
+            color: #f60;
+            line-height: 150%;
+            font-weight: bold;
+            font-size: 140%;
+        }
+
+        table {
+            width: 540px;
+        }
+
+        #forgot {
+            margin: 0 auto;
+            padding: 20px;
+            width: 440px;
+            border: 1px solid #ccc;
+            text-align: left;
+
+            .mailaddres {
+                margin-bottom: 10px;
+            }
+
+            p {
+                text-align: center;
+            }
+        }
+    }
+
+    &#bigimage, &#cartimage {
+        margin-top: 15px;
+        background-color: #fff;
+        text-align: center;
+    }
+
+    &#bigimage img, &#cartimage img {
+        padding: 10px;
+        background-color: #fff;
+    }
+
+    &#zipsearchcolumn {
+        margin: 15px auto 0 auto;
+        border-top: 5px solid #ffa85c;
+        border-bottom: 5px solid #ffa85c;
+        width: 460px;
+        background-color: #fff;
+
+        h2 {
+            margin: 0 0 15px 0;
+            width: 460px;
+        }
+    }
+
+    &#zipsearch_area {
+        margin: 15px auto 0 auto;
+        width: 460px;
+    }
+
+    &#zipsearchcolumn .btn {
+        margin: 15px 0 30px 0;
+        text-align: center;
+    }
+
+    &#zipsearch_area #completebox p {
+        padding: 60px 5px;
+        text-align: center;
+    }
+}
+
+/* お客様の声の書き込み、新しいお届け先の追加・変更
+----------------------------------------------- */
+
+/* 商品詳細拡大写真、カート拡大写真
+----------------------------------------------- */
+
+/* 郵便番号検索
+----------------------------------------------- */
+
+@charset "utf-8";
+
+/************************************************
+ 印刷用
+************************************************ */
+
+@media print {
+    body {
+        zoom: 75%;
+    }
+}

From 84e65a713289ced15b856ec6c10168bfd7636284 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 20 Dec 2023 19:50:58 +0900
Subject: [PATCH 32/88] =?UTF-8?q?CSS=20Nesting=20Module=20=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=9F=E5=AE=9F=E8=A3=85=20#783=20(PC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

目視で気になった点を調整した。
---
 html/user_data/packages/default/style.css | 1148 +++++++++++----------
 1 file changed, 606 insertions(+), 542 deletions(-)

diff --git a/html/user_data/packages/default/style.css b/html/user_data/packages/default/style.css
index 81fa73eb28..43b59696f6 100644
--- a/html/user_data/packages/default/style.css
+++ b/html/user_data/packages/default/style.css
@@ -4,13 +4,73 @@
  ブラウザリセット
 ************************************************ */
 
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+font,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
     margin: 0;
     padding: 0;
     border: 0;
 }
 
-table, caption, th, td {
+table,
+caption,
+th,
+td {
     margin: 0;
     padding: 0;
     border: 0;
@@ -21,28 +81,32 @@ table, caption, th, td {
     font-weight: normal;
 }
 
-a img, iframe {
+a img,
+iframe {
     border: none;
 }
 
-ol, ul, li {
+ol,
+ul,
+li {
     list-style: none;
 }
 
-input, textarea, select, button {
+input,
+textarea,
+select,
+button {
     font-size: 100%;
     font-family: inherit;
 }
 
-@charset "utf-8";
-
 /************************************************
  共通設定
 ************************************************ */
 
 body {
     color: #666;
-    font-family: Verdana,Arial,Helvetica,sans-serif;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
     background-color: #f5f5f5;
     font-size: 72.5%;
     line-height: 150%;
@@ -86,25 +150,30 @@ img.picture {
 #main_column {
     padding: 10px 0 0;
 
+    /* 1カラム時 */
     &.colnum1 {
         margin: 0 auto;
         width: 80%;
     }
 
+    /* 2カラム時 (共通) */
     &.colnum2 {
         width: 78%;
 
+        /* 2カラム時 (メイン部が左) */
         &.left {
             padding-left: 1.5%;
             float: left;
         }
 
+        /* 2カラム時 (メイン部が右) */
         &.right {
             padding-right: 1.5%;
             float: right;
         }
     }
 
+    /* 3カラム時 */
     &.colnum3 {
         padding-left: 0.5%;
         width: 59%;
@@ -112,16 +181,6 @@ img.picture {
     }
 }
 
-/* 1カラム時 */
-
-/* 2カラム時 (共通) */
-
-/* 2カラム時 (メイン部が左) */
-
-/* 2カラム時 (メイン部が右) */
-
-/* 3カラム時 */
-
 /* サイドカラム
 ----------------------------------------------- */
 
@@ -143,7 +202,9 @@ img.picture {
 ----------------------------------------------- */
 /* ヘッダーとフッターの上下 */
 
-#topcolumn, #bottomcolumn, #footerbottomcolumn {
+#topcolumn,
+#bottomcolumn,
+#footerbottomcolumn {
     margin: 0px;
     background: #fff;
     text-align: left;
@@ -172,10 +233,6 @@ img.picture {
         visibility: hidden;
         content: ".";
     }
-
-    display: block;
-
-    /* for IE8 */
 }
 
 .clear {
@@ -186,12 +243,15 @@ img.picture {
 ----------------------------------------------- */
 
 a {
-    &:link, &:visited {
+
+    &:link,
+    &:visited {
         color: #39c;
         text-decoration: none;
     }
 
-    &:link:hover, &[href]:hover {
+    &:link:hover,
+    &[href]:hover {
         color: #f60;
         text-decoration: underline;
     }
@@ -200,7 +260,11 @@ a {
 /* フォント
 ----------------------------------------------- */
 
-h1, h2, h3, h4, h5 {
+h1,
+h2,
+h3,
+h4,
+h5 {
     font-size: 100%;
     line-height: 150%;
 }
@@ -270,7 +334,9 @@ select {
 }
 
 input {
-    &[type='text'], &[type='password'] {
+
+    &[type='text'],
+    &[type='password'] {
         border: solid 1px #ccc;
         padding: 2px;
     }
@@ -325,9 +391,9 @@ input {
 }
 
 /* フォームが縦に重なり合う場合に併用する余白 */
+/* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */
 
 .top {
-    /* FIXME 簡素な単語は、単独で、込み入った指定に使用しない */
     margin-bottom: 5px;
 }
 
@@ -339,22 +405,26 @@ h2.title {
     padding: 8px;
     border-top: solid 1px #ebeced;
     color: #f60;
-    background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
+    background: url("img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
     background-color: #fef3d8;
     font-size: 170%;
 }
 
-#main_column .sub_area h3, #undercolumn_login .login_area h3, #undercolumn_shopping h3, #mypagecolumn h3, #undercolumn_cart h3 {
+#main_column .sub_area h3,
+#undercolumn_login .login_area h3,
+#undercolumn_shopping h3,
+#mypagecolumn h3,
+#undercolumn_cart h3 {
     margin: 0 0 10px 0;
     padding: 5px 0 10px;
     color: #f60;
-    background: url("../img/background/line_01.gif") repeat-x left bottom;
+    background: url("img/background/line_01.gif") repeat-x left bottom;
     font-size: 120%;
 }
 
-div#undercolumn_login .login_area h4 {
+#undercolumn_login .login_area h4 {
     padding-left: 15px;
-    background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
+    background: url("img/icon/ico_arrow_05.gif") no-repeat left;
 }
 
 /* ==============================================
@@ -366,7 +436,7 @@ div#undercolumn_login .login_area h4 {
 #header_wrap {
     border-top: solid 3px #f90;
     min-height: 82px;
-    background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
+    background: url("img/common/bg_header.gif") repeat-x bottom #fffaf0;
 }
 
 #header {
@@ -405,7 +475,7 @@ div#undercolumn_login .login_area h4 {
 /* ヘッダーナビ
 ----------------------------------------------- */
 
-div#header_navi {
+#header_navi {
     float: right;
     width: 409px;
     height: 38px;
@@ -414,7 +484,8 @@ div#header_navi {
         display: block;
         float: left;
 
-        &.mypage, &.entry {
+        &.mypage,
+        &.entry {
             margin-top: 6px;
         }
     }
@@ -503,8 +574,6 @@ div {
     }
 }
 
-@charset "utf-8";
-
 /************************************************
  各ページコンテンツ用
 ************************************************ */
@@ -527,21 +596,20 @@ div {
 =============================================== */
 /* ◎◎について
 ----------------------------------------------- */
-
-div {
-    &#undercolumn_aboutus, &#undercolumn_order {}
-
-    &#undercolumn_contact {
-        margin: 0 auto;
-        width: 100%;
-    }
+#undercolumn_aboutus {
 }
 
 /* 特定商取引法
 ----------------------------------------------- */
+#undercolumn_order {
+}
 
 /* お問い合わせ
 ----------------------------------------------- */
+#undercolumn_contact {
+    margin: 0 auto;
+    width: 100%;
+}
 
 .zipimg img {
     vertical-align: middle;
@@ -553,71 +621,77 @@ div {
 /* 共通設定
 ----------------------------------------------- */
 
-div {
-    &#mypagecolumn, &#mynavi_area, &#mycontents_area {
-        width: 100%;
-    }
-
-    &#mynavi_area {
-        .mynavi_list {
-            margin-bottom: 20px;
-            width: 100%;
-
-            li {
-                margin: 0 15px 5px 0;
-                padding-left: 15px;
-                float: left;
-                background: url('../img/icon/ico_arrow_01.gif') no-repeat left;
-                font-size: 120%;
-            }
-        }
+#mypagecolumn {
+    width: 100%;
+}
 
-        div.point_announce {
-            margin-bottom: 30px;
-            padding: 10px;
-            border: solid 1px #ffcc62;
-            background-color: #fffaf0;
+#mynavi_area {
+    width: 100%;
+}
 
-            p {
-                padding-left: 20px;
-                background: url('../img/icon/ico_point.gif') no-repeat left;
-            }
-        }
-    }
+#mycontents_area {
+    width: 100%;
+}
 
-    &#mycontents_area p.inforamtion {
+#mynavi_area {
+    .mynavi_list {
         margin-bottom: 20px;
-    }
+        width: 100%;
 
-    &#mypagecolumn h4 {
-        margin: 10px auto;
-        border-bottom: 1px solid #999;
-        text-align: left;
-        font-size: 120%;
+        li {
+            margin: 0 15px 5px 0;
+            padding-left: 15px;
+            float: left;
+            background: url('img/icon/ico_arrow_01.gif') no-repeat left;
+            font-size: 120%;
+        }
     }
 
-    &#mycontents_area div.mycondition_area {
-        margin: 0 auto 20px 0;
+    div.point_announce {
+        margin-bottom: 30px;
         padding: 10px;
-        border: solid 1px #ccc;
-        width: 97%;
-        background: #f9f9f9;
+        border: solid 1px #ffcc62;
+        background-color: #fffaf0;
 
         p {
-            float: left;
-        }
-
-        .btn {
-            width: 160px;
-            margin-top: 15px;
-            float: right;
+            padding-left: 20px;
+            background: url('img/icon/ico_point.gif') no-repeat left;
         }
     }
 }
 
+#mycontents_area p.inforamtion {
+    margin-bottom: 20px;
+}
+
+#mypagecolumn h4 {
+    margin: 10px auto;
+    border-bottom: 1px solid #999;
+    text-align: left;
+    font-size: 120%;
+}
+
 /* 購入履歴一覧/詳細
 ----------------------------------------------- */
 
+#mycontents_area div.mycondition_area {
+    margin: 0 auto 20px 0;
+    padding: 10px;
+    border: solid 1px #ccc;
+    width: 97%;
+    background: #f9f9f9;
+
+    p {
+        float: left;
+    }
+
+    .btn {
+        width: 160px;
+        margin-top: 15px;
+        float: right;
+    }
+}
+
 .add_address {
     margin-bottom: 20px;
 }
@@ -625,73 +699,71 @@ div {
 /* 会員登録内容変更/退会
 ----------------------------------------------- */
 
-div {
-    &#mycontents_area .message_area {
-        margin: 30px auto;
-        padding: 30px;
-        border: 1px solid #ccc;
-        text-align: center;
+#mycontents_area .message_area {
+    margin: 30px auto;
+    padding: 30px;
+    border: 1px solid #ccc;
+    text-align: center;
 
-        p {
-            margin-bottom: 20px;
-        }
+    p {
+        margin-bottom: 20px;
     }
+}
 
-    &#undercolumn_entry {
-        width: 100%;
+/* ==============================================
+▼会員登録
+=============================================== */
 
-        .kiyaku_text {
-            margin: 20px auto;
-            padding: 10px;
-            border: solid 1px #ccc;
-            width: 94%;
-            background: #fff;
-        }
-    }
+#undercolumn_entry {
+    width: 100%;
 
-    &#undercolumn_login {
-        margin: 0 auto;
-        width: 100%;
+    .kiyaku_text {
+        margin: 20px auto;
+        padding: 10px;
+        border: solid 1px #ccc;
+        width: 94%;
+        background: #fff;
+    }
+}
 
-        .login_area {
-            margin-bottom: 30px;
+/* ==============================================
+▼ログイン
+=============================================== */
 
-            .inputbox {
-                margin: 15px auto 15px auto;
-                padding: 15px 20px 10px 20px;
-                background: #f0f0f0;
+#undercolumn_login {
+    margin: 0 auto;
+    width: 100%;
 
-                .btn_area {
-                    margin-top: 0;
-                }
-            }
-        }
-    }
+    .login_area {
+        margin-bottom: 30px;
 
-    &#undercolumn_error .message_area {
-        width: 80%;
-        margin: 30px auto;
-        padding: 30px;
-        border: 1px solid #ccc;
-        text-align: center;
+        .inputbox {
+            margin: 15px auto 15px auto;
+            padding: 15px 20px 10px 20px;
+            background: #f0f0f0;
 
-        .error {
-            padding: 120px 0;
+            .btn_area {
+                margin-top: 0;
+            }
         }
     }
 }
 
 /* ==============================================
-▼会員登録
+▼エラー
 =============================================== */
 
-/* ==============================================
-▼ログイン
-=============================================== */
+#undercolumn_error .message_area {
+    width: 80%;
+    margin: 30px auto;
+    padding: 30px;
+    border: 1px solid #ccc;
+    text-align: center;
 
-/* ==============================================
-▼エラー
-=============================================== */
+    .error {
+        padding: 120px 0;
+    }
+}
 
 /* ==============================================
 ▼商品一覧
@@ -701,7 +773,7 @@ div {
 
 .pagenumber_area {
     padding-bottom: 10px;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+    background: url("img/background/line_dot_01.gif") repeat-x bottom;
 }
 
 .pagecond_area {
@@ -737,40 +809,40 @@ div {
 /* レイアウト
 ----------------------------------------------- */
 
-div {
-    &.list_area {
-        padding: 0 0 30px 0;
-        width: 100%;
-        overflow: auto;
-    }
+div.list_area {
+    padding: 0 0 30px 0;
+    width: 100%;
+    overflow: auto;
+}
 
-    &.listphoto {
-        float: left;
-    }
+div.listphoto {
+    float: left;
 }
 
-/* メインカラム用 1カラム時*/
+/* メインカラム */
 
 #main_column {
+
+    /* 1カラム時 */
     &.colnum1 div.listrightbloc {
         float: right;
         width: 74%;
     }
 
+    /* 2カラム時 */
     &.colnum2 div.listrightbloc {
         float: right;
         width: 80%;
     }
 
+    /* 3カラム時 */
     &.colnum3 div.listrightbloc {
         float: right;
         width: 74%;
     }
 }
 
-/* メインカラム用 2カラム時*/
 
-/* メインカラム用 3カラム時*/
 
 /* 商品情報 各種設定
 ----------------------------------------------- */
@@ -787,24 +859,29 @@ div.listrightbloc {
         }
     }
 
+    /* 商品名 */
     h3 {
         font-weight: bold;
         font-size: 120%;
     }
 
+    /* コメント */
     .listcomment {
         margin: 0 0 10px 0;
         text-align: left;
     }
 
+    /* 商品詳細を見る */
     .detail_btn {
         margin-bottom: 20px;
     }
 
+    /* 価格 */
     .pricebox {
         margin: 0 0 10px 0;
     }
 
+    /* 買い物カゴ */
     .cart_area {
         padding: 10px;
         border: 1px solid #cef0f4;
@@ -812,10 +889,11 @@ div.listrightbloc {
         width: 94%;
     }
 
+    /* 規格 */
     .classlist {
         margin-bottom: 10px;
         padding-bottom: 10px;
-        background: url("../img/background/line_dot_02.gif") repeat-x bottom;
+        background: url("img/background/line_dot_02.gif") repeat-x bottom;
     }
 
     dl {
@@ -836,6 +914,7 @@ div.listrightbloc {
         }
     }
 
+    /* カゴに入れる */
     .cartin {
         margin: 0;
         float: right;
@@ -858,20 +937,6 @@ div.listrightbloc {
     }
 }
 
-/* 商品名 */
-
-/* コメント */
-
-/* 商品詳細を見る */
-
-/* 価格 */
-
-/* 買い物カゴ */
-
-/* 規格 */
-
-/* カゴに入れる */
-
 /* ==============================================
 ▼商品詳細
 =============================================== */
@@ -884,18 +949,20 @@ div.listrightbloc {
 
 ----------------------------------------------- */
 
-#detailarea, .sub_area {
+#detailarea,
+.sub_area {
     margin-bottom: 20px;
     width: 100%;
 }
 
 /* レイアウト
 ----------------------------------------------- */
-/* 1カラム用 */
 
 #main_column {
+
+    /* 1カラム用 */
     &.colnum1 {
-        div#detailphotobloc {
+        #detailphotobloc {
             width: 37%;
             float: left;
         }
@@ -924,8 +991,9 @@ div.listrightbloc {
         }
     }
 
+    /* 2カラム用 */
     &.colnum2 {
-        div#detailphotobloc {
+        #detailphotobloc {
             float: left;
             width: 37%;
         }
@@ -952,8 +1020,9 @@ div.listrightbloc {
         }
     }
 
+    /* 3カラム用 */
     &.colnum3 {
-        div#detailphotobloc {
+        #detailphotobloc {
             float: left;
             width: 49%;
         }
@@ -981,10 +1050,6 @@ div.listrightbloc {
     }
 }
 
-/* 2カラム用 */
-
-/* 3カラム用 */
-
 /* 商品情報 各種設定
 ----------------------------------------------- */
 
@@ -993,27 +1058,32 @@ div.listrightbloc {
         margin: 0 0 10px 0;
         padding: 0 0 15px 0;
         color: #666;
-        background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+        background: url("img/background/line_dot_01.gif") repeat-x bottom;
         font-weight: bold;
         font-size: 160%;
     }
 
-    .point, .relative_cat {
+    .point,
+    .relative_cat {
         margin: 0 0 10px 0;
         padding: 0 0 10px 0;
-        background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+        background: url("img/background/line_dot_01.gif") repeat-x bottom;
     }
 
     .main_comment {
         margin-bottom: 20px;
     }
 
+    /* 商品コード */
     .product_code {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
+    /* 商品ステータス */
     ul.status_icon {
         margin-bottom: 10px;
         width: 100%;
@@ -1025,29 +1095,39 @@ div.listrightbloc {
         }
     }
 
+    /* 通常価格 */
     .normal_price {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
+    /* 販売価格 */
     .sale_price {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
+    /* ポイント */
     .point {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
+    /* 規格 */
     div.classlist {
         margin-bottom: 10px;
         padding-bottom: 10px;
         width: 100%;
-        background: url("../img/background/line_dot_02.gif") repeat-x bottom;
+        background: url("img/background/line_dot_02.gif") repeat-x bottom;
     }
 
     .classlist {
@@ -1064,22 +1144,30 @@ div.listrightbloc {
         }
     }
 
+    /* メーカー */
     .maker {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
+    /* メーカーURL */
     .comment1 {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
+    /* 関連カテゴリ */
     .relative_cat dd {
         margin-left: 1em;
     }
 
+    /* 買い物カゴ */
     .cart_area {
         padding: 10px;
         background-color: #ecf5ff;
@@ -1087,12 +1175,15 @@ div.listrightbloc {
     }
 
     .quantity {
-        dt, dd {
+
+        dt,
+        dd {
             display: inline;
         }
     }
 
-    .cartin, .cartin_btn {
+    .cartin,
+    .cartin_btn {
         text-align: center;
     }
 
@@ -1102,191 +1193,167 @@ div.listrightbloc {
     }
 }
 
-/* 商品コード */
-
-/* 商品ステータス */
-
-/* 通常価格 */
-
-/* 販売価格 */
-
-/* ポイント */
-
-/* 規格 */
-
-/* メーカー */
-
-/* メーカーURL */
-
-/* 関連カテゴリ */
-
-/* 買い物カゴ */
-
 /* お客様の声
 ----------------------------------------------- */
 
-div {
-    &#customervoice_area {
-        clear: both;
-        padding: 35px 0 0 0;
-
-        h2 {
-            margin-bottom: 20px;
-            padding: 6px 0 8px 10px;
-            border-top: solid 1px #f90;
-            background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
-        }
-
-        .review_bloc {
-            margin-bottom: 20px;
-            padding: 10px;
-            background-color: #f6f6f6;
-
-            p {
-                padding-top: 3px;
-                margin-right: 10px;
-                float: left;
-            }
-
-            .review_btn {
-                float: right;
-                width: 160px;
-            }
-        }
-
-        ul li {
-            padding-bottom: 15px;
-            margin-bottom: 15px;
-            background: url("../img/background/line_dot_01.gif") repeat-x bottom;
-        }
-
-        .voicetitle {
-            margin-bottom: 5px;
-            color: #333;
-            font-weight: bold;
-        }
-
-        .voicedate {
-            margin-bottom: 10px;
-        }
-    }
-
-    &#whobought_area {
-        clear: both;
-        padding: 35px 0 0 0;
+#customervoice_area {
+    clear: both;
+    padding: 35px 0 0 0;
 
-        h2 {
-            border-top: solid 1px #f90;
-            background: url('../img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
-            padding: 5px 0 8px 10px;
-            font-size: 14px;
-        }
+    h2 {
+        margin-bottom: 20px;
+        padding: 6px 0 8px 10px;
+        border-top: solid 1px #f90;
+        background: url('img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
     }
 
-    &#undercolumn_cart {
-        .point_announce {
-            padding: 20px;
-            margin-bottom: 20px;
-            border: solid 1px #ffcc62;
-            background: #fffaf0;
-            font-size: 120%;
-            text-align: center;
-            line-height: 140%;
-        }
-
-        .totalmoney_area {
-            margin-bottom: 20px;
-        }
+    .review_bloc {
+        margin-bottom: 20px;
+        padding: 10px;
+        background-color: #f6f6f6;
 
         p {
-            margin: 10px 5px;
+            padding-top: 3px;
+            margin-right: 10px;
+            float: left;
         }
-    }
 
-    &#undercolumn {
-        ul#quantity_level li {
-            padding: 3px;
-            display: inline;
+        .review_btn {
+            float: right;
+            width: 160px;
         }
+    }
 
-        .empty {
-            text-align: left;
-        }
+    ul li {
+        padding-bottom: 15px;
+        margin-bottom: 15px;
+        background: url("img/background/line_dot_01.gif") repeat-x bottom;
     }
 
-    &.form_area {
-        margin-bottom: 30px;
+    .voicetitle {
+        margin-bottom: 5px;
+        color: #333;
+        font-weight: bold;
     }
 
-    &#undercolumn_customer {}
+    .voicedate {
+        margin-bottom: 10px;
+    }
 }
 
 /* 関連商品（商品部分はbloc.cssのおすすめ商品と共通）
 ----------------------------------------------- */
+#whobought_area {
+    clear: both;
+    padding: 35px 0 0 0;
+
+    h2 {
+        border-top: solid 1px #f90;
+        background: url('img/background/bg_tit_sub_01.jpg') repeat-x left bottom;
+        padding: 5px 0 8px 10px;
+        font-size: 14px;
+    }
+}
+
 
 /* ***********************************************
 ▼カートの中
 /*********************************************** */
 /* 現在のカゴの中
 ----------------------------------------------- */
+#undercolumn_cart {
+    .point_announce {
+        padding: 20px;
+        margin-bottom: 20px;
+        border: solid 1px #ffcc62;
+        background: #fffaf0;
+        font-size: 120%;
+        text-align: center;
+        line-height: 140%;
+    }
+
+    .totalmoney_area {
+        margin-bottom: 20px;
+    }
+
+    p {
+        margin: 10px 5px;
+    }
+}
+
+#undercolumn {
+    ul#quantity_level li {
+        padding: 3px;
+        display: inline;
+    }
+
+    .empty {
+        text-align: left;
+    }
+}
+
+div.form_area {
+    margin-bottom: 30px;
+}
 
 /* お客様情報入力
 ----------------------------------------------- */
 
+#undercolumn_customer {
+}
+
 .flow_area {
     margin: 0 0 20px 0;
 }
 
-div {
-    &#undercolumn_customer th em {
-        color: #000;
-        font-weight: bold;
-    }
+#undercolumn_customer th em {
+    color: #000;
+    font-weight: bold;
+}
 
-    &#undercolumn_shopping {
-        .pay_area {
-            margin: 0 auto 30px;
-            width: 100%;
-        }
+/* お支払い方法・お届け時間等の指定
+----------------------------------------------- */
 
-        .pay_area02 {
-            margin: 40px auto 30px auto;
+#undercolumn_shopping {
+    .pay_area {
+        margin: 0 auto 30px;
+        width: 100%;
+    }
 
-            .txtarea {
-                margin: 5px 0 0 0;
-                padding: 2px;
-                border: 1px solid #ccc;
-                width: 99%;
-                height: 150px;
-            }
+    .pay_area02 {
+        margin: 40px auto 30px auto;
 
-            .select-msg {
-                margin-bottom: 10px;
-            }
+        .txtarea {
+            margin: 5px 0 0 0;
+            padding: 2px;
+            border: 1px solid #ccc;
+            width: 99%;
+            height: 150px;
         }
 
-        .point_area {
-            margin: 40px auto 0 auto;
+        .select-msg {
+            margin-bottom: 10px;
+        }
+    }
 
-            .point_announce {
-                padding: 20px;
-                border: 1px solid #ccc;
-            }
+    .point_area {
+        margin: 40px auto 0 auto;
 
-            p {
-                margin-bottom: 20px;
-            }
+        .point_announce {
+            padding: 20px;
+            border: 1px solid #ccc;
+        }
 
-            .point_announce li {
-                margin-bottom: 5px;
-            }
+        p {
+            margin-bottom: 20px;
+        }
+
+        .point_announce li {
+            margin-bottom: 5px;
         }
     }
 }
 
-/* お支払い方法・お届け時間等の指定
------------------------------------------------ */
-
 /* お届け先の指定
 ----------------------------------------------- */
 
@@ -1337,8 +1404,6 @@ p.condition_area {
     width: 566px;
 }
 
-@charset "utf-8";
-
 /************************************************
  tables
 ************************************************ */
@@ -1372,52 +1437,50 @@ table {
 /* 見出し
 ----------------------------------------------- */
 
-div {
-    &#undercolumn_shopping table {
-        th[scope=col] {
-            text-align: center;
-        }
+#undercolumn_shopping table {
+    th[scope=col] {
+        text-align: center;
+    }
 
-        &.delivname th {
-            width: 155px;
-        }
+    &.delivname th {
+        width: 155px;
     }
+}
 
-    &#mycontents_area table {
-        th {
-            text-align: left;
+/* MYページ */
 
-            &.alignR {
-                text-align: right;
-            }
+#mycontents_area table {
+    th {
+        text-align: left;
 
-            &.alignL {
-                text-align: left;
-            }
+        &.alignR {
+            text-align: right;
+        }
 
-            &.alignC {
-                text-align: center;
-            }
+        &.alignL {
+            text-align: left;
+        }
 
-            &.resulttd {
-                text-align: right;
-            }
+        &.alignC {
+            text-align: center;
         }
 
-        caption {
-            padding: 8px;
-            border-top: 1px solid #ccc;
-            border-right: 1px solid #ccc;
-            border-left: 1px solid #ccc;
-            color: #000;
-            background-color: #f0f0f0;
-            text-align: left;
-            font-weight: bold;
+        &.resulttd {
+            text-align: right;
         }
     }
-}
 
-/* MYページ */
+    caption {
+        padding: 8px;
+        border-top: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        border-left: 1px solid #ccc;
+        color: #000;
+        background-color: #f0f0f0;
+        text-align: left;
+        font-weight: bold;
+    }
+}
 
 /* その他
 ----------------------------------------------- */
@@ -1427,8 +1490,6 @@ table select {
     border: solid 1px #ccc;
 }
 
-@charset "utf-8";
-
 /************************************************
  ブロック用
 ************************************************ */
@@ -1458,7 +1519,6 @@ table select {
 
 .side_column {
     overflow-x: hidden;
-
     /* IE6 表示乱れ防止 */
 
     .block_body {
@@ -1482,9 +1542,8 @@ table select {
 
 #container {
     .block_outer {
-        padding: 0 15px 10px;
-
         /* #container の背景色を欠けさせないため敢えて padding */
+        padding: 0 15px 10px;
     }
 
     #main_column .block_outer {
@@ -1495,6 +1554,9 @@ table select {
         padding: 0 7% 10px;
     }
 
+    /* リスト
+    ----------------------------------------------- */
+    /* ログイン 検索条件 */
     .block_outer .block_body dl.formlist {
         margin-bottom: 8px;
 
@@ -1505,7 +1567,7 @@ table select {
         dt {
             margin-bottom: 3px;
             padding-left: 15px;
-            background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+            background: url("img/icon/ico_arrow_03.gif") no-repeat left;
             font-size: 90%;
         }
 
@@ -1515,49 +1577,53 @@ table select {
     }
 }
 
-/* リスト
------------------------------------------------ */
-/* ログイン 検索条件 */
 
 /* タイトル
 ----------------------------------------------- */
-/* タイトルの背景 白 */
 
-#login_area h2, #search_area h2, #calender_area h2, #cart_area h2, #cart h2 {
-    padding: 5px 0 8px 10px;
-    border-style: solid;
-    border-color: #f90 #ccc #ccc;
-    border-width: 1px 1px 0;
-    background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
-    font-size: 14px;
-}
+h2 {
+    /* タイトルの背景 白 */
 
-#category_area h2 {
-    border-top: solid 1px #f90;
-    background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
-    padding: 5px 0 8px 10px;
-    font-size: 14px;
-}
+    #login_area &,
+    #search_area &,
+    #calender_area &,
+    #cart_area &,
+    #cart & {
+        padding: 5px 0 8px 10px;
+        border-style: solid;
+        border-color: #f90 #ccc #ccc;
+        border-width: 1px 1px 0;
+        background: url('img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
+        font-size: 14px;
+    }
 
-/* タイトルの背景 オレンジ */
+    #category_area & {
+        border-top: solid 1px #f90;
+        background: url('img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
+        padding: 5px 0 8px 10px;
+        font-size: 14px;
+    }
 
-#recommend_area h2 {
-    padding: 5px 0 8px 10px;
-    border-style: solid;
-    border-color: #f90 #ccc #ccc;
-    border-width: 1px 1px 0;
-    background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
-}
+    /* タイトルの背景 オレンジ */
 
-#news_area {
-    h2 {
+    #recommend_area &,
+    #news_area & {
         padding: 5px 0 8px 10px;
         border-style: solid;
         border-color: #f90 #ccc #ccc;
         border-width: 1px 1px 0;
-        background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
+        background: url('img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
     }
+}
+
+/* ***********************************************
+▼各機能ブロックの指定
+/*********************************************** */
 
+/* ===============================================
+▼新着情報
+=============================================== */
+#news_area {
     .news_contents {
         padding: 10px;
         max-height: 260px;
@@ -1572,10 +1638,9 @@ table select {
     }
 
     dl.newslist {
-        background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+        background: url("img/background/line_dot_01.gif") repeat-x bottom;
 
         &:last-child {
-            /* IE9 未満では無効 (影響度合いが低いので黙殺) */
             background: none;
         }
 
@@ -1590,14 +1655,6 @@ table select {
     }
 }
 
-/* ***********************************************
-▼各機能ブロックの指定
-/*********************************************** */
-
-/* ===============================================
-▼新着情報
-=============================================== */
-
 /* ===============================================
 ▼現在のカゴの中
 =============================================== */
@@ -1610,17 +1667,17 @@ table select {
     .postage {
         margin-top: 10px;
         padding-top: 10px;
-        background: url("../img/background/line_dot_01.gif") repeat-x top;
+        background: url("img/background/line_dot_01.gif") repeat-x top;
 
         .point_announce {
             padding: 2px 0 2px 20px;
-            background: url("../img/icon/ico_price.gif") no-repeat left top;
+            background: url("img/icon/ico_price.gif") no-repeat left top;
         }
     }
 
     .btn {
         padding: 10px 0;
-        background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
+        background: url("img/background/line_dot_01.gif") repeat-x top #f7f7e6;
         text-align: center;
     }
 }
@@ -1642,11 +1699,11 @@ table select {
         p {
             padding-left: 20px;
             margin: 7px 3px;
-            background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
+            background: url("img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
         }
 
         li p {
-            background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
+            background: url("img/icon/ico_level.gif") 7px 7px no-repeat;
         }
     }
 
@@ -1662,7 +1719,8 @@ a.onlink {
         text-decoration: underline;
     }
 
-    &:visited, &:hover {
+    &:visited,
+    &:hover {
         color: #f00;
     }
 }
@@ -1683,7 +1741,7 @@ a.onlink {
 ul.button_like li {
     margin: 0;
     padding: 0 0 1px 0;
-    background: url("../img/background/bg_btn_list.jpg") bottom repeat-x;
+    background: url("img/background/bg_btn_list.jpg") bottom repeat-x;
 
     a {
         margin: 0;
@@ -1692,7 +1750,7 @@ ul.button_like li {
         border-bottom: none;
         border-color: #ccc;
         display: block;
-        background: url("../img/icon/ico_arrow_02.gif") no-repeat right;
+        background: url("img/icon/ico_arrow_02.gif") no-repeat right;
         text-decoration: none;
         outline: none;
     }
@@ -1704,7 +1762,7 @@ ul.button_like li {
 =============================================== */
 
 #container {
-    div#login_area .block_body {
+    #login_area .block_body {
         padding: 10px;
 
         p {
@@ -1724,7 +1782,7 @@ ul.button_like li {
             margin-bottom: 3px;
             padding-left: 15px;
             color: #333;
-            background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+            background: url("img/icon/ico_arrow_03.gif") no-repeat left;
             width: 120px;
             float: left;
             font-size: 90%;
@@ -1739,26 +1797,24 @@ ul.button_like li {
         }
     }
 
-    div {
-        &#login_area .block_body .mini {
-            margin-top: 5px;
-            letter-spacing: -0.01em;
-        }
+    #login_area .block_body .mini {
+        margin-top: 5px;
+        letter-spacing: -0.01em;
+    }
 
-        &#search_area .block_body {
-            padding: 10px;
+    /* ===============================================
+    ▼検索
+    =============================================== */
 
-            .btn {
-                text-align: center;
-            }
+    #search_area .block_body {
+        padding: 10px;
+
+        .btn {
+            text-align: center;
         }
     }
 }
 
-/* ===============================================
-▼検索
-=============================================== */
-
 /* ===============================================
 ▼カレンダー
 =============================================== */
@@ -1797,7 +1853,7 @@ ul.button_like li {
     table .month {
         margin-bottom: 5px;
         padding-left: 12px;
-        background: url("../img/icon/ico_arrow_04.gif") no-repeat left;
+        background: url("img/icon/ico_arrow_04.gif") no-repeat left;
         font-size: 120%;
     }
 
@@ -1828,21 +1884,25 @@ ul.button_like li {
 /* 共通
 ----------------------------------------------- */
 
-#recommend_area .block_body, #whobought_area .product_item {
+#recommend_area .block_body,
+#whobought_area .product_item {
     padding: 10px 0 10px;
     border: none;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+    background: url("img/background/line_dot_01.gif") repeat-x bottom;
 }
 
-#recommend_area .block_body p, #whobought_area .product_item p {
+#recommend_area .block_body p,
+#whobought_area .product_item p {
     margin: 0 0 5px 0;
 }
 
-#recommend_area .block_body img, #whobought_area .product_item img {
+#recommend_area .block_body img,
+#whobought_area .product_item img {
     margin: 0 5px 0 0;
 }
 
-#recommend_area .block_body h3, #whobought_area .product_item h3 {
+#recommend_area .block_body h3,
+#whobought_area .product_item h3 {
     font-size: 100%;
     font-weight: normal;
 }
@@ -1857,7 +1917,8 @@ ul.button_like li {
 ----------------------------------------------- */
 /* メインカラム用 */
 
-#main_column #recommend_area .block_body .productImage, #whobought_area .product_item .productImage {
+#main_column #recommend_area .block_body .productImage,
+#whobought_area .product_item .productImage {
     margin-bottom: 10px;
     float: left;
     width: 90px;
@@ -1874,7 +1935,8 @@ ul.button_like li {
 /* 左右の振り分け
 ----------------------------------------------- */
 
-#main_column #recommend_area .product_item, #whobought_area .product_item {
+#main_column #recommend_area .product_item,
+#whobought_area .product_item {
     float: left;
     width: 47.5%;
     padding-left: 1%;
@@ -1883,41 +1945,46 @@ ul.button_like li {
 
 /* 商品説明テキスト
 ----------------------------------------------- */
-/* メインカラム用 1カラム時*/
+/* メインカラム */
 
 #main_column {
+
+    /* 1カラム時 */
+
     &.colnum1 #recommend_area .block_body .productContents {
         float: right;
         width: 74%;
     }
 
+    /* 2カラム時*/
+
     &.colnum2 {
-        #recommend_area .block_body .productContents, #whobought_area .productContents {
+
+        #recommend_area .block_body .productContents,
+        #whobought_area .productContents {
             float: right;
             width: 74%;
         }
     }
 
+    /* 3カラム時*/
+
     &.colnum3 {
-        #recommend_area .block_body .productContents, #whobought_area .productContents {
+
+        #recommend_area .block_body .productContents,
+        #whobought_area .productContents {
             float: right;
             width: 67%;
         }
     }
 }
 
-/* メインカラム用 2カラム時*/
-
-/* メインカラム用 3カラム時*/
-
 /* サイドカラム用 */
 
 .side_column #recommend_area .block_body .productContents {
     clear: both;
 }
 
-@charset "utf-8";
-
 /************************************************
  インヘッダーブロック
 ************************************************ */
@@ -1948,7 +2015,7 @@ ul.button_like li {
             &.mail {
                 padding-left: 28px;
                 width: 155px;
-                background: url("../img/common/ico_arrow_login.gif") no-repeat left;
+                background: url("img/common/ico_arrow_login.gif") no-repeat left;
                 font-size: 90%;
             }
 
@@ -2015,127 +2082,124 @@ ul.button_like li {
 /* 【サイド】バナーエリア_02
 ----------------------------------------------- */
 
-#leftcolumn .block_outer #banner_area .block_body ul li, #rightcolumn .block_outer #banner_area .block_body ul li {
+#leftcolumn .block_outer #banner_area .block_body ul li,
+#rightcolumn .block_outer #banner_area .block_body ul li {
     margin-bottom: 8px;
 }
 
-@charset "utf-8";
-
 /************************************************
  ポップアップウィンドウ
 ************************************************ */
 /* 共通
 ----------------------------------------------- */
 
-div {
-    &#windowcolumn {
-        border-top: solid 3px #f90;
-        width: 560px;
-        height: 100%;
-        margin: 15px 15px 0 15px;
-        background: #fff;
+#windowcolumn {
+    border-top: solid 3px #f90;
+    width: 560px;
+    height: 100%;
+    margin: 15px 15px 0 15px;
+    background: #fff;
 
-        h2 {
-            margin-bottom: 10px;
-            padding: 8px;
-            border-top: solid 1px #ebeced;
-            color: #f60;
-            background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
-            background-color: #fef3d8;
-            font-size: 170%;
-        }
+    h2 {
+        margin-bottom: 10px;
+        padding: 8px;
+        border-top: solid 1px #ebeced;
+        color: #f60;
+        background: url("img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
+        background-color: #fef3d8;
+        font-size: 170%;
     }
+}
 
-    &#window_area {
-        margin: 15px auto 0 auto;
-        padding-bottom: 20px;
-        width: 540px;
-        min-height: 300px;
-        height: auto !important;
-
-        p.information {
-            margin-bottom: 20px;
-        }
-
-        .message {
-            margin-bottom: 20px;
-            color: #f60;
-            line-height: 150%;
-            font-weight: bold;
-            font-size: 140%;
-        }
-
-        table {
-            width: 540px;
-        }
-
-        #forgot {
-            margin: 0 auto;
-            padding: 20px;
-            width: 440px;
-            border: 1px solid #ccc;
-            text-align: left;
-
-            .mailaddres {
-                margin-bottom: 10px;
-            }
+#window_area {
+    margin: 15px auto 0 auto;
+    padding-bottom: 20px;
+    width: 540px;
+    min-height: 300px;
+    height: auto !important;
 
-            p {
-                text-align: center;
-            }
-        }
+    p.information {
+        margin-bottom: 20px;
     }
 
-    &#bigimage, &#cartimage {
-        margin-top: 15px;
-        background-color: #fff;
-        text-align: center;
+    .message {
+        margin-bottom: 20px;
+        color: #f60;
+        line-height: 150%;
+        font-weight: bold;
+        font-size: 140%;
     }
 
-    &#bigimage img, &#cartimage img {
-        padding: 10px;
-        background-color: #fff;
+    table {
+        width: 540px;
     }
 
-    &#zipsearchcolumn {
-        margin: 15px auto 0 auto;
-        border-top: 5px solid #ffa85c;
-        border-bottom: 5px solid #ffa85c;
-        width: 460px;
-        background-color: #fff;
+    /* お客様の声の書き込み、新しいお届け先の追加・変更
+    ----------------------------------------------- */
 
-        h2 {
-            margin: 0 0 15px 0;
-            width: 460px;
-        }
-    }
-
-    &#zipsearch_area {
-        margin: 15px auto 0 auto;
-        width: 460px;
-    }
+    #forgot {
+        margin: 0 auto;
+        padding: 20px;
+        width: 440px;
+        border: 1px solid #ccc;
+        text-align: left;
 
-    &#zipsearchcolumn .btn {
-        margin: 15px 0 30px 0;
-        text-align: center;
-    }
+        .mailaddres {
+            margin-bottom: 10px;
+        }
 
-    &#zipsearch_area #completebox p {
-        padding: 60px 5px;
-        text-align: center;
+        p {
+            text-align: center;
+        }
     }
 }
 
-/* お客様の声の書き込み、新しいお届け先の追加・変更
------------------------------------------------ */
 
 /* 商品詳細拡大写真、カート拡大写真
 ----------------------------------------------- */
 
+#bigimage,
+#cartimage {
+    margin-top: 15px;
+    background-color: #fff;
+    text-align: center;
+}
+
+#bigimage img,
+#cartimage img {
+    padding: 10px;
+    background-color: #fff;
+}
+
 /* 郵便番号検索
 ----------------------------------------------- */
+#zipsearchcolumn {
+    margin: 15px auto 0 auto;
+    border-top: 5px solid #ffa85c;
+    border-bottom: 5px solid #ffa85c;
+    width: 460px;
+    background-color: #fff;
 
-@charset "utf-8";
+    h2 {
+        margin: 0 0 15px 0;
+        width: 460px;
+    }
+}
+
+#zipsearch_area {
+    margin: 15px auto 0 auto;
+    width: 460px;
+}
+
+#zipsearchcolumn .btn {
+    margin: 15px 0 30px 0;
+    text-align: center;
+}
+
+#zipsearch_area #completebox p {
+    padding: 60px 5px;
+    text-align: center;
+}
 
 /************************************************
  印刷用

From 983f622835b145291fb74d731437c68af4b1c284 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 20 Dec 2023 20:31:40 +0900
Subject: [PATCH 33/88] =?UTF-8?q?CSS=20=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E3=81=BE=E3=81=A8=E3=82=81=E3=82=8B=20#784?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

削除されたファイルを参照しているが未使用と思われるファイルを削除する。
---
 html/user_data/css/common.css | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 html/user_data/css/common.css

diff --git a/html/user_data/css/common.css b/html/user_data/css/common.css
deleted file mode 100644
index 91b3642266..0000000000
--- a/html/user_data/css/common.css
+++ /dev/null
@@ -1,4 +0,0 @@
-@charset "utf-8";
-
-@import url("../packages/default/css/import.css");
-

From ca9c81735c620bad9397286f269418d4d846c841 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 21 Dec 2023 20:30:55 +0900
Subject: [PATCH 34/88] =?UTF-8?q?=E3=82=A2=E3=83=97=E3=83=AA=E3=82=B1?=
 =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E5=86=85=E9=83=A8=E3=81=AE?=
 =?UTF-8?q?URL=E3=81=8B=E3=81=AE=E5=88=A4=E5=AE=9A=E3=82=92=E5=85=B1?=
 =?UTF-8?q?=E9=80=9A=E5=87=A6=E7=90=86=E5=8C=96=20#806?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/SC_Initial.php    | 32 ++++++++++++++++++++++++++++++++
 data/class/SC_Response.php   |  7 ++-----
 data/class/util/SC_Utils.php | 11 +++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/data/class/SC_Initial.php b/data/class/SC_Initial.php
index e6cf3ae9ae..0661a1d95d 100644
--- a/data/class/SC_Initial.php
+++ b/data/class/SC_Initial.php
@@ -57,6 +57,7 @@ public function init()
         $this->resetSuperglobalsRequest();  // stripslashesDeepGpc メソッドより後で実行
         $this->setTimezone();               // 本当はエラーハンドラーより先に読みたい気も
         $this->normalizeHostname();         // defineConstants メソッドより後で実行
+        $this->compatPhp();
     }
 
     /**
@@ -558,4 +559,35 @@ public function normalizeHostname()
             SC_Response_Ex::sendRedirect($correct_url);
         }
     }
+
+    function compatPhp()
+    {
+        if (!function_exists('str_starts_with')) {
+            /**
+             * 文字列が指定された部分文字列で始まるかを調べる。(for PHP < 8)
+             *
+             * @param string $haystack
+             * @param string $needle
+             * @return bool
+             */
+            function str_starts_with($haystack, $needle) {
+                return strncmp($haystack, $needle, strlen($needle)) === 0;
+            }
+        }
+
+        if (!function_exists('str_ends_with')) {
+            /**
+             * 文字列が、指定された文字列で終わるかを調べる。(for PHP < 8)
+             *
+             * @param string $haystack
+             * @param string $needle
+             * @return bool
+             */
+            function str_ends_with($haystack, $needle) {
+                $needle_len = strlen($needle);
+
+                return substr($haystack, - $needle_len, $needle_len) === $needle;
+            }
+        }
+    }
 }
diff --git a/data/class/SC_Response.php b/data/class/SC_Response.php
index b692fdf0da..018858e718 100644
--- a/data/class/SC_Response.php
+++ b/data/class/SC_Response.php
@@ -202,11 +202,8 @@ public static function sendRedirect($location, $arrQueryString = array(), $inher
             $url = $netUrl->getUrl();
         }
 
-        $pattern = '/^(' . preg_quote(HTTP_URL, '/') . '|' . preg_quote(HTTPS_URL, '/') . ')/';
-
-        // アプリケーション外へのリダイレクトは扱わない
-        if (preg_match($pattern, $url) === 0) {
-            trigger_error('', E_USER_ERROR);
+        if (!SC_Utils_Ex::isInternalUrl($url)) {
+            trigger_error('アプリケーション外へのリダイレクトは扱わない: ' . var_export($url, true), E_USER_ERROR);
         }
 
         $netUrl = new Net_URL($url);
diff --git a/data/class/util/SC_Utils.php b/data/class/util/SC_Utils.php
index 70e4f18ddc..c4c36b87df 100755
--- a/data/class/util/SC_Utils.php
+++ b/data/class/util/SC_Utils.php
@@ -1687,6 +1687,17 @@ public static function sfIsInternalDomain($url)
         return true;
     }
 
+    /**
+     * 指定されたURLはアプリケーション内部のものか
+     *
+     * @param string $url
+     * @return boolean
+     */
+    public static function isInternalUrl($url)
+    {
+        return str_starts_with($url, HTTPS_URL) || str_starts_with($url, HTTP_URL);
+    }
+
     /**
      * パスワードのハッシュ化
      *

From 4aa5ac30091f5151e7a442e86f8f41ec8dd97d2c Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 21 Dec 2023 21:06:56 +0900
Subject: [PATCH 35/88] =?UTF-8?q?SC=5FCartSession::setPrevURL()=20?=
 =?UTF-8?q?=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B=20#805?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/SC_AdminView.php            |  5 -----
 data/class/SC_CartSession.php          | 12 ++++++++++--
 data/class/SC_Display.php              |  9 ++++-----
 data/class/SC_MobileView.php           |  5 -----
 data/class/SC_SiteView.php             | 12 +++---------
 data/class/SC_SmartphoneView.php       |  5 -----
 data/class/pages/cart/LC_Page_Cart.php |  1 -
 7 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/data/class/SC_AdminView.php b/data/class/SC_AdminView.php
index e919bfc21b..b53d02ba8d 100644
--- a/data/class/SC_AdminView.php
+++ b/data/class/SC_AdminView.php
@@ -23,11 +23,6 @@
 
 class SC_AdminView extends SC_View_Ex
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
     public function init()
     {
         parent::init();
diff --git a/data/class/SC_CartSession.php b/data/class/SC_CartSession.php
index 0e0390a2d4..a59ad9b656 100644
--- a/data/class/SC_CartSession.php
+++ b/data/class/SC_CartSession.php
@@ -279,7 +279,11 @@ public function addProduct($product_class_id, $quantity)
         }
     }
 
-    // 前頁のURLを記録しておく
+    /**
+     * 前頁のURLを記録しておく
+     *
+     * @deprecated 2.18.0 本体では呼ばれない。
+     */
     public function setPrevURL($url, $excludePaths = array())
     {
         // 前頁として記録しないページを指定する。
@@ -301,7 +305,11 @@ public function setPrevURL($url, $excludePaths = array())
         }
     }
 
-    // 前頁のURLを取得する
+    /**
+     * 前頁のURLを取得する
+     *
+     * @deprecated 2.18.0 本体では利用していない。
+     */
     public function getPrevURL()
     {
         return isset($_SESSION['prev_url']) ? $_SESSION['prev_url'] : '';
diff --git a/data/class/SC_Display.php b/data/class/SC_Display.php
index 86ae9e918c..0957a115ab 100644
--- a/data/class/SC_Display.php
+++ b/data/class/SC_Display.php
@@ -48,17 +48,16 @@ class SC_Display
      * const('ADMIN',99);
      */
 
-    public function __construct($hasPrevURL = true)
+    public function __construct()
     {
         $this->response = new SC_Response_Ex();
-        if ($hasPrevURL) {
-            $this->setPrevURL();
-        }
     }
 
+    /**
+     * @deprecated 2.18.0 本体では利用していない。
+     */
     public function setPrevURL()
     {
-        // TODO SC_SiteSession で実装した方が良さげ
         $objCartSess = new SC_CartSession_Ex();
         $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
     }
diff --git a/data/class/SC_MobileView.php b/data/class/SC_MobileView.php
index 96ae635ec2..17aff5e401 100644
--- a/data/class/SC_MobileView.php
+++ b/data/class/SC_MobileView.php
@@ -26,11 +26,6 @@
  */
 class SC_MobileView extends SC_SiteView_Ex
 {
-    public function __construct($setPrevURL = true)
-    {
-        parent::__construct($setPrevURL);
-    }
-
     public function init()
     {
         parent::init();
diff --git a/data/class/SC_SiteView.php b/data/class/SC_SiteView.php
index 4689646d4a..0d0d58a636 100644
--- a/data/class/SC_SiteView.php
+++ b/data/class/SC_SiteView.php
@@ -23,15 +23,6 @@
 
 class SC_SiteView extends SC_View_Ex
 {
-    public function __construct($setPrevURL = true)
-    {
-        parent::__construct();
-
-        if ($setPrevURL) {
-            $this->setPrevURL();
-        }
-    }
-
     public function init()
     {
         parent::init();
@@ -42,6 +33,9 @@ public function init()
         $this->assignTemplatePath(DEVICE_TYPE_PC);
     }
 
+    /**
+     * @deprecated 2.18.0 本体では利用していない。
+     */
     public function setPrevURL()
     {
             $objCartSess = new SC_CartSession_Ex();
diff --git a/data/class/SC_SmartphoneView.php b/data/class/SC_SmartphoneView.php
index 77b712cec0..12b540a80a 100644
--- a/data/class/SC_SmartphoneView.php
+++ b/data/class/SC_SmartphoneView.php
@@ -23,11 +23,6 @@
 
 class SC_SmartphoneView extends SC_SiteView_Ex
 {
-    public function __construct($setPrevURL = true)
-    {
-        parent::__construct($setPrevURL);
-    }
-
     public function init()
     {
         parent::init();
diff --git a/data/class/pages/cart/LC_Page_Cart.php b/data/class/pages/cart/LC_Page_Cart.php
index 102ab107ee..5d304dbac6 100644
--- a/data/class/pages/cart/LC_Page_Cart.php
+++ b/data/class/pages/cart/LC_Page_Cart.php
@@ -209,7 +209,6 @@ public function action()
         }
 
         // 前頁のURLを取得
-        // TODO: SC_CartSession::setPrevURL()利用不可。
         $this->lfGetCartPrevUrl($_SESSION, $_SERVER['HTTP_REFERER']);
         $this->tpl_prev_url = (isset($_SESSION['cart_prev_url'])) ? $_SESSION['cart_prev_url'] : '';
 

From b356c0634ed0c084a15fab4563278f6cf078abac Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 21 Dec 2023 21:05:57 +0900
Subject: [PATCH 36/88] =?UTF-8?q?=E7=8F=BE=E5=9C=A8=E3=81=AE=E3=82=AB?=
 =?UTF-8?q?=E3=82=B4=E3=81=AE=E4=B8=AD=20[=E6=88=BB=E3=82=8B]=E3=83=9C?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=20=E8=B3=BC=E5=85=A5=E6=89=8B=E7=B6=9A?=
 =?UTF-8?q?=E3=81=8D=E3=81=B8=E9=81=B7=E7=A7=BB=E3=81=99=E3=82=8B=E3=81=93?=
 =?UTF-8?q?=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=20#803?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/pages/cart/LC_Page_Cart.php        | 36 ++++++++++++-------
 .../products/LC_Page_Products_Detail.php      |  9 +----
 .../pages/products/LC_Page_Products_List.php  |  5 ---
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/data/class/pages/cart/LC_Page_Cart.php b/data/class/pages/cart/LC_Page_Cart.php
index 102ab107ee..ae835e4225 100644
--- a/data/class/pages/cart/LC_Page_Cart.php
+++ b/data/class/pages/cart/LC_Page_Cart.php
@@ -284,22 +284,32 @@ public function lfUpdateOrderTempid($pre_uniqid, $uniqid)
      */
     public function lfGetCartPrevUrl(&$session, $referer)
     {
-        if (!preg_match('/cart/', $referer)) {
-            if (!empty($session['cart_referer_url'])) {
-                $session['cart_prev_url'] = $session['cart_referer_url'];
-                unset($session['cart_referer_url']);
-            } else {
-                if (preg_match('/entry/', $referer)) {
-                    $session['cart_prev_url'] = HTTPS_URL . 'entry/kiyaku.php';
-                } else {
-                    $session['cart_prev_url'] = $referer;
-                }
+        // 妥当性チェック
+        if (!SC_Utils_Ex::isInternalUrl($referer)) {
+            return;
+        }
+
+        // 除外ページの場合、何もせず終了する。
+        $arrExclude = array(
+            ROOT_URLPATH . 'shopping/',
+            ROOT_URLPATH . 'cart/',
+        );
+
+        // リファラーから path を切り出す。
+        $netURL = new Net_URL($referer);
+        $referer_path = $netURL->path;
+
+        foreach ($arrExclude as $start) {
+            if (str_starts_with($referer_path, $start)) {
+                return;
             }
         }
-        // 妥当性チェック
-        if (!SC_Utils_Ex::sfIsInternalDomain($session['cart_prev_url'])) {
-            $session['cart_prev_url'] = '';
+
+        if (str_starts_with($referer_path, ROOT_URLPATH . 'entry/')) {
+            $referer = HTTPS_URL . 'entry/kiyaku.php';
         }
+
+        $session['cart_prev_url'] = $referer;
     }
 
     /**
diff --git a/data/class/pages/products/LC_Page_Products_Detail.php b/data/class/pages/products/LC_Page_Products_Detail.php
index 980cf3ed11..461203bbe1 100644
--- a/data/class/pages/products/LC_Page_Products_Detail.php
+++ b/data/class/pages/products/LC_Page_Products_Detail.php
@@ -242,11 +242,7 @@ public function action()
             case 'select':
             case 'select2':
             case 'selectItem':
-                /**
-                 * モバイルの数量指定・規格選択の際に、
-                 * $_SESSION['cart_referer_url'] を上書きさせないために、
-                 * 何もせずbreakする。
-                 */
+                // nop
                 break;
 
             default:
@@ -687,9 +683,6 @@ public function doAddFavoriteSphone(SC_Customer $objCustomer)
      */
     public function doDefault()
     {
-        // カート「戻るボタン」用に保持
-        $netURL = new Net_URL();
-        $_SESSION['cart_referer_url'] = $netURL->getURL();
     }
 
     /**
diff --git a/data/class/pages/products/LC_Page_Products_List.php b/data/class/pages/products/LC_Page_Products_List.php
index 8196299e04..455b57a780 100644
--- a/data/class/pages/products/LC_Page_Products_List.php
+++ b/data/class/pages/products/LC_Page_Products_List.php
@@ -578,11 +578,6 @@ public function doDefault(&$objProduct, &$objFormParam)
                 SC_Response_Ex::actionExit();
             }
             $js_fnOnLoad .= $this->lfSetSelectedData($this->arrProducts, $this->arrForm, $arrErr, $target_product_id);
-        } else {
-            // カート「戻るボタン」用に保持
-            $netURL = new Net_URL();
-            //該当メソッドが無いため、$_SESSIONに直接セット
-            $_SESSION['cart_referer_url'] = $netURL->getURL();
         }
 
         $this->tpl_javascript   .= 'function fnOnLoad() {' . $js_fnOnLoad . '}';

From 5a7a6933b9129e474b760541fe4a121df5fcc8f0 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Mon, 1 Jan 2024 00:15:05 +0900
Subject: [PATCH 37/88] =?UTF-8?q?SC=5FHelper=5FHandleError=20=E3=81=A7?=
 =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E5=89=8D=E3=81=AE=20ERROR=5FLOG=5FREALFILE?=
 =?UTF-8?q?=20=E3=81=8C=E4=BD=BF=E3=82=8F=E3=82=8C=E3=82=8B=E3=81=93?=
 =?UTF-8?q?=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=20#808?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/helper/SC_Helper_HandleError.php | 45 +++++++++++++++------
 tests/require.php                           |  3 ++
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/data/class/helper/SC_Helper_HandleError.php b/data/class/helper/SC_Helper_HandleError.php
index 251376b42b..a1b1d81843 100644
--- a/data/class/helper/SC_Helper_HandleError.php
+++ b/data/class/helper/SC_Helper_HandleError.php
@@ -34,6 +34,9 @@ class SC_Helper_HandleError
     /** エラー処理中か */
     static $under_error_handling = false;
 
+    /** display_errors の初期値 */
+    static $default_display_errors;
+
     /**
      * 処理の読み込みを行う
      *
@@ -51,21 +54,16 @@ public static function load()
         // 開発時は -1 (全て) を推奨
         error_reporting(E_ALL & ~E_NOTICE & ~E_USER_NOTICE);
 
+        static::$default_display_errors = ini_get('display_errors');
+
         if (!(defined('SAFE') && SAFE === true) && !(defined('INSTALL_FUNCTION') && INSTALL_FUNCTION === true)) {
             // E_USER_ERROR または警告を捕捉した場合のエラーハンドラ
             set_error_handler(array(__CLASS__, 'handle_warning'), E_USER_ERROR | E_WARNING | E_USER_WARNING | E_CORE_WARNING | E_COMPILE_WARNING);
 
-            // 実質的に PHP 5.2 以降かで処理が分かれる
-            if (function_exists('error_get_last')) {
-                // E_USER_ERROR 以外のエラーを捕捉した場合の処理用
-                register_shutdown_function(array(__CLASS__, 'handle_error'));
-                // 以降の処理では画面へのエラー表示は行なわない
-                ini_set('display_errors', 0);
-            } else {
-                // エラー捕捉用の出力バッファリング
-                ob_start(array(__CLASS__, '_fatal_error_handler'));
-                ini_set('display_errors', 1);
-            }
+            // E_USER_ERROR 以外のエラーを捕捉した場合の処理用
+            register_shutdown_function(array(__CLASS__, 'handle_error'));
+            // 以降の処理では画面へのエラー表示は行なわない
+            ini_set('display_errors', 0);
         }
     }
 
@@ -92,10 +90,22 @@ public static function handle_warning($errno, $errstr, $errfile, $errline)
             return;
         }
 
+        // パラメーターが読み込まれるまでは、PHP 標準のエラー処理とする。
+        // - phpunit の実行中に Warning が出力されることでテストが失敗するテストケースがあっため、除外している。
+        if (!defined('ERROR_LOG_REALFILE') && !(defined('TEST_FUNCTION') && TEST_FUNCTION === true)) {
+            return false;
+        }
+
         $error_type_name = GC_Utils_Ex::getErrorTypeName($errno);
 
         switch ($errno) {
             case E_USER_ERROR:
+                // パラメーターが読み込まれるまでは、エラー例外をスローする。(上の分岐があるため phpunit の実行中に限定される。)
+                if (!defined('ERROR_LOG_REALFILE')) {
+                    ini_set('display_errors', static::$default_display_errors);
+                    throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
+                }
+
                 $message = "Fatal error($error_type_name): $errstr on [$errfile($errline)]";
                 GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE, true);
 
@@ -107,8 +117,10 @@ public static function handle_warning($errno, $errstr, $errfile, $errline)
             case E_USER_WARNING:
             case E_CORE_WARNING:
             case E_COMPILE_WARNING:
-                $message = "Warning($error_type_name): $errstr on [$errfile($errline)]";
-                GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE);
+                if (defined('ERROR_LOG_REALFILE')) {
+                    $message = "Warning($error_type_name): $errstr on [$errfile($errline)]";
+                    GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE);
+                }
 
                 return true;
 
@@ -129,6 +141,7 @@ public static function handle_warning($errno, $errstr, $errfile, $errline)
      * @param  string      $buffer 出力バッファリングの内容
      * @return string|void エラーが捕捉された場合は, エラーページへリダイレクトする;
      *                     エラーが捕捉されない場合は, 出力バッファリングの内容を返す
+     * @deprecated 2.18 EC-CUBE 本体では使用していない。
      */
     static function &_fatal_error_handler(&$buffer)
     {
@@ -179,6 +192,12 @@ public static function handle_error()
             return;
         }
 
+        // パラメーターが読み込まれるまでは、エラー例外をスローする。
+        if (!defined('ERROR_LOG_REALFILE')) {
+            ini_set('display_errors', static::$default_display_errors);
+            throw new ErrorException($arrError['message'], 0, $arrError['type'], $arrError['file'], $arrError['line']);
+        }
+
         $error_type_name = GC_Utils_Ex::getErrorTypeName($arrError['type']);
         $errstr = "Fatal error($error_type_name): {$arrError['message']} on [{$arrError['file']}({$arrError['line']})]";
 
diff --git a/tests/require.php b/tests/require.php
index 73154f19eb..b353025ed6 100644
--- a/tests/require.php
+++ b/tests/require.php
@@ -1,6 +1,9 @@
 <?php
 $loader = require __DIR__.'/../data/vendor/autoload.php';
 
+/** テスト中 */
+define('TEST_FUNCTION', true);
+
 if (strpos($_SERVER['SCRIPT_FILENAME'], 'phpunit') !== false && !class_exists('\Eccube2\Tests\Fixture\Generator')) {
     echo 'You must set up the project dependencies, run the following commands:'.PHP_EOL.
         'composer require nanasess/eccube2-fixture-generator --dev --ignore-platform-req=php'.PHP_EOL;

From e90552ae6cd9975e6bb3622d57fe037553d236be Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 3 Jan 2024 11:22:30 +0900
Subject: [PATCH 38/88] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E5=83=8F=E3=81=8C?=
 =?UTF-8?q?=E6=AC=A0=E8=90=BD=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=20#810?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 画像を使わず CSS で対応。
- ロード完了前も表示対応とした。
- 画像とともに使われていない (既に404 だった) jquery.colorbox の CSS/JS も削除した。
- beforeunload イベントで表示するようにした。
---
 html/install/templates/install_frame.tpl | 126 ++++++++++++++---------
 1 file changed, 78 insertions(+), 48 deletions(-)

diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl
index 0d959ed88d..ad41f8f15b 100644
--- a/html/install/templates/install_frame.tpl
+++ b/html/install/templates/install_frame.tpl
@@ -26,7 +26,6 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
 <link rel="stylesheet" href="css/admin_contents.css" type="text/css" media="all" />
-<link rel="stylesheet" href="../js/jquery.colorbox/colorbox.css" type="text/css" media="all" />
 <!--[if lt IE 9]>
 <script src="../js/jquery-1.11.1.min.js"></script>
 <![endif]-->
@@ -34,43 +33,22 @@
 <script src="../js/jquery-2.1.1.min.js"></script>
 <!--<![endif]-->
 <script type="text/javascript" src="../js/eccube.js"></script>
-<script type="text/javascript" src="../js/jquery.colorbox/jquery.colorbox-min.js"></script>
 
-<style type="text/css">
-#loading{
-  width: 100%;
-  height: 100%;
-  background-color:#FFFFFF;
-  filter:alpha(opacity=85);
-  -moz-opacity:0.85;
-  -khtml-opacity: 0.85;
-  opacity:0.85;
-  position: fixed;
-  _position: absolute; /* forIE6 */
-  display: none;
-  top: 0;
-  left: 0;
-  z-index: 10000;
-}
-#loading img {
-  width: 48px;
-  height: 48px;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  margin-top: -24px;
-  margin-left: -24px;
-}
-</style>
 <!--{if $tpl_mainpage != 'complete.tpl'}-->
 <script type="text/javascript">//<![CDATA[
 $(function(){
     $('.btn-next').on('click', function(e) {
-      e.preventDefault();
-      $('form').submit();
-      $('#loading').show();
+        e.preventDefault();
+        $('form').submit();
     });
 });
+$(window).on('load', function() {
+    $('#loading').hide();
+});
+$(window).on('beforeunload',function(){
+    // unload では処理されないため、beforeunload を利用している。(Chrome, Firefox で確認)
+    $('#loading').show();
+});
 //]]></script>
 <!--{/if}-->
 <title>EC-CUBEインストール</title>
@@ -78,26 +56,78 @@ $(function(){
 <body>
 <!--{$GLOBAL_ERR}-->
 <noscript>
-  <p>JavaScript を有効にしてご利用下さい。</p>
+    <p>JavaScript を有効にしてご利用下さい。</p>
 </noscript>
-<div id="loading"><img src="../js/jquery.colorbox/loading.gif" width="48" height="48" alt="Loading..." /></div>
 <div id="outside">
-  <div id="out-wrap">
-    <div class="logo">
-      <img src="img/logo_resize.jpg" width="99" height="15" alt="EC-CUBE" />
+    <div id="out-wrap">
+        <div class="logo">
+            <img src="img/logo_resize.jpg" width="99" height="15" alt="EC-CUBE" />
+        </div>
+        <div id="out-area">
+            <div class="out-top"></div>
+            <!--{include file=$tpl_mainpage}-->
+        </div>
+        <!--{if strlen($install_info_url) != 0}-->
+        <div id="info-area">
+            <iframe src="<!--{$install_info_url}-->" width="562" height="550" frameborder="no" scrolling="no">
+                こちらはEC-CUBEからのお知らせです。この部分は iframe対応ブラウザでご覧下さい。
+            </iframe>
+        </div>
+        <!--{/if}-->
     </div>
-    <div id="out-area">
-      <div class="out-top"></div>
-      <!--{include file=$tpl_mainpage}-->
-    </div>
-    <!--{if strlen($install_info_url) != 0}-->
-    <div id="info-area">
-      <iframe src="<!--{$install_info_url}-->" width="562" height="550" frameborder="no" scrolling="no">
-        こちらはEC-CUBEからのお知らせです。この部分は iframe対応ブラウザでご覧下さい。
-      </iframe>
-    </div>
-    <!--{/if}-->
-  </div>
 </div>
+<div id="loading"><div class="inner">
+    <canvas></canvas>
+    <p>Loading...</p>
+</div></div>
 </body>
+<style type="text/css">
+#loading {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(32, 32, 32, 0.3);
+    .inner {
+        position: relative;
+        display: inline-block;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        padding: 1ex;
+        border-radius: 1ex;
+        background-image: linear-gradient(180deg, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.3));
+        canvas {
+            --s: 14px;
+            --g: 5px;
+            width: calc(3*(1.353*var(--s) + var(--g)));
+            aspect-ratio: 3;
+            background:
+                linear-gradient(#FC0 0 0) left/33% 100% no-repeat,
+                conic-gradient(from -90deg at var(--s) calc(0.353*var(--s)), #EEE 135deg,#383B4A 0 270deg,#9C9DA5 0)
+            ;
+            background-blend-mode: multiply;
+            mask:
+                linear-gradient(to bottom right, #0000 calc(0.25*var(--s)),#000 0 calc(100% - calc(0.25*var(--s)) - 1.414*var(--g)),#0000 0),
+                conic-gradient(from -90deg at right var(--g) bottom var(--g),#000 90deg,#0000 0)
+            ;
+            background-size: calc(100%/3) 100%;
+            mask-size: calc(100%/3) 100%;
+            mask-composite: intersect;
+            animation: l7 steps(3) 1.5s infinite;
+            position: relative;
+            left: 50%;
+            transform: translate(-50%, 0);
+        }
+    }
+    p {
+        color: #fff;
+        letter-spacing: 0.3ex;
+    }
+}
+@keyframes l7 {
+    to {background-position: 150% 0%}
+}
+</style>
 </html>

From 99563a82bb0ca091b754e37d7e9d7805bd1349e1 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 3 Jan 2024 11:37:21 +0900
Subject: [PATCH 39/88] =?UTF-8?q?=E5=B9=BE=E3=82=89=E3=81=8B=E5=AE=B9?=
 =?UTF-8?q?=E9=87=8F=E3=81=8C=E5=A2=97=E3=81=88=E3=81=9F=E3=81=A8=E6=80=9D?=
 =?UTF-8?q?=E3=81=86=E3=81=AE=E3=81=A7=20strip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/install/templates/install_frame.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl
index ad41f8f15b..cf6f1b356d 100644
--- a/html/install/templates/install_frame.tpl
+++ b/html/install/templates/install_frame.tpl
@@ -53,6 +53,7 @@ $(window).on('beforeunload',function(){
 <!--{/if}-->
 <title>EC-CUBEインストール</title>
 </head>
+<!--{strip}-->
 <body>
 <!--{$GLOBAL_ERR}-->
 <noscript>
@@ -130,4 +131,5 @@ $(window).on('beforeunload',function(){
     to {background-position: 150% 0%}
 }
 </style>
+<!--{/strip}-->
 </html>

From 4f3388ae184b8a99da0a6b1017491de54c49b2a3 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 3 Jan 2024 16:28:56 +0900
Subject: [PATCH 40/88] =?UTF-8?q?CSS=20Nesting=20Module=20=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=9F=E5=AE=9F=E8=A3=85=20#783=20(?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sass-convert --indent=4 --to=scss html/install/css/admin_contents.css html/install/css/admin_contents.css
---
 html/install/css/admin_contents.css | 384 +++++++++++++++++-----------
 1 file changed, 236 insertions(+), 148 deletions(-)

diff --git a/html/install/css/admin_contents.css b/html/install/css/admin_contents.css
index 740b11f144..77ccc5c8d7 100644
--- a/html/install/css/admin_contents.css
+++ b/html/install/css/admin_contents.css
@@ -5,8 +5,8 @@
     padding: 0;
 }
 
-
 /* 上記による Fierfox 2 崩れ対応 */
+
 option {
     margin-right: 0.5em;
 }
@@ -24,27 +24,25 @@ body {
     line-height: 120%;
 }
 
-option {
-    margin-right: 3px;
-    font-size: 100%;
-}
-
-input, textarea {
+option, input, textarea {
     margin-right: 3px;
     font-size: 100%;
 }
 
 select {
     font-size: 100%;
+
+    &.top {
+        margin-bottom: 5px;
+    }
 }
-select.top,
-input.top,
-textarea.top{
+
+input.top, textarea.top {
     margin-bottom: 5px;
 }
 
-.page_rows{
-    margin-bottom:20px;
+.page_rows {
+    margin-bottom: 20px;
 }
 
 img {
@@ -60,6 +58,7 @@ hr {
 }
 
 /*テーブル設定*/
+
 table {
     margin: 0 0 20px;
     border-collapse: collapse;
@@ -80,23 +79,23 @@ th {
     text-align: left;
 }
 
-.contents-main .btn-area, #popup .btn-area, #form_edit .btn-area{
-    margin : 0px 0 60px 0;
+.contents-main .btn-area, #popup .btn-area, #form_edit .btn-area {
+    margin: 0px 0 60px 0;
     padding: 20px 0;
     clear: both;
     width: 100%;
-    background:#f5f5f5;
+    background: #f5f5f5;
     text-align: center;
 }
 
-.contents-main .btn-area li, #popup .btn-area li, .btn-area li{
+.contents-main .btn-area li, #popup .btn-area li, .btn-area li {
     margin-right: 10px;
     display: inline;
 }
 
-
 /*通常ボタン*/
-.btn-normal, a.btn-normal:link, a.btn-normal:visited {
+
+.btn-normal {
     margin-right: 5px;
     padding: 2px 10px;
     border: solid 1px #bcbecb;
@@ -114,20 +113,61 @@ th {
 
     /* CSS3 radius */
     border-radius: 5px;
+
     /* Safari, Chrome radius */
     -webkit-box-sizing: content-box;
     -webkit-border-radius: 5px;
+
     /* Firefox radius */
     -moz-border-radius: 5px;
+
     /* Safari, Chrome radius */
     -webkit-box-sizing: content-box;
     -webkit-border-radius: 5px;
+
     /* Firefox radius */
     -moz-border-radius: 5px;
 }
 
+a.btn-normal {
+    &:link, &:visited {
+        margin-right: 5px;
+        padding: 2px 10px;
+        border: solid 1px #bcbecb;
+        display: inline-block;
+        color: #444757;
+        background-image: url('../img/white-grad.png');
+        background-attachment: scroll;
+        background-clip: border-box;
+        background-color: #eee;
+        font-weight: normal;
+        font-size: 90%;
+        text-decoration: none;
+        white-space: nowrap;
+        cursor: pointer;
+
+        /* CSS3 radius */
+        border-radius: 5px;
+
+        /* Safari, Chrome radius */
+        -webkit-box-sizing: content-box;
+        -webkit-border-radius: 5px;
+
+        /* Firefox radius */
+        -moz-border-radius: 5px;
+
+        /* Safari, Chrome radius */
+        -webkit-box-sizing: content-box;
+        -webkit-border-radius: 5px;
+
+        /* Firefox radius */
+        -moz-border-radius: 5px;
+    }
+}
+
 /*動作ボタン*/
-.btn-action, a.btn-action:link, a.btn-action:visited {
+
+.btn-action {
     padding: 5px 10px;
     border: solid 1px #bcbecb;
     display: inline-block;
@@ -143,69 +183,101 @@ th {
 
     /* CSS3 radius */
     border-radius: 5px;
+
     /* Safari, Chrome radius */
     -webkit-box-sizing: content-box;
     -webkit-border-radius: 5px;
+
     /* Firefox radius */
     -moz-border-radius: 5px;
+
     /* Safari, Chrome radius */
     -webkit-box-sizing: content-box;
     -webkit-border-radius: 5px;
+
     /* Firefox radius */
     -moz-border-radius: 5px;
 }
 
+a.btn-action {
+    &:link, &:visited {
+        padding: 5px 10px;
+        border: solid 1px #bcbecb;
+        display: inline-block;
+        color: #444757;
+        background: url('../img/white-grad04.png') top repeat-x #eee;
+        background-attachment: scroll;
+        background-clip: border-box;
+        font-weight: normal;
+        font-size: 80%;
+        text-decoration: none;
+        white-space: nowrap;
+        cursor: pointer;
 
-/*戻るボタン*/
-.btn-action .btn-prev {
-    padding: 0 0 0 20px;
-    display: inline-block;
-    background: url('../img/ico_prev.gif') left no-repeat;
-    font-weight: bold;
-    font-size: 114%;
-}
+        /* CSS3 radius */
+        border-radius: 5px;
 
+        /* Safari, Chrome radius */
+        -webkit-box-sizing: content-box;
+        -webkit-border-radius: 5px;
 
-/*進むボタン*/
-.btn-action .btn-next {
-    padding: 0 20px 0 0;
-    display: inline-block;
-    background: url('../img/ico_next.gif') right no-repeat;
-    font-weight: bold;
-    font-size: 114%;
-}
+        /* Firefox radius */
+        -moz-border-radius: 5px;
 
-a.btn-normal:hover, a.btn-action:hover, a.btn-tool:hover{
-    border: solid 1px #d5d7df;
-    color: #6d728b;
-}
+        /* Safari, Chrome radius */
+        -webkit-box-sizing: content-box;
+        -webkit-border-radius: 5px;
 
-a.btn-tool-format:hover{
-    border: solid 1px #363a47;
-    color: #6b728b;
+        /* Firefox radius */
+        -moz-border-radius: 5px;
+    }
 }
 
-a.btn:active, a.btn-normal:active {
-    background-image: url('../img/white-grad-active.png');
-}
+/*戻るボタン*/
 
+.btn-action {
+    .btn-prev {
+        padding: 0 0 0 20px;
+        display: inline-block;
+        background: url('../img/ico_prev.gif') left no-repeat;
+        font-weight: bold;
+        font-size: 114%;
+    }
 
-/*LINK*/
-a:link {
-    color: #39c;
-    text-decoration: none;
+    .btn-next {
+        padding: 0 20px 0 0;
+        display: inline-block;
+        background: url('../img/ico_next.gif') right no-repeat;
+        font-weight: bold;
+        font-size: 114%;
+    }
 }
 
-a:visited {
-    color: #39c;
-    text-decoration: none;
-}
+/*進むボタン*/
 
-a:hover {
-    color: #39c;
-    text-decoration: none;
+a {
+    &.btn-normal:hover, &.btn-action:hover, &.btn-tool:hover {
+        border: solid 1px #d5d7df;
+        color: #6d728b;
+    }
+
+    &.btn-tool-format:hover {
+        border: solid 1px #363a47;
+        color: #6b728b;
+    }
+
+    &.btn:active, &.btn-normal:active {
+        background-image: url('../img/white-grad-active.png');
+    }
+
+    &:link, &:visited, &:hover {
+        color: #39c;
+        text-decoration: none;
+    }
 }
 
+/*LINK*/
+
 .left {
     text-align: left;
 }
@@ -222,9 +294,9 @@ a:hover {
     color: #f00;
 }
 
-
 /* コンテンツ
 ----------------------------------------------- */
+
 * html div#container {
     position: relative;
     height: 100%;
@@ -245,28 +317,26 @@ body > #container {
     width: 1000px;
 }
 
-
 /* インストールメッセージ
 ----------------------------------------------- */
 
 /*以下エラーページと共通■触るべからず*/
 
 #outside {
-    margin:0 auto;
-    padding:0;
-    text-align:center;
-    width:100%;
+    margin: 0 auto;
+    padding: 0;
+    text-align: center;
+    width: 100%;
 }
 
 #out-wrap {
-    margin:100px auto;
+    margin: 100px auto;
     width: 560px;
 }
 
 #out-area {
-    width:560px;
+    width: 560px;
     text-align: left;
-
 }
 
 #out-wrap .logo {
@@ -274,83 +344,96 @@ body > #container {
     float: right;
 }
 
-#out-area{
+#out-area {
     width: 558px;
-}
-#out-area .out-top {
-    clear: both;
-    width: 560px;
-    height: 10px;
-    background: url('../img/login_back_top.jpg') bottom left no-repeat;
+
+    .out-top {
+        clear: both;
+        width: 560px;
+        height: 10px;
+        background: url('../img/login_back_top.jpg') bottom left no-repeat;
+    }
+
+    .contents {
+        width: 560px;
+        background: url('../img/login_back_contents.gif') top left repeat-y;
+        text-align: left;
+    }
+
+    .btn-area-top {
+        width: 560px;
+        height: 10px;
+        background: url('../img/login_back_btn_top.jpg') left no-repeat;
+    }
+
+    .btn-area ul {
+        padding: 20px 0 10px 0;
+        width: 560px;
+        text-align: center;
+        background: url('../img/login_back_btn_contents.jpg') top left no-repeat #f4f5f5;
+    }
+
+    .btn-area-bottom {
+        width: 560px;
+        height: 10px;
+        background: url('../img/login_back_btn_bottom.jpg') bottom left no-repeat #eeeff0;
+    }
+
+    .contents {
+        .block {
+            margin: 0 auto;
+            width: 520px;
+        }
+
+        .message {
+            margin: 0 auto 0px auto;
+            padding: 5px 0;
+            width: 520px;
+            color: #444757;
+            font-size: 100%;
+        }
+
+        h2 {
+            margin: 0 auto 10px auto;
+            padding: 5px 0;
+            width: 520px;
+            color: #444757;
+            font-size: 100%;
+            font-weight: bold;
+            border-bottom: solid 3px #ccc;
+        }
+
+        .result-info01 {
+            margin: 0 auto 10px auto;
+            padding: 20px;
+            width: 480px;
+            background: #eee;
+            font-size: 86%;
+            font-weight: bold;
+            line-height: 160%;
+        }
+
+        .result-info02 {
+            margin: 0 auto;
+            padding-bottom: 30px;
+            width: 520px;
+
+            p {
+                margin-bottom: 10px;
+
+                &.action-message {
+                    margin: 20px 0 0 0;
+                    padding-bottom: 10px;
+                    color: #444757;
+                }
+            }
+        }
+    }
 }
 
 /*以上エラーページと共通■触るべからず*/
 
-#out-area .contents {
-    width:560px;
-    background: url('../img/login_back_contents.gif') top left repeat-y;
-    text-align: left;
-}
-
-#out-area .btn-area-top {
-    width: 560px;
-    height: 10px;
-    background: url('../img/login_back_btn_top.jpg') left no-repeat;
-}
-#out-area .btn-area ul {
-    padding: 20px 0 10px 0;
-    width: 560px;
-    text-align: center;
-    background: url('../img/login_back_btn_contents.jpg') top left no-repeat #f4f5f5;
-}
-#out-area .btn-area-bottom {
-    width: 560px;
-    height: 10px;
-    background: url('../img/login_back_btn_bottom.jpg') bottom left no-repeat #eeeff0;
-}
-#out-area .contents .block {
-    margin: 0 auto;
-    width: 520px;
-}
-#out-area .contents .message {
-    margin: 0 auto 0px auto;
-    padding: 5px 0;
-    width: 520px;
-    color:#444757;
-    font-size:100%;
-}
-#out-area .contents h2 {
-    margin: 0 auto 10px auto;
-    padding: 5px 0;
-    width: 520px;
-    color:#444757;
-    font-size:100%;
-    font-weight: bold;
-    border-bottom: solid 3px #ccc;
-}
-#out-area .contents .result-info01 {
-    margin: 0 auto 10px auto;
-    padding: 20px;
-    width: 480px;
-    background: #eee;
-    font-size: 86%;
-    font-weight: bold;
-    line-height:160%;
-}
-#out-area .contents .result-info02 {
-    margin: 0 auto;
-    padding-bottom: 30px;
-    width: 520px;
-}
-#out-area .contents .result-info02 p {
-    margin-bottom: 10px;
-}
-#out-area .contents .result-info02 p.action-message {
-    margin: 20px 0 0 0;
-    padding-bottom: 10px;
-    color:#444757;
-}
-.ex-text{
+.ex-text {
     color: #7c7c7c;
     font-size: 86%;
 }
@@ -364,44 +447,49 @@ body > #container {
 /* EC-CUBEからのお知らせエリア
 ----------------------------------------------- */
 
-#info-area{
-	margin-top:20px;
+#info-area {
+    margin-top: 20px;
     width: 558px;
 }
 
 /* フォーム
 ----------------------------------------------- */
-div.btn,p.remark {
+
+div.btn, p.remark {
     margin: 0 0 20px 0;
 }
 
 /*FORM*/
+
 .box470 {
     width: 470px;
     height: 300px;
 }
+
 .box280 {
     width: 280px;
     height: 30px;
 }
 
 /*COLOR*/
+
 .red {
     color: #f00;
 }
 
 /*FONT*/
+
 .bold {
-    font-weight:bold;
+    font-weight: bold;
 }
 
 /* フロート解除 */
+
 .clearfix:after {
-    display:block;
-    clear:both;
-    height:0px;
-    line-height:0px;
-    visibility:hidden;
-    content:".";
+    display: block;
+    clear: both;
+    height: 0px;
+    line-height: 0px;
+    visibility: hidden;
+    content: ".";
 }
-

From a4985f765943ede9239efcc13c03c96205e9b38e Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 3 Jan 2024 16:53:04 +0900
Subject: [PATCH 41/88] =?UTF-8?q?CSS=20Nesting=20Module=20=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E3=81=A3=E3=81=9F=E5=AE=9F=E8=A3=85=20#783=20(?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88=E3=83=BC=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 不自然な記述となった箇所を補正した。
- 利用のないセレクターを削除した。
- 重複した記述を削除した。
- あまりにも古いブラウザーバージョン互換を削除した。
---
 html/install/css/admin_contents.css | 276 ++++++----------------------
 1 file changed, 53 insertions(+), 223 deletions(-)

diff --git a/html/install/css/admin_contents.css b/html/install/css/admin_contents.css
index 77ccc5c8d7..ef28ae4e15 100644
--- a/html/install/css/admin_contents.css
+++ b/html/install/css/admin_contents.css
@@ -5,44 +5,15 @@
     padding: 0;
 }
 
-/* 上記による Fierfox 2 崩れ対応 */
-
-option {
-    margin-right: 0.5em;
-}
-
-html {
-    height: 100%;
-}
-
 body {
-    width: 100%;
-    height: 100%;
     background: #fff;
     font-family: "ＭＳ Ｐゴシック","Hiragino Maru Gothic Pro","ヒラギノ丸ゴ Pro W4",Osaka,sans-serif;
     font-size: 80%;
     line-height: 120%;
 }
 
-option, input, textarea {
-    margin-right: 3px;
-    font-size: 100%;
-}
-
-select {
+select, input, textarea {
     font-size: 100%;
-
-    &.top {
-        margin-bottom: 5px;
-    }
-}
-
-input.top, textarea.top {
-    margin-bottom: 5px;
-}
-
-.page_rows {
-    margin-bottom: 20px;
 }
 
 img {
@@ -57,7 +28,7 @@ hr {
     display: none;
 }
 
-/*テーブル設定*/
+/* テーブル */
 
 table {
     margin: 0 0 20px;
@@ -74,7 +45,7 @@ th, td {
 
 th {
     width: 240px;
-    background: url('../img/table_back.png') repeat-x #f4f5f5;
+    background: url("../img/table_back.png") repeat-x #f4f5f5;
     font-weight: normal;
     text-align: left;
 }
@@ -93,15 +64,14 @@ th {
     display: inline;
 }
 
-/*通常ボタン*/
+/* 通常ボタン */
 
 .btn-normal {
     margin-right: 5px;
     padding: 2px 10px;
     border: solid 1px #bcbecb;
     display: inline-block;
-    color: #444757;
-    background-image: url('../img/white-grad.png');
+    background-image: url("../img/white-grad.png");
     background-attachment: scroll;
     background-clip: border-box;
     background-color: #eee;
@@ -110,150 +80,51 @@ th {
     text-decoration: none;
     white-space: nowrap;
     cursor: pointer;
-
-    /* CSS3 radius */
     border-radius: 5px;
 
-    /* Safari, Chrome radius */
-    -webkit-box-sizing: content-box;
-    -webkit-border-radius: 5px;
-
-    /* Firefox radius */
-    -moz-border-radius: 5px;
-
-    /* Safari, Chrome radius */
-    -webkit-box-sizing: content-box;
-    -webkit-border-radius: 5px;
-
-    /* Firefox radius */
-    -moz-border-radius: 5px;
-}
-
-a.btn-normal {
     &:link, &:visited {
-        margin-right: 5px;
-        padding: 2px 10px;
-        border: solid 1px #bcbecb;
-        display: inline-block;
         color: #444757;
-        background-image: url('../img/white-grad.png');
-        background-attachment: scroll;
-        background-clip: border-box;
-        background-color: #eee;
-        font-weight: normal;
-        font-size: 90%;
-        text-decoration: none;
-        white-space: nowrap;
-        cursor: pointer;
-
-        /* CSS3 radius */
-        border-radius: 5px;
-
-        /* Safari, Chrome radius */
-        -webkit-box-sizing: content-box;
-        -webkit-border-radius: 5px;
-
-        /* Firefox radius */
-        -moz-border-radius: 5px;
-
-        /* Safari, Chrome radius */
-        -webkit-box-sizing: content-box;
-        -webkit-border-radius: 5px;
-
-        /* Firefox radius */
-        -moz-border-radius: 5px;
     }
 }
 
-/*動作ボタン*/
+/* 動作ボタン */
 
 .btn-action {
     padding: 5px 10px;
     border: solid 1px #bcbecb;
     display: inline-block;
-    color: #444757;
-    background: url('../img/white-grad04.png') top repeat-x #eee;
+    background: url("../img/white-grad04.png") top repeat-x #eee;
     background-attachment: scroll;
     background-clip: border-box;
-    font-weight: normal;
-    font-size: 80%;
+    font-weight: bold;
+    font-size: 91.2%;
     text-decoration: none;
     white-space: nowrap;
     cursor: pointer;
-
-    /* CSS3 radius */
     border-radius: 5px;
 
-    /* Safari, Chrome radius */
-    -webkit-box-sizing: content-box;
-    -webkit-border-radius: 5px;
-
-    /* Firefox radius */
-    -moz-border-radius: 5px;
-
-    /* Safari, Chrome radius */
-    -webkit-box-sizing: content-box;
-    -webkit-border-radius: 5px;
-
-    /* Firefox radius */
-    -moz-border-radius: 5px;
-}
-
-a.btn-action {
     &:link, &:visited {
-        padding: 5px 10px;
-        border: solid 1px #bcbecb;
-        display: inline-block;
         color: #444757;
-        background: url('../img/white-grad04.png') top repeat-x #eee;
-        background-attachment: scroll;
-        background-clip: border-box;
-        font-weight: normal;
-        font-size: 80%;
-        text-decoration: none;
-        white-space: nowrap;
-        cursor: pointer;
-
-        /* CSS3 radius */
-        border-radius: 5px;
-
-        /* Safari, Chrome radius */
-        -webkit-box-sizing: content-box;
-        -webkit-border-radius: 5px;
-
-        /* Firefox radius */
-        -moz-border-radius: 5px;
-
-        /* Safari, Chrome radius */
-        -webkit-box-sizing: content-box;
-        -webkit-border-radius: 5px;
-
-        /* Firefox radius */
-        -moz-border-radius: 5px;
     }
-}
 
-/*戻るボタン*/
+    /* 戻るボタン */
 
-.btn-action {
     .btn-prev {
         padding: 0 0 0 20px;
         display: inline-block;
-        background: url('../img/ico_prev.gif') left no-repeat;
-        font-weight: bold;
-        font-size: 114%;
+        background: url("../img/ico_prev.gif") left no-repeat;
     }
 
+    /* 進むボタン */
+
     .btn-next {
         padding: 0 20px 0 0;
         display: inline-block;
-        background: url('../img/ico_next.gif') right no-repeat;
-        font-weight: bold;
-        font-size: 114%;
+        background: url("../img/ico_next.gif") right no-repeat;
     }
 }
 
-/*進むボタン*/
+/* LINK */
 
 a {
     &.btn-normal:hover, &.btn-action:hover, &.btn-tool:hover {
@@ -267,7 +138,7 @@ a {
     }
 
     &.btn:active, &.btn-normal:active {
-        background-image: url('../img/white-grad-active.png');
+        background-image: url("../img/white-grad-active.png");
     }
 
     &:link, &:visited, &:hover {
@@ -276,8 +147,6 @@ a {
     }
 }
 
-/*LINK*/
-
 .left {
     text-align: left;
 }
@@ -297,21 +166,6 @@ a {
 /* コンテンツ
 ----------------------------------------------- */
 
-* html div#container {
-    position: relative;
-    height: 100%;
-    min-height: 100%;
-}
-
-body > #container {
-    height: auto;
-}
-
-#container {
-    position: relative;
-    min-height: 100%;
-}
-
 #contents {
     padding: 20px 20px 100px;
     width: 1000px;
@@ -320,7 +174,7 @@ body > #container {
 /* インストールメッセージ
 ----------------------------------------------- */
 
-/*以下エラーページと共通■触るべからず*/
+/* 以下エラーページと共通■触るべからず */
 
 #outside {
     margin: 0 auto;
@@ -332,54 +186,29 @@ body > #container {
 #out-wrap {
     margin: 100px auto;
     width: 560px;
-}
 
-#out-area {
-    width: 560px;
-    text-align: left;
-}
-
-#out-wrap .logo {
-    padding-bottom: 5px;
-    float: right;
+    .logo {
+        padding-bottom: 5px;
+        float: right;
+    }
 }
 
 #out-area {
     width: 558px;
+    text-align: left;
 
     .out-top {
         clear: both;
         width: 560px;
         height: 10px;
-        background: url('../img/login_back_top.jpg') bottom left no-repeat;
+        background: url("../img/login_back_top.jpg") bottom left no-repeat;
     }
 
     .contents {
         width: 560px;
-        background: url('../img/login_back_contents.gif') top left repeat-y;
+        background: url("../img/login_back_contents.gif") top left repeat-y;
         text-align: left;
-    }
 
-    .btn-area-top {
-        width: 560px;
-        height: 10px;
-        background: url('../img/login_back_btn_top.jpg') left no-repeat;
-    }
-
-    .btn-area ul {
-        padding: 20px 0 10px 0;
-        width: 560px;
-        text-align: center;
-        background: url('../img/login_back_btn_contents.jpg') top left no-repeat #f4f5f5;
-    }
-
-    .btn-area-bottom {
-        width: 560px;
-        height: 10px;
-        background: url('../img/login_back_btn_bottom.jpg') bottom left no-repeat #eeeff0;
-    }
-
-    .contents {
         .block {
             margin: 0 auto;
             width: 520px;
@@ -411,6 +240,12 @@ body > #container {
             font-size: 86%;
             font-weight: bold;
             line-height: 160%;
+
+            .site-info-list li {
+                margin-bottom: 5px;
+                font-size: 120%;
+                font-weight: normal;
+            }
         }
 
         .result-info02 {
@@ -429,21 +264,34 @@ body > #container {
             }
         }
     }
+
+    .btn-area-top {
+        width: 560px;
+        height: 10px;
+        background: url("../img/login_back_btn_top.jpg") left no-repeat;
+    }
+
+    .btn-area ul {
+        padding: 20px 0 10px 0;
+        width: 560px;
+        text-align: center;
+        background: url("../img/login_back_btn_contents.jpg") top left no-repeat #f4f5f5;
+    }
+
+    .btn-area-bottom {
+        width: 560px;
+        height: 10px;
+        background: url("../img/login_back_btn_bottom.jpg") bottom left no-repeat #eeeff0;
+    }
 }
 
-/*以上エラーページと共通■触るべからず*/
+/* 以上エラーページと共通■触るべからず */
 
 .ex-text {
     color: #7c7c7c;
     font-size: 86%;
 }
 
-#out-area .contents .result-info01 .site-info-list li {
-    margin-bottom: 5px;
-    font-size: 120%;
-    font-weight: normal;
-}
-
 /* EC-CUBEからのお知らせエリア
 ----------------------------------------------- */
 
@@ -452,14 +300,7 @@ body > #container {
     width: 558px;
 }
 
-/* フォーム
------------------------------------------------ */
-
-div.btn, p.remark {
-    margin: 0 0 20px 0;
-}
-
-/*FORM*/
+/* FORM */
 
 .box470 {
     width: 470px;
@@ -471,25 +312,14 @@ div.btn, p.remark {
     height: 30px;
 }
 
-/*COLOR*/
+/* COLOR */
 
 .red {
     color: #f00;
 }
 
-/*FONT*/
+/* FONT */
 
 .bold {
     font-weight: bold;
 }
-
-/* フロート解除 */
-
-.clearfix:after {
-    display: block;
-    clear: both;
-    height: 0px;
-    line-height: 0px;
-    visibility: hidden;
-    content: ".";
-}

From 572a9bf5a3a9690d74113c4477ba860e728dde2f Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 3 Jan 2024 19:18:28 +0900
Subject: [PATCH 42/88] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=BC=E3=83=A9=E3=83=BC=20red=20=E3=82=92=E4=BD=BF=E3=82=8F?=
 =?UTF-8?q?=E3=81=9A=20attention=20=E3=81=AB=E7=B5=B1=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/install/css/admin_contents.css | 6 ------
 html/install/templates/step0.tpl    | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/html/install/css/admin_contents.css b/html/install/css/admin_contents.css
index ef28ae4e15..176f859b6b 100644
--- a/html/install/css/admin_contents.css
+++ b/html/install/css/admin_contents.css
@@ -312,12 +312,6 @@ a {
     height: 30px;
 }
 
-/* COLOR */
-
-.red {
-    color: #f00;
-}
-
 /* FONT */
 
 .bold {
diff --git a/html/install/templates/step0.tpl b/html/install/templates/step0.tpl
index aee2784b3b..35c0c5ac10 100644
--- a/html/install/templates/step0.tpl
+++ b/html/install/templates/step0.tpl
@@ -36,7 +36,7 @@
             <!--{if $hasErr}-->
                 <p class="action-message">[次へ進む] をクリックすると、チェックを再実行します。</p>
                 <div><input type="checkbox" name="mode_overwrite" value="step0" id="mode_overwrite" /> <label for="mode_overwrite">問題点を無視して次へ進む (上級者向け)</label></div>
-                <div class="red">※ 問題点を解決せずに無視して進めると、トラブルの原因となる場合があります。</div>
+                <div class="attention">※ 問題点を解決せずに無視して進めると、トラブルの原因となる場合があります。</div>
             <!--{else}-->
                 必要なファイルのコピーを開始します。
             <!--{/if}-->

From b69c9373d3b909ad53897c008e8d3ff388f08b30 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 3 Jan 2024 19:15:36 +0900
Subject: [PATCH 43/88] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=BC=E3=83=A9=E3=83=BC=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3?=
 =?UTF-8?q?=E6=94=B9=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HTML をシンプルに。
- 画像を使わない。
---
 html/install/css/admin_contents.css      |  84 ++++++++++-------------
 html/install/img/ico_prev.gif            | Bin 359 -> 0 bytes
 html/install/img/ico_prev02.gif          | Bin 128 -> 0 bytes
 html/install/img/white-grad-active.png   | Bin 223 -> 0 bytes
 html/install/img/white-grad.png          | Bin 210 -> 0 bytes
 html/install/img/white-grad04.png        | Bin 1262 -> 0 bytes
 html/install/templates/complete.tpl      |   2 +-
 html/install/templates/install_frame.tpl |   2 +-
 html/install/templates/step0.tpl         |   4 +-
 html/install/templates/step0_1.tpl       |   4 +-
 html/install/templates/step1.tpl         |   4 +-
 html/install/templates/step2.tpl         |   4 +-
 html/install/templates/step3.tpl         |   6 +-
 html/install/templates/step4.tpl         |   8 +--
 html/install/templates/welcome.tpl       |   2 +-
 15 files changed, 56 insertions(+), 64 deletions(-)
 delete mode 100644 html/install/img/ico_prev.gif
 delete mode 100644 html/install/img/ico_prev02.gif
 delete mode 100644 html/install/img/white-grad-active.png
 delete mode 100644 html/install/img/white-grad.png
 delete mode 100644 html/install/img/white-grad04.png

diff --git a/html/install/css/admin_contents.css b/html/install/css/admin_contents.css
index 176f859b6b..36911265a7 100644
--- a/html/install/css/admin_contents.css
+++ b/html/install/css/admin_contents.css
@@ -64,17 +64,14 @@ th {
     display: inline;
 }
 
-/* 通常ボタン */
+/* ボタン */
 
-.btn-normal {
-    margin-right: 5px;
-    padding: 2px 10px;
+.btn {
+    padding: 1ex;
     border: solid 1px #bcbecb;
     display: inline-block;
-    background-image: url("../img/white-grad.png");
-    background-attachment: scroll;
+    background-image: linear-gradient(#fff, #eee);
     background-clip: border-box;
-    background-color: #eee;
     font-weight: normal;
     font-size: 90%;
     text-decoration: none;
@@ -85,62 +82,57 @@ th {
     &:link, &:visited {
         color: #444757;
     }
-}
-
-/* 動作ボタン */
 
-.btn-action {
-    padding: 5px 10px;
-    border: solid 1px #bcbecb;
-    display: inline-block;
-    background: url("../img/white-grad04.png") top repeat-x #eee;
-    background-attachment: scroll;
-    background-clip: border-box;
-    font-weight: bold;
-    font-size: 91.2%;
-    text-decoration: none;
-    white-space: nowrap;
-    cursor: pointer;
-    border-radius: 5px;
-
-    &:link, &:visited {
-        color: #444757;
+    &:hover {
+        border: solid 1px #d5d7df;
+        color: #6d728b;
     }
 
-    /* 戻るボタン */
-
-    .btn-prev {
-        padding: 0 0 0 20px;
-        display: inline-block;
-        background: url("../img/ico_prev.gif") left no-repeat;
+    &:active {
+        background-image: linear-gradient(#eee, #fff);
     }
 
-    /* 進むボタン */
+    /* 前へ戻る、次へ進む */
+
+    &.prev,
+    &.next {
+        position: relative;
+        font-size: 91.2%;
+        font-weight: bold;
+
+        &::before {
+            content: "";
+            box-sizing: border-box;
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+            display: block;
+            background: url("../img/ico_next.gif") right 1ex center no-repeat;
+        }
 
-    .btn-next {
-        padding: 0 20px 0 0;
-        display: inline-block;
-        background: url("../img/ico_next.gif") right no-repeat;
+        &.prev {
+            padding-left: calc(2ex + 15px);
+            &::before {
+                transform: rotate(180deg);
+            }
+        }
+    
+        &.next {
+            padding-right: calc(2ex + 15px);
+        }
     }
 }
 
 /* LINK */
 
 a {
-    &.btn-normal:hover, &.btn-action:hover, &.btn-tool:hover {
-        border: solid 1px #d5d7df;
-        color: #6d728b;
-    }
-
     &.btn-tool-format:hover {
         border: solid 1px #363a47;
         color: #6b728b;
     }
 
-    &.btn:active, &.btn-normal:active {
-        background-image: url("../img/white-grad-active.png");
-    }
-
     &:link, &:visited, &:hover {
         color: #39c;
         text-decoration: none;
diff --git a/html/install/img/ico_prev.gif b/html/install/img/ico_prev.gif
deleted file mode 100644
index f4af260eaee88f2570ddaf66a3271e277d28748e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmZ?wbhEHb<Y(Y#xXQrb<Py4h%dV{K%I22-?>~Ng`1mn2Jnh-@7xNdaymIwMQcAI3
zKte%L-O5#)CQY8}<r5PXo&Ep+|MH5KUAqq^XBP*BB*(?)&6~fXt9xoqZRf^KJBmvh
zgQBtz96Yvs#fI$S>TB2TRaLj|+ka&Gj79Sou3WoyD+5)5;!hSvb_P}k9gwLYKQXYi
z9BBHm;9!oK#97A^IwdMSD?%=1cCp-8vn|TPK;*%O8Hza_#+`>e)@Ziqd^q^<L)&3v
zmX3RY9voj9ss!0uYB;4^I$H#JMEiJ(75gSj3#xF>;O5Gdn8__C$j-*UWa%<C78X{i
oWo!9`1$`K~8MbcY-muDtU7Twx7YB>rE??F|f+vo!Ix<)T0OUV+;{X5v

diff --git a/html/install/img/ico_prev02.gif b/html/install/img/ico_prev02.gif
deleted file mode 100644
index 6eedf5749dc8eb94ad8bb2a0c2971da13a5b6ab8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmZ?wbhEHb<YC}v*v!CSW#f1A*4?`L?$v9z#Kh)&`1tYAkrPj!J<rH2uW#u7|NlP&
zDp35%!pP3R#h?Qc2ARRYq8o5>WshkI*MYz=Y4;jMgS4lfOI6bAnz>o#Puh`H*1fg&
S`|fbv8H)v~#hn$H7_0%eKP-U&

diff --git a/html/install/img/white-grad-active.png b/html/install/img/white-grad-active.png
deleted file mode 100644
index 04780150b1687255e4f6c7a58184ce0f29e1b4b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 223
zcmV<503iQ~P)<h;3K|Lk000e1NJLTq000F50015c0{{R3)1V}e0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyIZ#YgMepzL@bK{R^78HN?fLon|NsB{
z`}_F#`1JJj{r&y+_V(`X?(y;Q{{H^_{QULx_4oJp^Yioi`ug)duay7*06a-VK~#9!
zOvE`7fG_~WFmn^m!2ci1c(Mg5#30(c`0JDp(JMb<RldchT*ab1D!*b@zC=+z#iaHp
ZzyMhf1ZxzZk1qfK002ovPDHLkV1n*fZb1M5

diff --git a/html/install/img/white-grad.png b/html/install/img/white-grad.png
deleted file mode 100644
index aaf57aa9500bb4e3cf74c2fd34b5fa900e90cb50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 210
zcmeAS@N?(olHy`uVBq!ia0vp^tUxTs!3HFs)Lq#Nq*#ibJVQ8upoSx*1IXtr@Q5sC
zVBi)4Va7{$>;3=*6-!(rN`mv#O3D+9QW<;`lZ*0mQ&Tb%72Gn5Qp@v;vWpc=^bB69
zsh0v3i-8n77o{eaWaj57gk<KXG8h`_8=C7ISlr4fEd;7i^>lFzshE@e=l}oz^=u{w
sTJ#QpK$ELt*};X2YFF$i{?RJL(9C0{cF)_y5vYN|)78&qol`;+0C9#ulK=n!

diff --git a/html/install/img/white-grad04.png b/html/install/img/white-grad04.png
deleted file mode 100644
index cd3597394c8453cd1ed1a13972d3b0fd265282ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1262
zcmcIkO=}ZD7~X<Nj26^`hzd?u1P|Sv*-hGHmrY8WZB4|)wpnOx4?5kQq)W0N>`uwH
z6op=_#~!`*2MFR#yoey)gdPQdfeN0yRH(C?G--3tQ-__em*;ujcb*yc<$Ue_X!=H)
z<G9gESzl!H2<tnk^K5(}?H{q}TsTuPQmk#KtX;Oh;FlkV9Cz_*+(!<+J^RCg*Xiss
zt$PjH!2#i>EpLs0IXfU7FKC62-rlY;%(WO(3J9jQ=K{la2q(!9DNsUVhr72}rYkXG
zx%yBwJx9c`h!{COr%gpZHd};(HPW=*0uKP-fo&D|rHLx4`X#b%m$w2^->MnrR?Ac@
zeyW((B9)OHLNSP(wi~KZfloA5wvNM)2ML6>3VgTX<?1{rc>w`gQ4&m)$%5>pDCcA)
zH#rXKn1Tn`1#%9^2(dv{GdcFLVv@!e(`?oPtD!FHbG@8wSK!wv^;HNvosQVah+fcy
zlA<UO$xxOBh7iI{m*Plp!#iD(V;!A@W?=h?U$HJ;^EPOK=i@~E);k>b`-$AJXCAW=
zM%agvh+tot5j7T6lbi4Y!}Hq3p$h}0dPa+xr$B?O13u9)B}ExYNRVU!<qc_4mGbI@
zvT}mo1r5=wo@F;SPtoPPfh1MVtJzGCegf2^YcMwAgfWTh@tKC=;6H|0X5TM=BWNer
zVwsS%i9=i(GS8&bo>`{a@B#<ZqV3=&fxg?+;2`+V`npxKXThE&?7z$7()(9=CX0dZ
zXCmJfJ<BBTw!coW--l4qr;U4iKR>-0<<O;%=)=*`_XTC_^9mg+uP#(q_b>m-@A)_N
dyFU)!f8h?E<X??HPyJ>@t}<KGU(Y<<`3v@?LwW!J

diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl
index c73c42eb09..fad5684f28 100644
--- a/html/install/templates/complete.tpl
+++ b/html/install/templates/complete.tpl
@@ -39,7 +39,7 @@
     <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="<!--{$tpl_sslurl}--><!--{$admin_dir}--><!--{$smarty.const.DIR_INDEX_PATH}-->"><span class="btn-next">管理画面へログインする</span></a></li>
+            <li><a class="btn next" href="<!--{$tpl_sslurl}--><!--{$admin_dir}--><!--{$smarty.const.DIR_INDEX_PATH}-->">管理画面へログインする</a></li>
         </ul>
     </div>
     <div class="btn-area-bottom"></div>
diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl
index 0d959ed88d..cdafe1e795 100644
--- a/html/install/templates/install_frame.tpl
+++ b/html/install/templates/install_frame.tpl
@@ -65,7 +65,7 @@
 <!--{if $tpl_mainpage != 'complete.tpl'}-->
 <script type="text/javascript">//<![CDATA[
 $(function(){
-    $('.btn-next').on('click', function(e) {
+    $('.btn.next').on('click', function(e) {
       e.preventDefault();
       $('form').submit();
       $('#loading').show();
diff --git a/html/install/templates/step0.tpl b/html/install/templates/step0.tpl
index 35c0c5ac10..9c3f58f959 100644
--- a/html/install/templates/step0.tpl
+++ b/html/install/templates/step0.tpl
@@ -45,8 +45,8 @@
     <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="document.form1['mode'].value='return_welcome';document.form1.submit(); return false;"><span class="btn-prev">前へ戻る</span></a></li>
-            <li><a class="btn-action" href="javascript:;"><span class="btn-next">次へ進む</span></a></li>
+            <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_welcome';document.form1.submit(); return false;">前へ戻る</a></li>
+            <li><a class="btn next" href="javascript:;">次へ進む</a></li>
         </ul>
     </div>
     <div class="btn-area-bottom"></div>
diff --git a/html/install/templates/step0_1.tpl b/html/install/templates/step0_1.tpl
index acef506083..2cfa6ed339 100644
--- a/html/install/templates/step0_1.tpl
+++ b/html/install/templates/step0_1.tpl
@@ -47,8 +47,8 @@
         <div class="btn-area-top"></div>
         <div class="btn-area">
             <ul>
-                <li><a href="#" class="btn-action" onclick="document.form1['mode'].value='return_step0';document.form1.submit();return false;"><span class="btn-prev">前へ戻る</span></a></li>
-                <li><a class="btn-action" href="javascript:;"><span class="btn-next">次へ進む</span></a></li>
+                <li><a href="#" class="btn prev" onclick="document.form1['mode'].value='return_step0';document.form1.submit();return false;">前へ戻る</a></li>
+                <li><a class="btn next" href="javascript:;">次へ進む</a></li>
             </ul>
         </div>
         <div class="btn-area-bottom"></div>
diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl
index 01d34f07b6..02bd211ce8 100644
--- a/html/install/templates/step1.tpl
+++ b/html/install/templates/step1.tpl
@@ -226,8 +226,8 @@ $(function() {
     <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="document.form1['mode'].value='return_step0';document.form1.submit();return false;"><span class="btn-prev">前へ戻る</span></a></li>
-            <li><a class="btn-action" href="javascript:;"><span class="btn-next">次へ進む</span></a></li>
+            <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_step0';document.form1.submit();return false;">前へ戻る</a></li>
+            <li><a class="btn next" href="javascript:;">次へ進む</a></li>
         </ul>
     </div>
     <div class="btn-area-bottom"></div>
diff --git a/html/install/templates/step2.tpl b/html/install/templates/step2.tpl
index 9b4f974539..2988be5268 100644
--- a/html/install/templates/step2.tpl
+++ b/html/install/templates/step2.tpl
@@ -104,8 +104,8 @@ function lfnChangePort(db_type) {
         <div class="btn-area-top"></div>
         <div class="btn-area">
             <ul>
-                <li><a class="btn-action" href="javascript:;" onclick="document.form1['mode'].value='return_step1';document.form1.submit();return false;"><span class="btn-prev">前へ戻る</span></a></li>
-                <li><a class="btn-action" href="javascript:;"><span class="btn-next">次へ進む</span></a></li>
+                <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_step1';document.form1.submit();return false;">前へ戻る</a></li>
+                <li><a class="btn next" href="javascript:;">次へ進む</a></li>
             </ul>
         </div>
         <div class="btn-area-bottom"></div>
diff --git a/html/install/templates/step3.tpl b/html/install/templates/step3.tpl
index 336e186227..128dba6c0b 100644
--- a/html/install/templates/step3.tpl
+++ b/html/install/templates/step3.tpl
@@ -67,7 +67,7 @@
                 <span class="attention top"><!--{$arrErr.all}--></span>
                 <!--{if $arrErr.all != ""}-->
                     <ul class="btn-area">
-                        <li><a class="btn-normal" href="javascript:;" onclick="eccube.setModeAndSubmit('drop'); return false;">既存データを全て削除する</a></li>
+                        <li><a class="btn" href="javascript:;" onclick="eccube.setModeAndSubmit('drop'); return false;">既存データを全て削除する</a></li>
                     </ul>
                 <!--{/if}-->
             <!--{/if}-->
@@ -77,8 +77,8 @@
     <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="document.form1['mode'].value='return_step2';document.form1.submit();return false;"><span class="btn-prev">前へ戻る</span></a></li>
-            <li><a class="btn-action" href="javascript:;" onclick="document.body.style.cursor='wait';"><span class="btn-next">次へ進む</span></a></li>
+            <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_step2';document.form1.submit();return false;">前へ戻る</a></li>
+            <li><a class="btn next" href="javascript:;" onclick="document.body.style.cursor='wait';">次へ進む</a></li>
         </ul>
     </div>
     <div class="btn-area-bottom"></div>
diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl
index a9335b3ed9..12b43519a6 100644
--- a/html/install/templates/step4.tpl
+++ b/html/install/templates/step4.tpl
@@ -56,10 +56,10 @@
         <div class="btn-area-top"></div>
         <div class="btn-area">
             <ul>
-                <li><a class="btn-action" href="#" onclick="document.form1['mode'].value='return_step3';document.form1.submit();return false;">
-                    <span class="btn-prev">前へ戻る</span></a></li>
-                <li><a class="btn-action" href="javascript:;">
-                    <span class="btn-next">次へ進む</span></a></li>
+                <li><a class="btn prev" href="#" onclick="document.form1['mode'].value='return_step3';document.form1.submit();return false;">
+                    前へ戻る</a></li>
+                <li><a class="btn next" href="javascript:;">
+                    次へ進む</a></li>
             </ul>
         <div class="btn-area-bottom"></div>
     </div>
diff --git a/html/install/templates/welcome.tpl b/html/install/templates/welcome.tpl
index a97194280f..57d2085551 100644
--- a/html/install/templates/welcome.tpl
+++ b/html/install/templates/welcome.tpl
@@ -32,7 +32,7 @@
     <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="document.form1.submit(); return false;"><span class="btn-next">次へ進む</span></a></li>
+            <li><a class="btn next" href="javascript:;" onclick="document.form1.submit(); return false;">次へ進む</a></li>
         </ul>
     </div>
     <div class="btn-area-bottom"></div>

From d375433694246bceae62253fd5ae57d1a1daec66 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 4 Jan 2024 12:23:52 +0900
Subject: [PATCH 44/88] =?UTF-8?q?=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/install/templates/step1.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl
index 02bd211ce8..52cd7812cc 100644
--- a/html/install/templates/step1.tpl
+++ b/html/install/templates/step1.tpl
@@ -118,7 +118,7 @@ $(function() {
                     <td>
                     <!--{assign var=key value="admin_force_ssl"}-->
                     <span class="attention"><!--{$arrErr[$key]}--></span>
-                    <input type="checkbox" name="<!--{$key}-->" id="<!--{$key}-->" value="1" <!--{if $arrForm[$key].value == 1}-->checked="checked"<!--{/if}--> /><label for="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->;">SSLを強制する。</label><br />
+                    <input type="checkbox" name="<!--{$key}-->" id="<!--{$key}-->" value="1" <!--{if $arrForm[$key].value == 1}-->checked="checked"<!--{/if}--> /><label for="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->;"> SSLを強制する。</label><br />
                     <span class="ex-text">管理機能へのアクセスをSSL経由(https)の接続に制限します。</span><br />
                     </td>
                 </tr>

From 4bf4823fbdb2879511eb24e69ff66fdf2178401c Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 4 Jan 2024 13:31:15 +0900
Subject: [PATCH 45/88] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=BC=E3=83=A9=E3=83=BC=20=E6=9E=A0=E7=B7=9A=E3=83=BB?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E3=82=92=20CSS=20=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/install/css/admin_contents.css          |  50 +++++++------------
 html/install/img/login_back_btn_bottom.jpg   | Bin 764 -> 0 bytes
 html/install/img/login_back_btn_contents.jpg | Bin 3048 -> 0 bytes
 html/install/img/login_back_btn_top.jpg      | Bin 2367 -> 0 bytes
 html/install/img/login_back_contents.gif     | Bin 138 -> 0 bytes
 html/install/img/login_back_top.jpg          | Bin 1761 -> 0 bytes
 html/install/img/table_back.png              | Bin 1263 -> 0 bytes
 html/install/templates/agreement.tpl         |   2 +
 html/install/templates/complete.tpl          |   4 +-
 html/install/templates/install_frame.tpl     |  31 ++++++------
 html/install/templates/step0.tpl             |   5 +-
 html/install/templates/step0_1.tpl           |   4 +-
 html/install/templates/step1.tpl             |   4 +-
 html/install/templates/step2.tpl             |   4 +-
 html/install/templates/step3.tpl             |   4 +-
 html/install/templates/step4.tpl             |   5 +-
 html/install/templates/welcome.tpl           |   5 +-
 17 files changed, 55 insertions(+), 63 deletions(-)
 delete mode 100644 html/install/img/login_back_btn_bottom.jpg
 delete mode 100644 html/install/img/login_back_btn_contents.jpg
 delete mode 100644 html/install/img/login_back_btn_top.jpg
 delete mode 100644 html/install/img/login_back_contents.gif
 delete mode 100644 html/install/img/login_back_top.jpg
 delete mode 100644 html/install/img/table_back.png

diff --git a/html/install/css/admin_contents.css b/html/install/css/admin_contents.css
index 36911265a7..8fca29559a 100644
--- a/html/install/css/admin_contents.css
+++ b/html/install/css/admin_contents.css
@@ -45,7 +45,7 @@ th, td {
 
 th {
     width: 240px;
-    background: url("../img/table_back.png") repeat-x #f4f5f5;
+    background: #f5f5f5;
     font-weight: normal;
     text-align: left;
 }
@@ -59,11 +59,6 @@ th {
     text-align: center;
 }
 
-.contents-main .btn-area li, #popup .btn-area li, .btn-area li {
-    margin-right: 10px;
-    display: inline;
-}
-
 /* ボタン */
 
 .btn {
@@ -186,20 +181,15 @@ a {
 }
 
 #out-area {
-    width: 558px;
+    width: 560px;
+    text-align: left;
+    border: #ccc 1px solid;
+    border-radius: 5px;
+    clear: both;
+    padding: 10px 0 0;
     text-align: left;
-
-    .out-top {
-        clear: both;
-        width: 560px;
-        height: 10px;
-        background: url("../img/login_back_top.jpg") bottom left no-repeat;
-    }
 
     .contents {
-        width: 560px;
-        background: url("../img/login_back_contents.gif") top left repeat-y;
-        text-align: left;
 
         .block {
             margin: 0 auto;
@@ -242,7 +232,6 @@ a {
 
         .result-info02 {
             margin: 0 auto;
-            padding-bottom: 30px;
             width: 520px;
 
             p {
@@ -257,23 +246,22 @@ a {
         }
     }
 
-    .btn-area-top {
-        width: 560px;
-        height: 10px;
-        background: url("../img/login_back_btn_top.jpg") left no-repeat;
-    }
+    /* ボタンエリア */
 
     .btn-area ul {
-        padding: 20px 0 10px 0;
-        width: 560px;
+        margin: 1.5em 0 0;
+        border-top: #ccc 1px solid;
+        padding: 25px 0;
         text-align: center;
-        background: url("../img/login_back_btn_contents.jpg") top left no-repeat #f4f5f5;
-    }
+        background: #f5f5f5;
 
-    .btn-area-bottom {
-        width: 560px;
-        height: 10px;
-        background: url("../img/login_back_btn_bottom.jpg") bottom left no-repeat #eeeff0;
+        li {
+            display: inline;
+
+            + li {
+                margin-left: 10px;
+            }
+        }
     }
 }
 
diff --git a/html/install/img/login_back_btn_bottom.jpg b/html/install/img/login_back_btn_bottom.jpg
deleted file mode 100644
index a79b4c9b373a5689bffd54a4a0e96d585942978c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 764
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!5PG(2!ITs$N-S${|6WZIT$3F444@O8JGka
znFSgDA7PLLJC&IM39zy=vvC2Xlmr+V7+Dxum>J=c%#2JdtZag2rCZpAgbxALNI;wg
zR{&%%u`n_NWi$jC8JHND+1L<fGcqw77qKWR89Hth6f$Z&crmbW;{RI=JU|PW1epaH
z>>0jGAKP8r|HC(YG1Et5{dISr&do(Onn-r%$?D<>6~5~iTYdPfxo+<Ri|cuX{~0(}
zeMv9`8TusJfk=aplqnU(-FYG>oc-e59-C9y>nmhxioBDrCT6RwRX%?u>G5kbiRs}>
ze*BCujO<m_@7t@tbW)i8HBRmPYZ>}|(b~~@OJk4pX>RxSpQZkN|L>orwa*?P8BQeg
z^`A-6`B&4jmDX;`F_*af>g$iPyI$ufPM$0J<65oq^61wo@k`U@{fhqDCGlj^uS>VH
z!<Wevy6y@~x@@a_xZ-SG*}FOM^68(hZu*tG`eFI=x8IILO(4>0BxPpro2r*<AHV<C
S=xyArS3hDcf7jaozX<@O&ZHFp

diff --git a/html/install/img/login_back_btn_contents.jpg b/html/install/img/login_back_btn_contents.jpg
deleted file mode 100644
index db7ec4dd999dd6ff7cbdc67f42e35f16b0261753..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3048
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!5PG(2!ITs$N-S${|6WZIT$jT444@O8JGka
znFSgDA7PLLI*x&vkpT&?GPAI80j1Og7#WzD7+IK@n3$o`jDmp^*_c_)N?EpuZB=wM
zO-Ti+69+pD$p8ihCPrqUgsLDT10xeN2TV6m38PRTli)_Bpv0uci3>k48yEe*#lQo!
zo=K2dkinked-9QI^`ejM&;0n$koNCC!}FTdKl9V<@9CzVT5-3(%8Gl=xeKAv8{a!U
zH{P(yJo#Shx%9-4yyJU;;)g&A#4YEx2JV*oqE~FqwYbdoMa;7@QMWhM7j~X`qt$!k
z`@-UxH%7G&!=SVL7is)sz1qL@<G;^;|Ic9kWc}mc26Z1^vw{*s_D6s5$92t{|LuM}
zU;SqP_wGpTdE76w=P`uaFs!R!jQPN{^8st|0j}o_qURZglCZ<mI{lNj>=l2@PsAVp
zmhkuCHLmB)>|!7LEMHW+zy4?WsdmPHhKjAzLe1kG!?a(pMyy{TnzXMWwCfk+2;(Yz
znlJIBu6_5v{ZI6vDI>UyPyew^`NgvS>wk)${5JgeF<a+czU}pZbn|%+Mln1LUc@Xu
zRw=&d-G7GlKe>PWJ0rix>foGv)mwj@IsUk&`e*-#+U39hGdRPtR^D~<si%96UC1r2
z)H9amU6-$VEID!O*(W>B<e2T;GhMQ`?YjA-$A%kjJ^K`sW+okT&%5W?;q2Kb3uoLI
z)iPiqw(wJC|FNI^pXDF?-v0exJFGYXMxTyN_Hm2<3`^d|yDzALRK?mED0Mwi92P(C
u$8(x5mB%l>4lSyfdn=yHf0?`b#TWj`Z;t;yx~6;7*wH{3{3(I`|4jgt9@7B;

diff --git a/html/install/img/login_back_btn_top.jpg b/html/install/img/login_back_btn_top.jpg
deleted file mode 100644
index 64b66d5d409428c61886e12934aed183c340db25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2367
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!5PG(2!ITs$N-S${|6WZIT%Ek444@O8JGka
znFSgDA7Ky&JB|Svu(5IhCA0(>7?{~vf&O4*g~~Fru?h-{1coLtPn@>!8WW3|n4*$n
zDp0K$$b4iY7#Ns9hAROrVq#)uU}A>LG73&q3@p6(kjaqQxM<`5TMRrvIVM47K?Zw<
z_mZ;To^(b3>HhIpXxjNx`k(5~&;S1EKSQME!`i=@QwojrTBL0*zi>IRi*b}1W<f9~
z;_qIimH!!({#o2!y7?>jpZd)Y|Ng1Jl3Y<=AC+<``irJrFz2BQY3g51JeyAF%I{4T
z4t9=y?=kZ~!<;SuzLu0+ieK*U9sK&?@$XAN{xbb%@~`J#UFlYj?)NW$+NYoY{j+|J
zX6x6l>wRBN^<8Ota@Ics$DOy<yPR5fW!96k^%Bh1p)Y2J+?pISbNyq6^sK$YTC;<)
zC!79B;CUOqC^b0Cw<v9Y598cbUwl^Odam=i{;|P$Yg{MHD7LcI7mZeKRoiJCe~jVW
z)he}6vnAKnvVR<q9JOLJpoVLTTE?{;m@6l98C_3P|MJDR>AG(IUQyxT_~^$TH~%v%
z*lPD>OQ}%&Z2$1!=MSHMT>AZ&iJhrk$G*C)TRP6afA*h2{>_j2dik#s&*ZOP+iN0}
zR)1;b{CD-oZ`^<XulyPR$=`PM_fP*#RORM=?aF*^`Htqq%z(-(-x;~Rnt?oys1UhQ
z+XGIQ7JOd$j!A4P`&|D5fh{X+UR5`=E_Hk!e1}C>i{EPA1I1BIgCigo)kdWM)mrxN
g`JdX&|Nb*PubWuk|E<P;fB&zZOy@(tF8;p>0DV9;p8x;=

diff --git a/html/install/img/login_back_contents.gif b/html/install/img/login_back_contents.gif
deleted file mode 100644
index b8631ef998412290b4bf126fa11c46ab9897137e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
zcmV;50CoRINk%w1VK4#;0Du4h%*@RH|NkNR1ONvB{{Soi0000m0tx^C0%1gssmtvT
zqnxzbi?iOm`wxcVNR}gDnCi;5?hD8AOxJdT-ulk>{tpZaXSt#Ah)gP%%x0tLj7q1}
ss`U!JYPa03_shwG$K<m4d=#VC?6&*8QN!o-x}7Y)>-YS=5KsUBJO408lK=n!

diff --git a/html/install/img/login_back_top.jpg b/html/install/img/login_back_top.jpg
deleted file mode 100644
index f3e20eb7d72d919ae95572f62edf0f00ab8ae8a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1761
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!5PG(2!ITs$N-S${|6WZIT*N@444@O8JGka
znFSgDA7Ky&JB|Svu(ELhC6omim>5}@8JL(EVUldDVqsISFfp?*3Y(Q}6$0r7y9y=`
zrWu)-ff8y!D;U^-x)Iue5`w~kK@%rkR5Ua$6e`;2`2Q9I572ZbL1sY)dxm$fn3$BR
zl+3EC%#WI?8bAE(Rrc*v<*wR4HG5L5c2xb^6Q{R6obTLv{n;n4-oF0);qmj=uYda+
zUtWIm{`vWKu}WPUN?j7st!mc~FU|ZI?!W!F(bS;zC)0ZTw~B2DtXi_uxZ=0Hw`=Qx
z#lml0*NDWe01LQ^i8Db}EP8VG@teOQ5iwkbc2}Yfy1we3Y~H{5OJHJw#*yEF*{tHL
z^nC8woxeD0#AsNIri;-$g1fwMNr>-g>X<mcq4%THNvDdvLUUs$*43@}C$~<HZ(ZHG
z_u{)(pFF&J`ORlvOTK<9srmS&6j+Yg&X>Jw|9E#hU%gbD#-dJV5kFPofA)G?*8dG%
zEA{)wU%@5&!f)v=tCL&#>x%fNKg-hUJpME6iGQv2D}G6)j|fT`Oc_UVx&7f={~4m@
X{)=C6Xa7m|@9lqG>ixf*|9=wz{dU43

diff --git a/html/install/img/table_back.png b/html/install/img/table_back.png
deleted file mode 100644
index 0b6b818b7f69140a5b305ab748abce3d89ee6e52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1263
zcmcIky>HV%6nE9Cl%NhUAcT-O%z^~*oiA-tTTZGrX=xA%QDcdgsaN}wT8Vv@eO25F
z@zo_ru(9zMuykQz<f9V;RbqyfjRlDTQK_7hG-*4))RXV)>Gyl@-S3|7X{CH~JaI80
zNz!<6p|B|CVbLpNqhkDucfX5iB%CdpW1`(3v)f{S+Fw`>CF#t$xDS2#_Fzw7&hoh>
zzErxcTg+96%~q)rxxQpfM?SF{l!H}Tcf70&0FZ%WXXU$-B~<eBbj?}V3}|(;Y+9QQ
zOS9$aT*8QSL3Sx8Aaa{ts7G13<5L&w*bHURf$&CFo{58jrBVgtSwO*rq9!erngA1N
z1!u69N#6if!oe-#0h|FCAu(V*l@XsvrqkqHLd-^B*Yw50d@rWhW#u)_eI3G9tEIG3
z3JdB`)iezv3^7g$L^9m)IEj*8c(v=~z)yjOR^a&DVIGM6l2x|Ov$7lq>bKtEh~E$7
zg+1|vj4&cTR22mKo(0hmMm--;!dYN4*35N}Kko#z#ezl%^3{|PGmn4<Q3rflAe`nf
zQc+UHNi=1uX<ePtC$)Qr_+8L3dWqRiZQ}?XYbMfSQBk@_KLqO04Hye?NSKc5@tKa<
z|0kGj_4V@CgJ$PiYzxvRb*aZgp_zJAGuzT@EN}_WIWDPF=zDbo4vhcIubZ_f3sIJ^
zUzZ1|_pkCq76aW+#C_N4Nd|c{+g=kd#)bHCsInSwk$_6aD)!Fn%VmK%A7eU&9se?>
z<5Ee*5NS|FSN^mw34~HC%$QTpt-byI{fDF1R(}8db^Y1rw>ytU=C!StAKte=krjJq
gyZIvZ@!jr_G(34~>(%a$$AT#p=gNic*_9`M0fP-k!T<mO

diff --git a/html/install/templates/agreement.tpl b/html/install/templates/agreement.tpl
index caec58f9e9..b04a013ae7 100644
--- a/html/install/templates/agreement.tpl
+++ b/html/install/templates/agreement.tpl
@@ -34,6 +34,7 @@ function fnChangeVisible(check_id, mod_id){
 //-->
 </script>
 
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <table width="502" border="0" cellspacing="1" cellpadding="0" summary=" ">
         <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
@@ -103,3 +104,4 @@ function fnChangeVisible(check_id, mod_id){
         <tr><td height="30"></td></tr>
     </table>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl
index fad5684f28..5c05bf9578 100644
--- a/html/install/templates/complete.tpl
+++ b/html/install/templates/complete.tpl
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
 
@@ -36,11 +37,10 @@
         </div>
     </div>
 
-    <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
             <li><a class="btn next" href="<!--{$tpl_sslurl}--><!--{$admin_dir}--><!--{$smarty.const.DIR_INDEX_PATH}-->">管理画面へログインする</a></li>
         </ul>
     </div>
-    <div class="btn-area-bottom"></div>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl
index cdafe1e795..969bfc17ea 100644
--- a/html/install/templates/install_frame.tpl
+++ b/html/install/templates/install_frame.tpl
@@ -78,26 +78,25 @@ $(function(){
 <body>
 <!--{$GLOBAL_ERR}-->
 <noscript>
-  <p>JavaScript を有効にしてご利用下さい。</p>
+    <p>JavaScript を有効にしてご利用下さい。</p>
 </noscript>
 <div id="loading"><img src="../js/jquery.colorbox/loading.gif" width="48" height="48" alt="Loading..." /></div>
 <div id="outside">
-  <div id="out-wrap">
-    <div class="logo">
-      <img src="img/logo_resize.jpg" width="99" height="15" alt="EC-CUBE" />
+    <div id="out-wrap">
+        <div class="logo">
+            <img src="img/logo_resize.jpg" width="99" height="15" alt="EC-CUBE" />
+        </div>
+        <div id="out-area">
+            <!--{include file=$tpl_mainpage}-->
+        </div>
+        <!--{if strlen($install_info_url) != 0}-->
+        <div id="info-area">
+            <iframe src="<!--{$install_info_url}-->" width="562" height="550" frameborder="no" scrolling="no">
+                こちらはEC-CUBEからのお知らせです。この部分は iframe対応ブラウザでご覧下さい。
+            </iframe>
+        </div>
+        <!--{/if}-->
     </div>
-    <div id="out-area">
-      <div class="out-top"></div>
-      <!--{include file=$tpl_mainpage}-->
-    </div>
-    <!--{if strlen($install_info_url) != 0}-->
-    <div id="info-area">
-      <iframe src="<!--{$install_info_url}-->" width="562" height="550" frameborder="no" scrolling="no">
-        こちらはEC-CUBEからのお知らせです。この部分は iframe対応ブラウザでご覧下さい。
-      </iframe>
-    </div>
-    <!--{/if}-->
-  </div>
 </div>
 </body>
 </html>
diff --git a/html/install/templates/step0.tpl b/html/install/templates/step0.tpl
index 9c3f58f959..496d03dda4 100644
--- a/html/install/templates/step0.tpl
+++ b/html/install/templates/step0.tpl
@@ -19,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
     <input type="hidden" name="step" value="0" />
@@ -42,12 +44,11 @@
             <!--{/if}-->
         </div>
     </div>
-    <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
             <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_welcome';document.form1.submit(); return false;">前へ戻る</a></li>
             <li><a class="btn next" href="javascript:;">次へ進む</a></li>
         </ul>
     </div>
-    <div class="btn-area-bottom"></div>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/step0_1.tpl b/html/install/templates/step0_1.tpl
index 2cfa6ed339..6465916cd9 100644
--- a/html/install/templates/step0_1.tpl
+++ b/html/install/templates/step0_1.tpl
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
 
+<!--{strip}-->
 <div class="contents">
     <div class="message">
         <h2>必要なファイルのコピー</h2>
@@ -44,13 +45,12 @@
             <!--{/if}-->
         </div>
 
-        <div class="btn-area-top"></div>
         <div class="btn-area">
             <ul>
                 <li><a href="#" class="btn prev" onclick="document.form1['mode'].value='return_step0';document.form1.submit();return false;">前へ戻る</a></li>
                 <li><a class="btn next" href="javascript:;">次へ進む</a></li>
             </ul>
         </div>
-        <div class="btn-area-bottom"></div>
     </form>
 </div>
+<!--{/strip}-->
diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl
index 52cd7812cc..01da4d74b1 100644
--- a/html/install/templates/step1.tpl
+++ b/html/install/templates/step1.tpl
@@ -39,6 +39,7 @@ $(function() {
     });
 });
 </script>
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
     <input type="hidden" name="step" value="0" />
@@ -223,12 +224,11 @@ $(function() {
             </div>
         </div>
     </div>
-    <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
             <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_step0';document.form1.submit();return false;">前へ戻る</a></li>
             <li><a class="btn next" href="javascript:;">次へ進む</a></li>
         </ul>
     </div>
-    <div class="btn-area-bottom"></div>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/step2.tpl b/html/install/templates/step2.tpl
index 2988be5268..f70874098e 100644
--- a/html/install/templates/step2.tpl
+++ b/html/install/templates/step2.tpl
@@ -32,6 +32,7 @@ function lfnChangePort(db_type) {
     }
 }
 </script>
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
     <input type="hidden" name="step" value="0" />
@@ -101,13 +102,12 @@ function lfnChangePort(db_type) {
             </table>
         </div>
 
-        <div class="btn-area-top"></div>
         <div class="btn-area">
             <ul>
                 <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_step1';document.form1.submit();return false;">前へ戻る</a></li>
                 <li><a class="btn next" href="javascript:;">次へ進む</a></li>
             </ul>
         </div>
-        <div class="btn-area-bottom"></div>
     </div>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/step3.tpl b/html/install/templates/step3.tpl
index 128dba6c0b..03cc08be60 100644
--- a/html/install/templates/step3.tpl
+++ b/html/install/templates/step3.tpl
@@ -38,6 +38,7 @@
 //-->
 </script>
 
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
     <input type="hidden" name="step" value="0" />
@@ -74,12 +75,11 @@
         </div>
     </div>
 
-    <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
             <li><a class="btn prev" href="javascript:;" onclick="document.form1['mode'].value='return_step2';document.form1.submit();return false;">前へ戻る</a></li>
             <li><a class="btn next" href="javascript:;" onclick="document.body.style.cursor='wait';">次へ進む</a></li>
         </ul>
     </div>
-    <div class="btn-area-bottom"></div>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl
index 12b43519a6..53e2c6c624 100644
--- a/html/install/templates/step4.tpl
+++ b/html/install/templates/step4.tpl
@@ -19,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+
+<!--{strip}-->
 <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
     <input type="hidden" name="step" value="0" />
@@ -53,7 +55,6 @@
             <input type="radio" id="ok" name="send_info" checked value="true" /><label for="ok">はい(推奨)</label>&nbsp;
             <input type="radio" id="ng" name="send_info" value="false" /><label for="ng">いいえ</label>
         </div>
-        <div class="btn-area-top"></div>
         <div class="btn-area">
             <ul>
                 <li><a class="btn prev" href="#" onclick="document.form1['mode'].value='return_step3';document.form1.submit();return false;">
@@ -61,6 +62,6 @@
                 <li><a class="btn next" href="javascript:;">
                     次へ進む</a></li>
             </ul>
-        <div class="btn-area-bottom"></div>
     </div>
 </form>
+<!--{/strip}-->
diff --git a/html/install/templates/welcome.tpl b/html/install/templates/welcome.tpl
index 57d2085551..298eaaffa8 100644
--- a/html/install/templates/welcome.tpl
+++ b/html/install/templates/welcome.tpl
@@ -19,6 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+
+ <!--{strip}-->
 <form name="form1" id="form1" method="post" action="./<!--{$smarty.const.DIR_INDEX_PATH}-->">
     <input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
     <!--{foreach key=key item=item from=$arrHidden}-->
@@ -29,11 +31,10 @@
             EC-CUBEのインストールを開始します。
         </div>
     </div>
-    <div class="btn-area-top"></div>
     <div class="btn-area">
         <ul>
             <li><a class="btn next" href="javascript:;" onclick="document.form1.submit(); return false;">次へ進む</a></li>
         </ul>
     </div>
-    <div class="btn-area-bottom"></div>
 </form>
+<!--{/strip}-->

From 01d9fe174c0a4c084aa9f918f7afdb95e350f5a0 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 4 Jan 2024 19:22:56 +0900
Subject: [PATCH 46/88] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E5=83=8F=E3=81=8C?=
 =?UTF-8?q?=E6=AC=A0=E8=90=BD=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=20#810?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- JavaScript の追加位置が不適切(IF分岐内)だったのを修正。
---
 html/install/templates/install_frame.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl
index e76011c133..0e79287b1f 100644
--- a/html/install/templates/install_frame.tpl
+++ b/html/install/templates/install_frame.tpl
@@ -34,14 +34,15 @@
 <!--<![endif]-->
 <script type="text/javascript" src="../js/eccube.js"></script>
 
-<!--{if $tpl_mainpage != 'complete.tpl'}-->
 <script type="text/javascript">//<![CDATA[
+<!--{if $tpl_mainpage != 'complete.tpl'}-->
 $(function(){
     $('.btn.next').on('click', function(e) {
         e.preventDefault();
         $('form').submit();
     });
 });
+<!--{/if}-->
 $(window).on('load', function() {
     $('#loading').hide();
 });
@@ -50,7 +51,6 @@ $(window).on('beforeunload',function(){
     $('#loading').show();
 });
 //]]></script>
-<!--{/if}-->
 <title>EC-CUBEインストール</title>
 </head>
 <!--{strip}-->

From 3ed97bb129d68f0991127e756d5b8b48baafe744 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Thu, 4 Jan 2024 19:29:34 +0900
Subject: [PATCH 47/88] Fix a typo. "EC CUBE" -> "EC-CUBE"

---
 html/install/templates/complete.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl
index 5c05bf9578..38eadded46 100644
--- a/html/install/templates/complete.tpl
+++ b/html/install/templates/complete.tpl
@@ -29,7 +29,7 @@
     <!--{/foreach}-->
     <div class="contents">
         <div class="message">
-            <h2>EC CUBE インストールが完了しました。</h2>
+            <h2>EC-CUBE インストールが完了しました。</h2>
         </div>
         <div class="result-info02">
             <p><a href="<!--{$tpl_sslurl}--><!--{$admin_dir}--><!--{$smarty.const.DIR_INDEX_PATH}-->">管理画面</a>にログインできます。<br />

From 81c610c65d7aa40aa7677bcd8c83fb2a576d34a4 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Fri, 5 Jan 2024 18:28:21 +0900
Subject: [PATCH 48/88] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/EC-CUBE/ec-cube2/pull/814#issuecomment-1877437767 を踏まえ、予め @deprecated とした。
---
 data/class/SC_Initial.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/data/class/SC_Initial.php b/data/class/SC_Initial.php
index 0661a1d95d..daae3e4ae7 100644
--- a/data/class/SC_Initial.php
+++ b/data/class/SC_Initial.php
@@ -560,6 +560,12 @@ public function normalizeHostname()
         }
     }
 
+    /**
+     * PHPバージョン互換処理
+     *
+     * @deprecated https://github.com/EC-CUBE/ec-cube2/issues/681 が実現したら、外部ライブラリへ移行して、削除する予定。
+     * @return void
+     */
     function compatPhp()
     {
         if (!function_exists('str_starts_with')) {

From 1973616c6cf6eaaca01bd8ca298aad26e0b0b691 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sat, 6 Jan 2024 19:37:40 +0900
Subject: [PATCH 49/88] =?UTF-8?q?Smarty=20html=5Fcheckboxes=5Fex=20html=5F?=
 =?UTF-8?q?radios=5Fex=20=E3=82=92=E5=BB=83=E6=AD=A2=20#815?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/products/review_edit.tpl  |   2 +-
 .../function.html_checkboxes_ex.php           | 176 ------------------
 .../function.html_radios_ex.php               | 169 +----------------
 phpstan.neon.dist                             |  11 +-
 4 files changed, 6 insertions(+), 352 deletions(-)
 delete mode 100644 data/smarty_extends/function.html_checkboxes_ex.php

diff --git a/data/Smarty/templates/admin/products/review_edit.tpl b/data/Smarty/templates/admin/products/review_edit.tpl
index 5515b414cf..5ff8205835 100644
--- a/data/Smarty/templates/admin/products/review_edit.tpl
+++ b/data/Smarty/templates/admin/products/review_edit.tpl
@@ -69,7 +69,7 @@
             </tr>
             <tr>
                 <th>性別</th>
-                <td><!--{html_radios_ex name="sex" options=$arrSex selected=$arrForm.sex}--></td>
+                <td><!--{html_radios name="sex" options=$arrSex selected=$arrForm.sex}--></td>
             </tr>
             <tr>
                 <th>おすすめレベル <span class="attention">*</span></th>
diff --git a/data/smarty_extends/function.html_checkboxes_ex.php b/data/smarty_extends/function.html_checkboxes_ex.php
deleted file mode 100644
index 277416082a..0000000000
--- a/data/smarty_extends/function.html_checkboxes_ex.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Smarty plugin
- * @package Smarty
- * @subpackage plugins
- */
-
-
-/**
- * Smarty {html_checkboxes} function plugin
- *
- * File:       function.html_checkboxes.php<br>
- * Type:       function<br>
- * Name:       html_checkboxes<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of checkbox input types<br>
- * Input:<br>
- *           - name       (optional) - string default "checkbox"
- *           - values     (required) - array
- *           - options    (optional) - associative array
- *           - checked    (optional) - array default not set
- *           - separator  (optional) - ie <br> or &nbsp;
- *           - output     (optional) - the output next to each checkbox
- *           - assign     (optional) - assign the output as an array to this variable
- * Examples:
- * <pre>
- * {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
- *      (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
- */
-function smarty_function_html_checkboxes_ex($params, &$smarty)
-{
-    if (!is_callable('smarty_function_escape_special_chars')) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-    }
-
-    $name = 'checkbox';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $labels = true;
-    $label_ids = true;
-    $output = null;
-
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'tags':
-                $$_key = explode("|", $_val);
-                break;
-            case 'name':
-            case 'separator':
-                $$_key = $_val;
-                break;
-
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool)$_val;
-                break;
-
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-
-            case 'checked':
-            case 'selected':
-                $selected = array_map('strval', array_values((array)$_val));
-                break;
-
-            case 'checkboxes':
-                $smarty->trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array)$_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_checkboxes: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    settype($selected, 'array');
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_checkboxes_output_ex($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $tags);
-    } else {
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_checkboxes_output_ex($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $tags);
-        }
-
-    }
-
-    if (!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n",$_html_result);
-    }
-
-    return '';
-}
-
-/**
- * @param string $name
- * @param string $extra
- * @param string $separator
- * @param boolean $labels
- * @param boolean $label_ids
- */
-function smarty_function_html_checkboxes_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags)
-{
-    $_output = '';
-
-    $_output .= '<input type="checkbox" name="'
-        . smarty_function_escape_special_chars($name) . '[]" value="'
-        . smarty_function_escape_special_chars($value) . '"';
-
-    if ($labels && $label_ids) {
-    $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-    $_output .= ' id="' . $_id . '"';
-    }
-
-    if (in_array((string)$value, $selected)) {
-        $_output .= ' checked="checked"';
-    }
-    $_output .= $extra . ' />';
-
-    $_output .= $tags[0];
-
-    if ($labels) {
-    if ($label_ids) {
-    $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-    $_output .= '<label for="' . $_id . '">';
-    } else {
-    $_output .= '<label>';
-    }
-    }
-
-    // 値を挿入
-    $_output .= $output;
-
-    $_output .= $tags[1];
-
-    if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
-
-    return $_output;
-}
diff --git a/data/smarty_extends/function.html_radios_ex.php b/data/smarty_extends/function.html_radios_ex.php
index 65a5467cfe..69487e3955 100644
--- a/data/smarty_extends/function.html_radios_ex.php
+++ b/data/smarty_extends/function.html_radios_ex.php
@@ -5,174 +5,13 @@
  * @subpackage plugins
  */
 
+require_once DATA_REALDIR . 'vendor/smarty/smarty/libs/plugins/function.html_radios.php';
 
 /**
- * Smarty {html_radios} function plugin
- *
- * File:       function.html_radios.php<br>
- * Type:       function<br>
- * Name:       html_radios<br>
- * Date:       24.Feb.2003<br>
- * Purpose:    Prints out a list of radio input types<br>
- * Input:<br>
- *           - name       (optional) - string default "radio"
- *           - values     (required) - array
- *           - options    (optional) - associative array
- *           - checked    (optional) - array default not set
- *           - separator  (optional) - ie <br> or &nbsp;
- *           - output     (optional) - the output next to each radio button
- *           - assign     (optional) - assign the output as an array to this variable
- * Examples:
- * <pre>
- * {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
- * </pre>
- * @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
- *      (Smarty online manual)
- * @author     Christopher Kvarme <christopher.kvarme@flashjab.com>
- * @author credits to Monte Ohrt <monte at ohrt dot com>
- * @version    1.0
- * @param array
- * @param Smarty
- * @return string
- * @uses smarty_function_escape_special_chars()
+ * @deprecated 2.18 2.17で残置していた {html_radios_ex} の互換用途。
+ * @see https://github.com/EC-CUBE/ec-cube2/issues/815
  */
 function smarty_function_html_radios_ex($params, &$smarty)
 {
-    if (!is_callable('smarty_function_escape_special_chars')) {
-        require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php');
-    }
-
-    $name = 'radio';
-    $values = null;
-    $options = null;
-    $selected = null;
-    $separator = '';
-    $labels = true;
-    $label_ids = true;
-    $output = null;
-    $extra = '';
-
-    foreach ($params as $_key => $_val) {
-        switch ($_key) {
-            case 'tags':
-                $$_key = explode("|", $_val);
-                break;
-            case 'name':
-            case 'separator':
-                $$_key = (string)$_val;
-                break;
-
-            case 'checked':
-            case 'selected':
-                if (is_array($_val)) {
-                    $smarty->trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
-                } else {
-                    $selected = (string)$_val;
-                }
-                break;
-
-            case 'labels':
-            case 'label_ids':
-                $$_key = (bool)$_val;
-                break;
-
-            case 'options':
-                $$_key = (array)$_val;
-                break;
-            case 'values':
-            case 'output':
-                $$_key = array_values((array)$_val);
-                break;
-
-            case 'radios':
-                $smarty->trigger_error('html_radios: the use of the "radios" attribute is deprecated, use "options" instead', E_USER_WARNING);
-                $options = (array)$_val;
-                break;
-
-            case 'assign':
-                break;
-
-            default:
-                if (!is_array($_val)) {
-                    $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
-                } else {
-                    $smarty->trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
-                }
-                break;
-        }
-    }
-
-    if (!isset($options) && !isset($values))
-        return ''; /* raise error here? */
-
-    $_html_result = array();
-
-    if (isset($options)) {
-        foreach ($options as $_key=>$_val)
-            $_html_result[] = smarty_function_html_radios_output_ex($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $tags);
-    } else {
-        foreach ($values as $_i=>$_key) {
-            $_val = isset($output[$_i]) ? $output[$_i] : '';
-            $_html_result[] = smarty_function_html_radios_output_ex($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids, $tags);
-        }
-
-    }
-
-    if (!empty($params['assign'])) {
-        $smarty->assign($params['assign'], $_html_result);
-    } else {
-        return implode("\n",$_html_result);
-    }
-
-    return '';
-}
-
-/**
- * @param string $name
- * @param null|string $selected
- * @param string $extra
- * @param string $separator
- * @param boolean $labels
- * @param boolean $label_ids
- */
-function smarty_function_html_radios_output_ex($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids, $tags)
-{
-    $_output = '';
-
-    $_output .= '<input type="radio" name="'
-        . smarty_function_escape_special_chars($name) . '" value="'
-        . smarty_function_escape_special_chars($value) . '"';
-
-    if ($labels && $label_ids) {
-        $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-        $_output .= ' id="' . $_id . '"';
-    }
-    if ((string)$value == $selected) {
-        $_output .= ' checked="checked"';
-    }
-
-    $_output .= $extra . ' />';
-
-    $_output .= $tags[0];
-
-    if ($labels) {
-        if ($label_ids) {
-        $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
-            $_output .= '<label for="' . $_id . '">';
-        } else {
-            $_output .= '<label>';
-        }
-    }
-
-    // 値を挿入
-    $_output .= $output;
-
-    $_output .= $tags[1];
-
-    if ($labels) $_output .= '</label>';
-    $_output .=  $separator;
-
-    return $_output;
+    return smarty_function_html_radios($params, $smarty);
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index b8e705d855..1252320d97 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -2,6 +2,7 @@ parameters:
   level: 1
   bootstrapFiles:
     - tests/require.php
+    - data/vendor/smarty/smarty/libs/plugins/function.html_radios.php
   excludePaths:
     - data/Smarty/templates_c/*
     - data/module/SOAP/*
@@ -36,16 +37,6 @@ parameters:
     -
       message: "#^Function smarty_function_escape_special_chars not found\\.$#"
       path: data/smarty_extends/*
-    -
-      message: "#^Variable \\$values in isset\\(\\) always exists and is always null\\.$#"
-      paths:
-        - data/smarty_extends/function.html_radios_ex.php
-        - data/smarty_extends/function.html_checkboxes_ex.php
-    -
-      message: "#^Undefined variable\\: \\$tags$#"
-      paths:
-        - data/smarty_extends/function.html_radios_ex.php
-        - data/smarty_extends/function.html_checkboxes_ex.php
     -
       message: "#^Variable \\$SJIS_widths might not be defined\\.$#"
       path: data/class/helper/SC_Helper_FPDI.php

From 0c2bd3df0f1ccc92bbb7ab5f866062153edb2e8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:51:57 +0000
Subject: [PATCH 50/88] Bump style-loader from 3.3.2 to 3.3.4

Bumps [style-loader](https://github.com/webpack-contrib/style-loader) from 3.3.2 to 3.3.4.
- [Release notes](https://github.com/webpack-contrib/style-loader/releases)
- [Changelog](https://github.com/webpack-contrib/style-loader/blob/v3.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/style-loader/compare/v3.3.2...v3.3.4)

---
updated-dependencies:
- dependency-name: style-loader
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b197654df8..8e8980322e 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "jquery-easing": "^0.0.1",
     "jquery-migrate": "^3.4.1",
     "slick-carousel": "^1.8.1",
-    "style-loader": "^3.3.2",
+    "style-loader": "^3.3.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.76.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 27eb373071..683ccc34e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3707,10 +3707,10 @@ strip-json-comments@^3.1.0, 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==
 
-style-loader@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.2.tgz#eaebca714d9e462c19aa1e3599057bc363924899"
-  integrity sha512-RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw==
+style-loader@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7"
+  integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==
 
 supports-color@^5.3.0:
   version "5.5.0"

From 5165729a742f6150749de3b8634eb7ceed477ee6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:08:39 +0000
Subject: [PATCH 51/88] Bump actions/cache from 3 to 4

Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/coverage.yml | 2 +-
 .github/workflows/main.yml     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 2de9bede03..a677fce428 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -57,7 +57,7 @@ jobs:
       id: composer-cache
       run: |
         echo "::set-output name=dir::$(composer config cache-files-dir)"
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2a5fc1d4c..c2f128b403 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,7 +67,7 @@ jobs:
       id: composer-cache
       run: |
         echo "::set-output name=dir::$(composer config cache-files-dir)"
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -163,7 +163,7 @@ jobs:
       id: composer-cache
       run: |
         echo "::set-output name=dir::$(composer config cache-files-dir)"
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**\composer.lock') }}

From 6619a6844f454ee390e018c1a061b903c98f6256 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:35:33 +0000
Subject: [PATCH 52/88] Bump typescript from 5.0.2 to 5.3.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.0.2 to 5.3.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.0.2...v5.3.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8e8980322e..563ab435e7 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "eslint-config-jquery": "^3.0.0",
     "eslint-plugin-import": "^2.27.5",
     "tar": "^6.1.13",
-    "typescript": "^5.0.2",
+    "typescript": "^5.3.3",
     "webpack-cli": "^4.10.0",
     "zaproxy": "^1.0.1"
   },
diff --git a/yarn.lock b/yarn.lock
index 683ccc34e5..a7401514af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3856,10 +3856,10 @@ typed-array-length@^1.0.4:
     for-each "^0.3.3"
     is-typed-array "^1.1.9"
 
-typescript@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.0.2.tgz#891e1a90c5189d8506af64b9ef929fca99ba1ee5"
-  integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==
+typescript@^5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
+  integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"

From 91d5ee6040aabe8927dbad007160c5edefbea9fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:55:43 +0000
Subject: [PATCH 53/88] Bump pear/mail from 1.5.0 to 2.0.0

Bumps [pear/mail](https://github.com/pear/Mail) from 1.5.0 to 2.0.0.
- [Release notes](https://github.com/pear/Mail/releases)
- [Commits](https://github.com/pear/Mail/compare/v1.5.0...v2.0.0)

---
updated-dependencies:
- dependency-name: pear/mail
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index fea3b503c2..0f734290ed 100644
--- a/composer.lock
+++ b/composer.lock
@@ -285,16 +285,16 @@
         },
         {
             "name": "pear/mail",
-            "version": "v1.5.0",
+            "version": "v2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail.git",
-                "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3"
+                "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail/zipball/c31b7635899a630a8ce681e5ced18cededcc15f3",
-                "reference": "c31b7635899a630a8ce681e5ced18cededcc15f3",
+                "url": "https://api.github.com/repos/pear/Mail/zipball/eb053f8b74f4f3178105fcf001626e63068c0dbc",
+                "reference": "eb053f8b74f4f3178105fcf001626e63068c0dbc",
                 "shasum": ""
             },
             "require": {
@@ -348,7 +348,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail",
                 "source": "https://github.com/pear/Mail"
             },
-            "time": "2022-11-29T22:04:18+00:00"
+            "time": "2024-01-15T21:56:23+00:00"
         },
         {
             "name": "pear/pear-core-minimal",

From f9e1d19269d507a1d61bd47df4a0b8bbb0a6772f Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Tue, 23 Jan 2024 14:12:57 +0900
Subject: [PATCH 54/88] Update data/class/helper/SC_Helper_TaxRule.php

Co-authored-by: bbkids <58061209+bbkids@users.noreply.github.com>
---
 data/class/helper/SC_Helper_TaxRule.php | 43 +++++++++++++++++++------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index 309c5e2f5f..574c9bbd0d 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -66,6 +66,7 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr
      * 消費税の内訳を返す.
      *
      * 税率ごとに以下のような連想配列を返す.
+     * - discount: 税率毎の値引額
      * - total: 値引後の税込み合計金額
      * - tax: 値引後の税額
      * 値引額合計は税率ごとに按分する.
@@ -73,28 +74,52 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr
      *
      * @param array{8?:int, 10?:int} $arrTaxableTotal 税率ごとのお支払い合計金額
      * @param int $discount_total 値引額合計
-     * @return array{8?:array{total:int,tax:int}, 10?:array{total:int,tax:int}}
+     * @return array{8?:array{discount;int,total:int,tax:int}, 10?:array{discount;int,total:int,tax:int}}
      */
-    public static function getTaxPerTaxRate(array $arrTaxableTotal, $discount_total = 0)
+    public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array
     {
         $arrDefaultTaxRule = static::getTaxRule();
 
         ksort($arrTaxableTotal);
-        $tax = [];
+        $cf_discount = 0;
         $taxable_total = array_sum($arrTaxableTotal);
+        $divide = [];
         $result = [];
+
+        // 按分後の値引額の合計（8%対象商品の按分後の値引額 ＋ 10%対象商品の按分後の値引額）が実際の値引額より＋－1円となる事への対処
+        // ①按分した値引き額を四捨五入で丸める
         foreach ($arrTaxableTotal as $rate => $total) {
-            if ($taxable_total > 0) {
-                $reduced_total = $total - $discount_total * $total / $taxable_total;
-            }
+            $discount[$rate]   = round(($discount_total * $total / $taxable_total),0);
+            $divide[$rate]     = [
+                'discount' => intval($discount[$rate]),
+            ];
+            $cf_discount +=  $divide[$rate]['discount'];
+		}
+        // ②四捨五入したとしても、四捨五入前の値引額がそれぞれ 16.5 + 75.5 の場合 →(四捨五入端数処理)→ 17 + 76 両方繰り上がる。事への対処
+        $defaultTaxRule = $arrDefaultTaxRule['calc_rule'];
+        $diff = $discount_total - $cf_discount;
+        if($diff > 0)    {
+            $divide[$defaultTaxRule]['discount'] += $diff;
+        }
+        elseif($diff < 0){
+            $divide[$defaultTaxRule]['discount'] -= $diff;
+        }
 
+        foreach ($arrTaxableTotal as $rate => $total) {
+            if($rate == $defaultTaxRule){
+                $discount[$rate] = $divide[$GTaxRule]['discount'];
+            }
+            else{
+                $discount[$rate] = round(($discount_total * $total / $taxable_total),0);
+            }
+            $reduced_total = $total - $discount[$rate];
             $tax = $reduced_total * ($rate / (100 + $rate));
             $result[$rate] = [
-                'total' => intval(static::roundByCalcRule($reduced_total, $arrDefaultTaxRule['calc_rule'])),
-                'tax' => intval(static::roundByCalcRule($tax, $arrDefaultTaxRule['calc_rule'])),
+                'discount' => intval($discount[$rate]),
+                'total' => intval($reduced_total),
+                'tax' => intval(static::roundByCalcRule($tax, $defaultTaxRule)),
             ];
         }
-
         return $result;
     }
 

From 29ed7c556e9050bf232a99011f53d7b2f41a17c9 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Wed, 24 Jan 2024 11:29:09 +0900
Subject: [PATCH 55/88] Update data/class/helper/SC_Helper_TaxRule.php

Co-authored-by: bbkids <58061209+bbkids@users.noreply.github.com>
---
 data/class/helper/SC_Helper_TaxRule.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index 574c9bbd0d..b34217ab5e 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -107,7 +107,7 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_to
 
         foreach ($arrTaxableTotal as $rate => $total) {
             if($rate == $defaultTaxRule){
-                $discount[$rate] = $divide[$GTaxRule]['discount'];
+                $discount[$rate] = $divide[$defaultTaxRule]['discount'];
             }
             else{
                 $discount[$rate] = round(($discount_total * $total / $taxable_total),0);

From fd1bd3b19b3b623c4e2f39713bec6f8917e824b7 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sun, 28 Jan 2024 19:07:12 +0900
Subject: [PATCH 56/88] =?UTF-8?q?function=20=E3=81=AE=20static=20=E5=AE=A3?=
 =?UTF-8?q?=E8=A8=80=E6=BC=8F=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/helper/SC_Helper_DB.php                   | 4 ++--
 data/class/pages/admin/basis/LC_Page_Admin_Basis.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php
index 5a0855a5e4..0b79555126 100644
--- a/data/class/helper/SC_Helper_DB.php
+++ b/data/class/helper/SC_Helper_DB.php
@@ -184,7 +184,7 @@ public static function sfGetBasisDataCache($generate = false)
      * @param  boolean $ignore_error エラーを無視するか
      * @return array   店舗基本情報の配列
      */
-    public function getBasisDataFromCacheFile($ignore_error = false)
+    public static function getBasisDataFromCacheFile($ignore_error = false)
     {
         $arrReturn = [];
 
@@ -205,7 +205,7 @@ public function getBasisDataFromCacheFile($ignore_error = false)
      *
      * @return array   店舗基本情報の配列
      */
-    public function getBasisDataFromDB()
+    public static function getBasisDataFromDB()
     {
         $objQuery = SC_Query_Ex::getSingletonInstance();
 
diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
index 9c61358186..7d53a3645c 100644
--- a/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
+++ b/data/class/pages/admin/basis/LC_Page_Admin_Basis.php
@@ -79,7 +79,6 @@ public function process()
      */
     public function action()
     {
-        $objDb = new SC_Helper_DB_Ex();
         $objFormParam = new SC_FormParam_Ex();
         $this->lfInitParam($objFormParam, $_POST);
         $objFormParam->setParam($_POST);
@@ -108,7 +107,7 @@ public function action()
                 $this->tpl_onload .= "window.alert('SHOPマスターの登録が完了しました。');";
             // breakはつけない
             default:
-                $arrRet = $objDb->getBasisDataFromDB();
+                $arrRet = SC_Helper_DB_Ex::getBasisDataFromDB();
                 $objFormParam->setParam($arrRet);
                 $this->arrForm = $objFormParam->getHashArray();
                 $this->arrForm['regular_holiday_ids'] = explode('|', $this->arrForm['regular_holiday_ids']);

From 2f788283a6bb4ecef75214069d626d986c81ffa8 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sun, 28 Jan 2024 19:21:01 +0900
Subject: [PATCH 57/88] =?UTF-8?q?SC=5FHelper=5FDB::sfGetBasisDataCache()?=
 =?UTF-8?q?=20=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- #385 で追加した店舗基本情報をDBから取得する関数と比較する。
- 前項に伴い、Mock を使う必要がなくなり、削除した。
- Mock のデータが旧バージョンのカラムだったので見逃されていた不整合を修正した。
---
 .../SC_Helper_DB_sfGetBasisDataCacheTest.php  | 180 +-----------------
 1 file changed, 9 insertions(+), 171 deletions(-)

diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
index ae41848b13..dd58abd333 100644
--- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
+++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfGetBasisDataCacheTest.php
@@ -52,7 +52,7 @@ public function testSfGetBasisDataCache_キャッシュがなく生成もしな
             unlink($this->cashFilePath);
         }
         $this->expected = array();
-        $this->actual = SC_Helper_DB_sfGetBasisDataCacheMock::sfGetBasisDataCache();
+        $this->actual = SC_Helper_DB_Ex::sfGetBasisDataCache();
         $this->verify();
     }
 
@@ -62,75 +62,8 @@ public function testSfGetBasisDataCache_キャッシュがなく生成する場
         if (file_exists($this->cashFilePath)) {
             unlink($this->cashFilePath);
         }
-        $this->expected = array(
-            'id' => '1',
-            'company_name' => 'testshop',
-            'company_kana' => 'テストショップ',
-            'zip01' => '530',
-            'zip02' => '0001',
-            'pref' => '1',
-            'addr01' => 'testaddr01',
-            'addr02' => 'testaddr02',
-            'tel01' => '11',
-            'tel02' => '2222',
-            'tel03' => '3333',
-            'fax01' => '11',
-            'fax02' => '2222',
-            'fax03' => '3333',
-            'business_hour' => '09-18',
-            'law_company' => 'lawcampanyname',
-            'law_manager' => 'lawmanager',
-            'law_zip01' => '530',
-            'law_zip02' => '0001',
-            'law_pref' => '1',
-            'law_addr01' => 'lawaddr01',
-            'law_addr02' => 'lawaddr02',
-            'law_tel01' => '11',
-            'law_tel02' => '2222',
-            'law_tel03' => '3333',
-            'law_fax01' => '11',
-            'law_fax02' => '2222',
-            'law_fax03' => '3333',
-            'law_email' => 'test@test.com',
-            'law_url' => 'http://test.test',
-            'law_term01' => 'lawterm01',
-            'law_term02' => 'lawterm02',
-            'law_term03' => 'lawterm03',
-            'law_term04' => 'lawterm04',
-            'law_term05' => 'lawterm05',
-            'law_term06' => 'lawterm06',
-            'law_term07' => 'lawterm07',
-            'law_term08' => 'lawterm08',
-            'law_term09' => 'lawterm09',
-            'law_term10' => 'lawterm10',
-            'email01' => 'test1@test.com',
-            'email02' => 'test2@test.com',
-            'email03' => 'test3@test.com',
-            'email04' => 'test4@test.com',
-            'free_rule' => '1000',
-            'shop_name' => 'shopname',
-            'shop_kana' => 'ショップネーム',
-            'shop_name_eng' => 'shopnameeng',
-            'point_rate' => '10',
-            'welcome_point' => '100',
-            'update_date' => '2012-02-14 11:22:33',
-            'top_tpl' => 'top.tpl',
-            'product_tpl' => 'product.tpl',
-            'detail_tpl' => 'detail.tpl',
-            'mypage_tpl' => 'mypage.tpl',
-            'good_traded' => 'goodtraded',
-            'message' => 'message',
-            'regular_holiday_ids' => '0|6',
-            'latitude' => '30.0001',
-            'longitude' => '45.0001',
-            'downloadable_days' => '10',
-            'downloadable_days_unlimited' => '0',
-            'zipcode' => null,
-            'country_id' => null,
-            'law_zipcode' => null,
-            'law_country_id' => null,
-        );
-        $this->actual = SC_Helper_DB_sfGetBasisDataCacheMock::sfGetBasisDataCache(true);
+        $this->expected = SC_Helper_DB_Ex::getBasisDataFromDB();
+        $this->actual = SC_Helper_DB_Ex::sfGetBasisDataCache(true);
         $this->verify();
     }
 
@@ -140,7 +73,7 @@ public function testSfGetBasisDataCache_キャッシュがある場合_キャッ
         if (file_exists($this->cashFilePath)) {
             unlink($this->cashFilePath);
         }
-        SC_Helper_DB_sfGetBasisDataCacheMock::sfCreateBasisDataCache();
+        SC_Helper_DB_Ex::sfCreateBasisDataCache();
         $this->expected = array(
             'id' => '1',
             'company_name' => 'testshop',
@@ -204,108 +137,13 @@ public function testSfGetBasisDataCache_キャッシュがある場合_キャッ
             'longitude' => '45.0001',
             'downloadable_days' => '10',
             'downloadable_days_unlimited' => '0',
-            'tax' => '5',
-            'tax_rule' => '1',
+            'zipcode' => null,
+            'country_id' => null,
+            'law_zipcode' => null,
+            'law_country_id' => null,
         );
-        $this->actual = SC_Helper_DB_sfGetBasisDataCacheMock::sfGetBasisDataCache();
+        $this->actual = SC_Helper_DB_Ex::sfGetBasisDataCache();
         unlink($this->cashFilePath);
         $this->verify();
     }
-
-}
-
-class SC_Helper_DB_sfGetBasisDataCacheMock extends SC_Helper_DB_Ex
-{
-    public static function sfCreateBasisDataCache()
-    {
-        // テーブル名
-        $name = 'dtb_baseinfo';
-        // キャッシュファイルパス
-        $filepath = MASTER_DATA_REALDIR . $name . '.serial';
-        // データ取得
-        $arrData = array(
-            'id' => '1',
-            'company_name' => 'testshop',
-            'company_kana' => 'テストショップ',
-            'zip01' => '530',
-            'zip02' => '0001',
-            'pref' => '1',
-            'addr01' => 'testaddr01',
-            'addr02' => 'testaddr02',
-            'tel01' => '11',
-            'tel02' => '2222',
-            'tel03' => '3333',
-            'fax01' => '11',
-            'fax02' => '2222',
-            'fax03' => '3333',
-            'business_hour' => '09-18',
-            'law_company' => 'lawcampanyname',
-            'law_manager' => 'lawmanager',
-            'law_zip01' => '530',
-            'law_zip02' => '0001',
-            'law_pref' => '1',
-            'law_addr01' => 'lawaddr01',
-            'law_addr02' => 'lawaddr02',
-            'law_tel01' => '11',
-            'law_tel02' => '2222',
-            'law_tel03' => '3333',
-            'law_fax01' => '11',
-            'law_fax02' => '2222',
-            'law_fax03' => '3333',
-            'law_email' => 'test@test.com',
-            'law_url' => 'http://test.test',
-            'law_term01' => 'lawterm01',
-            'law_term02' => 'lawterm02',
-            'law_term03' => 'lawterm03',
-            'law_term04' => 'lawterm04',
-            'law_term05' => 'lawterm05',
-            'law_term06' => 'lawterm06',
-            'law_term07' => 'lawterm07',
-            'law_term08' => 'lawterm08',
-            'law_term09' => 'lawterm09',
-            'law_term10' => 'lawterm10',
-            'tax' => '5',
-            'tax_rule' => '1',
-            'email01' => 'test1@test.com',
-            'email02' => 'test2@test.com',
-            'email03' => 'test3@test.com',
-            'email04' => 'test4@test.com',
-            'free_rule' => '1000',
-            'shop_name' => 'shopname',
-            'shop_kana' => 'ショップネーム',
-            'shop_name_eng' => 'shopnameeng',
-            'point_rate' => '10',
-            'welcome_point' => '100',
-            'update_date' => '2012-02-14 11:22:33',
-            'top_tpl' => 'top.tpl',
-            'product_tpl' => 'product.tpl',
-            'detail_tpl' => 'detail.tpl',
-            'mypage_tpl' => 'mypage.tpl',
-            'good_traded' => 'goodtraded',
-            'message' => 'message',
-            'regular_holiday_ids' => '0|6',
-            'latitude' => '30.0001',
-            'longitude' => '45.0001',
-            'downloadable_days' => '10',
-            'downloadable_days_unlimited' => '0'
-        );
-        // シリアライズ
-        $data = serialize($arrData);
-        // ファイルを書き出しモードで開く
-        $handle = fopen($filepath, 'w');
-        if (!$handle) {
-            // ファイル生成失敗
-            return false;
-        }
-        // ファイルの内容を書き出す.
-        $res = fwrite($handle, $data);
-        // ファイルを閉じる
-        fclose($handle);
-        if ( $res === false) {
-            // ファイル生成失敗
-            return false;
-        }
-        // ファイル生成成功
-        return true;
-    }
 }

From 1f65f2fb6850e5c63f72f95ff08fdb3b3c62f66f Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sun, 28 Jan 2024 19:44:58 +0900
Subject: [PATCH 58/88] =?UTF-8?q?ebd413b9b9=20=E3=81=A7=E8=AA=A4=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E5=BC=95=E6=95=B0?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/helper/SC_Helper_DB.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php
index 0b79555126..25d150fe51 100644
--- a/data/class/helper/SC_Helper_DB.php
+++ b/data/class/helper/SC_Helper_DB.php
@@ -228,7 +228,7 @@ public static function getBasisDataFromDB()
     public static function sfCreateBasisDataCache()
     {
         // データ取得
-        $arrData = static::getBasisDataFromDB(true);
+        $arrData = static::getBasisDataFromDB();
         // シリアライズ
         $data = serialize($arrData);
         // ファイルを書き出しモードで開く

From 68c64ad077bad70742d3204fc232ec4fe26dc1a8 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sun, 28 Jan 2024 20:16:00 +0900
Subject: [PATCH 59/88] =?UTF-8?q?PHP5=20=E4=BA=92=E6=8F=9B=E3=81=AB?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/class/helper/SC_Helper_DB.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php
index 25d150fe51..3c7f97bcb6 100644
--- a/data/class/helper/SC_Helper_DB.php
+++ b/data/class/helper/SC_Helper_DB.php
@@ -28,10 +28,12 @@
  * @author EC-CUBE CO.,LTD.
  * @version $Id$
  */
+
+// NOTE: PHP5 対応が不要となったらクラス定数に変更する。
+define('SC_HELPER_DB_BASIS_DATA_CACHE_REALFILE', MASTER_DATA_REALDIR . 'dtb_baseinfo.serial');
+
 class SC_Helper_DB
 {
-    const BASIS_DATA_CACHE_REALFILE = MASTER_DATA_REALDIR . 'dtb_baseinfo.serial';
-
     /** ルートカテゴリ取得フラグ */
     public $g_root_on;
 
@@ -133,7 +135,7 @@ public static function sfGetBasisData($force = false)
         static $arrData = null;
 
         // キャッシュファイルが存在しない場合、キャッシュファイルを生成する
-        if (!$force && !file_exists(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE)) {
+        if (!$force && !file_exists(SC_HELPER_DB_BASIS_DATA_CACHE_REALFILE)) {
             $force = true;
         }
 
@@ -167,7 +169,7 @@ public static function sfGetBasisDataCache($generate = false)
         $cacheData = [];
 
         // ファイル存在確認
-        if (!file_exists(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE) && $generate) {
+        if (!file_exists(SC_HELPER_DB_BASIS_DATA_CACHE_REALFILE) && $generate) {
             // 存在していなければキャッシュ生成
             static::sfCreateBasisDataCache();
         }
@@ -189,9 +191,9 @@ public static function getBasisDataFromCacheFile($ignore_error = false)
         $arrReturn = [];
 
         // ファイル存在確認
-        if (file_exists(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE)) {
+        if (file_exists(SC_HELPER_DB_BASIS_DATA_CACHE_REALFILE)) {
             // キャッシュデータファイルを読み込みアンシリアライズした配列を取得
-            $arrReturn = unserialize(file_get_contents(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE));
+            $arrReturn = unserialize(file_get_contents(SC_HELPER_DB_BASIS_DATA_CACHE_REALFILE));
         }
         elseif (!$ignore_error) {
             throw new Exception('基本情報のキャッシュデータファイルが存在しません。');
@@ -232,7 +234,7 @@ public static function sfCreateBasisDataCache()
         // シリアライズ
         $data = serialize($arrData);
         // ファイルを書き出しモードで開く
-        $handle = fopen(SC_Helper_DB_Ex::BASIS_DATA_CACHE_REALFILE, 'w');
+        $handle = fopen(SC_HELPER_DB_BASIS_DATA_CACHE_REALFILE, 'w');
         if (!$handle) {
             // ファイル生成失敗
             return false;

From 11d0556364a40128b1b82128d774c30bfd6a6d4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:26:48 +0000
Subject: [PATCH 60/88] Bump @babel/core from 7.21.3 to 7.23.9

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.3 to 7.23.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.9/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 312 +++++++++++++++++++++++++--------------------------
 2 files changed, 151 insertions(+), 163 deletions(-)

diff --git a/package.json b/package.json
index 563ab435e7..3672280162 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "webpack": "^5.76.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.3",
+    "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.20.2",
     "@faker-js/faker": "^7.6.0",
     "@playwright/test": "^1.29.2",
diff --git a/yarn.lock b/yarn.lock
index a7401514af..c4fb89cf74 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,19 +10,12 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
-  dependencies:
-    "@babel/highlight" "^7.18.6"
-
-"@babel/code-frame@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
-  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
   dependencies:
-    "@babel/highlight" "^7.22.13"
+    "@babel/highlight" "^7.23.4"
     chalk "^2.4.2"
 
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1":
@@ -30,48 +23,38 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
   integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
 
-"@babel/compat-data@^7.20.5":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298"
-  integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==
+"@babel/compat-data@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
+  integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
 
-"@babel/core@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.3.tgz#cf1c877284a469da5d1ce1d1e53665253fae712e"
-  integrity sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw==
+"@babel/core@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1"
+  integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.21.3"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.3"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.3"
-    "@babel/types" "^7.21.3"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@babel/template" "^7.23.9"
+    "@babel/traverse" "^7.23.9"
+    "@babel/types" "^7.23.9"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.0"
-
-"@babel/generator@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce"
-  integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==
-  dependencies:
-    "@babel/types" "^7.21.3"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
+    json5 "^2.2.3"
+    semver "^6.3.1"
 
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+"@babel/generator@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
+  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.23.6"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
@@ -91,16 +74,16 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
-  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-validator-option" "^7.18.6"
-    browserslist "^4.21.3"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
     lru-cache "^5.1.1"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
 "@babel/helper-create-class-features-plugin@^7.18.6":
   version "7.19.0"
@@ -196,19 +179,23 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
-  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
+"@babel/helper-module-imports@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
+  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.2"
-    "@babel/types" "^7.21.2"
+    "@babel/types" "^7.22.15"
+
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -243,13 +230,20 @@
     "@babel/traverse" "^7.19.1"
     "@babel/types" "^7.19.0"
 
-"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
+"@babel/helper-simple-access@^7.19.4":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
   integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
     "@babel/types" "^7.20.2"
 
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
@@ -271,17 +265,12 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+"@babel/helper-string-parser@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
+  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
-
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+"@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
@@ -296,6 +285,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+
 "@babel/helper-wrap-function@^7.18.9":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
@@ -306,42 +300,28 @@
     "@babel/traverse" "^7.19.0"
     "@babel/types" "^7.19.0"
 
-"@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
+"@babel/helpers@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d"
+  integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
+    "@babel/template" "^7.23.9"
+    "@babel/traverse" "^7.23.9"
+    "@babel/types" "^7.23.9"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.22.13":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
-  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
   dependencies:
     "@babel/helper-validator-identifier" "^7.22.20"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.20.7", "@babel/parser@^7.21.3", "@babel/parser@^7.7.0":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3"
-  integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==
-
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+"@babel/parser@^7.23.9", "@babel/parser@^7.7.0":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
+  integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -950,55 +930,37 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.18.10", "@babel/template@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
+  integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.23.9"
+    "@babel/types" "^7.23.9"
 
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3", "@babel/traverse@^7.7.0":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.23.9", "@babel/traverse@^7.7.0":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
+  integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
+    "@babel/parser" "^7.23.9"
+    "@babel/types" "^7.23.9"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05"
-  integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==
+"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
+  integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
   dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
@@ -1683,7 +1645,7 @@ browser-sync-webpack-plugin@^2.3.0:
   dependencies:
     lodash "^4"
 
-browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4:
+browserslist@^4.14.5, browserslist@^4.21.4:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
   integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
@@ -1693,6 +1655,16 @@ browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4:
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.9"
 
+browserslist@^4.22.2:
+  version "4.22.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
+  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
+  dependencies:
+    caniuse-lite "^1.0.30001580"
+    electron-to-chromium "^1.4.648"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -1716,12 +1688,17 @@ caniuse-lite@^1.0.30001400:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz#5f1715e506e71860b4b07c50060ea6462217611e"
   integrity sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==
 
+caniuse-lite@^1.0.30001580:
+  version "1.0.30001581"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4"
+  integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.4.2:
+chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1813,12 +1790,10 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
 core-js-compat@^3.25.1:
   version "3.25.5"
@@ -1884,7 +1859,7 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -1950,6 +1925,11 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.270.tgz#2c6ea409b45cdb5c3e0cb2c08cf6c0ba7e0f2c26"
   integrity sha512-KNhIzgLiJmDDC444dj9vEOpZEgsV96ult9Iff98Vanumn+ShJHd5se8aX6KeVxdc0YQeqdrezBZv89rleDbvSg==
 
+electron-to-chromium@^1.4.648:
+  version "1.4.648"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4"
+  integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==
+
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -2925,7 +2905,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.2:
+json5@^2.1.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -3116,6 +3096,11 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+
 node-releases@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
@@ -3524,11 +3509,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-regex-test@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
@@ -3561,7 +3541,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -3904,6 +3884,14 @@ unicode-property-aliases-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
   integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 update-browserslist-db@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"

From 61c481c17e6e0cce3baf99752084bec42f0dcfef Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 29 Jan 2024 22:34:50 +0900
Subject: [PATCH 61/88] Update data/class/SC_Fpdf.php

Co-authored-by: bbkids <58061209+bbkids@users.noreply.github.com>
---
 data/class/SC_Fpdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/class/SC_Fpdf.php b/data/class/SC_Fpdf.php
index 886c328372..fb7995fc13 100644
--- a/data/class/SC_Fpdf.php
+++ b/data/class/SC_Fpdf.php
@@ -345,7 +345,7 @@ private function setOrderData()
         $this->SetX(20);
 
         $message = SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total);
-        $this->MultiCell($width, 4, $message, 0, 'R', 0, '');
+        $this->MultiCell($width, 4, $message, 0, 'R', '');
     }
 
     /**

From 6ce52fadc8383bc29d63041353001224b7fbd189 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 07:18:07 +0000
Subject: [PATCH 62/88] Bump tar and @types/tar

Bumps [tar](https://github.com/isaacs/node-tar) and [@types/tar](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/tar). These dependencies needed to be updated together.

Updates `tar` from 6.1.13 to 6.2.0
- [Release notes](https://github.com/isaacs/node-tar/releases)
- [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-tar/compare/v6.1.13...v6.2.0)

Updates `@types/tar` from 6.1.4 to 6.1.11
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/tar)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@types/tar"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  4 ++--
 yarn.lock    | 23 ++++++++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index c6a484d7e2..1677b839f2 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@playwright/test": "^1.29.2",
     "@types/date-fns": "^2.6.0",
     "@types/faker": "^6.6.9",
-    "@types/tar": "^6.1.4",
+    "@types/tar": "^6.1.11",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.55.0",
     "babel-eslint": "^10.0.3",
@@ -34,7 +34,7 @@
     "eslint": "^8.36.0",
     "eslint-config-jquery": "^3.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "tar": "^6.1.13",
+    "tar": "^6.2.0",
     "typescript": "^5.3.3",
     "webpack-cli": "^4.10.0",
     "zaproxy": "^1.0.1"
diff --git a/yarn.lock b/yarn.lock
index b9ecc89f0c..de7114230d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1203,10 +1203,10 @@
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
-"@types/tar@^6.1.4":
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.4.tgz#cf8497e1ebdc09212fd51625cd2eb5ca18365ad1"
-  integrity sha512-Cp4oxpfIzWt7mr2pbhHT2OTXGMAL0szYCzuf8lRWyIMCgsx6/Hfc3ubztuhvzXHXgraTQxyOCmmg7TDGIMIJJQ==
+"@types/tar@^6.1.11":
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.11.tgz#48de9ccee8db37efb0d5a9f288567fc0378cb734"
+  integrity sha512-ThA1WD8aDdVU4VLuyq5NEqriwXErF5gEIJeyT6gHBWU7JtSmW2a5qjNv3/vR82O20mW+1vhmeZJfBQPT3HCugg==
   dependencies:
     "@types/node" "*"
     minipass "^4.0.0"
@@ -3067,6 +3067,11 @@ minipass@^4.0.0:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
 minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -3732,14 +3737,14 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.1.13:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+tar@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"

From d68e8266f402f64f652eebd117a88707579054f6 Mon Sep 17 00:00:00 2001
From: shinya <pemomomo@gmail.com>
Date: Thu, 1 Feb 2024 18:55:25 +0900
Subject: [PATCH 63/88] =?UTF-8?q?=E8=87=AA=E5=8B=95=E3=83=9E=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=AE=E4=BB=95=E7=B5=84=E3=81=BF=E3=82=92=E5=B0=8E?=
 =?UTF-8?q?=E5=85=A5=EF=BC=88=E8=A9=A6=E8=A1=8C=E9=8C=AF=E8=AA=A4=E5=89=8D?=
 =?UTF-8?q?=E6=8F=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/auto-merge.yml | 36 ++++++++++++++++++++++++++++++++
 .github/workflows/e2e-tests.yml  | 22 +++++++++----------
 .github/workflows/main.yml       | 22 +++++++++----------
 .github/workflows/phpstan.yml    |  4 ++++
 4 files changed, 60 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/auto-merge.yml

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
new file mode 100644
index 0000000000..58b40697c8
--- /dev/null
+++ b/.github/workflows/auto-merge.yml
@@ -0,0 +1,36 @@
+name: Auto-merge
+
+on:
+  workflow_run:
+    workflows: [E2E testing for EC-CUBE]
+    types: [completed]
+
+jobs:
+  check-and-merge:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.workflow_run.conclusion == 'success'
+    permissions:
+      pull-requests: write
+      contents: write
+    env:
+      PR_URL: ${{github.event.pull_request.html_url}}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Approve PR
+        run: gh pr review "$PR_URL" --approve
+      ## いきなりマージするのが怖いので、一旦自動承認（↑）だけにする
+      #- name: Enable auto-merge
+      #  run: gh pr merge --merge --auto "$PR_URL"
+
+  failed:
+    runs-on: ubuntu-latest
+    if: |
+      github.event.workflow_run.conclusion == 'failure'
+    steps:
+      - name: failed
+        # 失敗したときにデバッグ用に情報を出力しておく
+        run:  |
+          echo 'Haven't met the conditions to merge yet'
+          echo '${{ toJSON(github.event.workflow_run) }}'
+          exit 1
\ No newline at end of file
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 34c9b3dce1..dac9fd444e 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -1,21 +1,17 @@
 name: E2E testing for EC-CUBE
+run-name: E2E testing for EC-CUBE
+
 on:
-  push:
-    branches:
-      - '*'
-    tags:
-      - '*'
-    paths:
-      - '**'
-      - '!*.md'
-  pull_request:
-    paths:
-      - '**'
-      - '!*.md'
+  workflow_run:
+    workflows: [CI/CD for EC-CUBE]
+    types: [completed]
+
 jobs:
   run-on-linux:
     name: Run on Linux
     runs-on: ubuntu-22.04
+    if: |
+      github.event.workflow_run.conclusion == 'success'
     strategy:
       fail-fast: false
       matrix:
@@ -85,6 +81,8 @@ jobs:
   installer:
     name: Installer test
     runs-on: ubuntu-22.04
+    if: |
+      github.event.workflow_run.conclusion == 'success'
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0d33224d88..cc4ef800e7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,21 +1,17 @@
 name: CI/CD for EC-CUBE
+run-name: CI/CD for EC-CUBE
+
 on:
-  push:
-    branches:
-      - '*'
-    tags:
-      - '*'
-    paths:
-      - '**'
-      - '!*.md'
-  pull_request:
-    paths:
-      - '**'
-      - '!*.md'
+  workflow_run:
+    workflows: [PHPStan]
+    types: [completed]
+
 jobs:
   run-on-linux:
     name: Run on Linux
     runs-on: ${{ matrix.operating-system }}
+    if: |
+      github.event.workflow_run.conclusion == 'success'
     strategy:
       fail-fast: false
       matrix:
@@ -150,6 +146,8 @@ jobs:
   run-on-windows:
     name: Run on Windows
     runs-on: ${{ matrix.operating-system }}
+    if: |
+      github.event.workflow_run.conclusion == 'success'
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 1564e9aa39..19950eb471 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,4 +1,6 @@
 name: PHPStan
+run-name: PHPStan
+
 on:
   push:
     branches:
@@ -12,6 +14,8 @@ on:
     paths:
       - '**'
       - '!*.md'
+  pull_request_review:
+    types: [submitted]
 
 jobs:
   phpstan:

From ae08724b83e1f1e4f50791803d15f9ffa9c9e977 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 5 Feb 2024 02:02:50 +0900
Subject: [PATCH 64/88] Fix divison by zero and format

---
 data/class/helper/SC_Helper_TaxRule.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/data/class/helper/SC_Helper_TaxRule.php b/data/class/helper/SC_Helper_TaxRule.php
index b34217ab5e..b0b5324097 100644
--- a/data/class/helper/SC_Helper_TaxRule.php
+++ b/data/class/helper/SC_Helper_TaxRule.php
@@ -76,7 +76,7 @@ public static function sfTax($price, $product_id = 0, $product_class_id = 0, $pr
      * @param int $discount_total 値引額合計
      * @return array{8?:array{discount;int,total:int,tax:int}, 10?:array{discount;int,total:int,tax:int}}
      */
-    public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_total = 0): array
+    public static function getTaxPerTaxRate($arrTaxableTotal, $discount_total = 0)
     {
         $arrDefaultTaxRule = static::getTaxRule();
 
@@ -89,28 +89,26 @@ public static function getTaxPerTaxRate(array $arrTaxableTotal, int $discount_to
         // 按分後の値引額の合計（8%対象商品の按分後の値引額 ＋ 10%対象商品の按分後の値引額）が実際の値引額より＋－1円となる事への対処
         // ①按分した値引き額を四捨五入で丸める
         foreach ($arrTaxableTotal as $rate => $total) {
-            $discount[$rate]   = round(($discount_total * $total / $taxable_total),0);
-            $divide[$rate]     = [
+            $discount[$rate] = $taxable_total !== 0 ? round(($discount_total * $total / $taxable_total), 0) : 0;
+            $divide[$rate] = [
                 'discount' => intval($discount[$rate]),
             ];
-            $cf_discount +=  $divide[$rate]['discount'];
-		}
+            $cf_discount += $divide[$rate]['discount'];
+        }
         // ②四捨五入したとしても、四捨五入前の値引額がそれぞれ 16.5 + 75.5 の場合 →(四捨五入端数処理)→ 17 + 76 両方繰り上がる。事への対処
         $defaultTaxRule = $arrDefaultTaxRule['calc_rule'];
         $diff = $discount_total - $cf_discount;
-        if($diff > 0)    {
+        if ($diff > 0) {
             $divide[$defaultTaxRule]['discount'] += $diff;
-        }
-        elseif($diff < 0){
+        } elseif ($diff < 0) {
             $divide[$defaultTaxRule]['discount'] -= $diff;
         }
 
         foreach ($arrTaxableTotal as $rate => $total) {
-            if($rate == $defaultTaxRule){
+            if ($rate == $defaultTaxRule) {
                 $discount[$rate] = $divide[$defaultTaxRule]['discount'];
-            }
-            else{
-                $discount[$rate] = round(($discount_total * $total / $taxable_total),0);
+            } else {
+                $discount[$rate] = $taxable_total !== 0 ? round(($discount_total * $total / $taxable_total), 0) : 0;
             }
             $reduced_total = $total - $discount[$rate];
             $tax = $reduced_total * ($rate / (100 + $rate));

From f99e6c0b3ec807229e6c62d639ddac780366dbce Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 5 Feb 2024 02:03:47 +0900
Subject: [PATCH 65/88] =?UTF-8?q?=E5=86=8D=E7=8F=BE=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676
---
 .../SC_Helper_TaxRule_getTaxDetailTest.php    | 168 +++++++++++++++++-
 1 file changed, 166 insertions(+), 2 deletions(-)

diff --git a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
index d0e9112b3a..be84e71581 100644
--- a/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
+++ b/tests/class/helper/SC_Helper_TaxRule/SC_Helper_TaxRule_getTaxDetailTest.php
@@ -41,10 +41,12 @@ public function testGetTaxPerTaxRateWithRound()
         self::assertSame(
             [
                 8 => [
+                    'discount' => 596,
                     'total' => 65160,
                     'tax' => 4827
                 ],
                 10 => [
+                    'discount' => 6563,
                     'total' => 717868,
                     'tax' => 65261
                 ]
@@ -86,10 +88,12 @@ public function testGetTaxPerTaxRateWithZero()
         self::assertSame(
             [
                 8 => [
+                    'discount' => 0,
                     'total' => 0,
                     'tax' => 0
                 ],
                 10 => [
+                    'discount' => 0,
                     'total' => 0,
                     'tax' => 0
                 ]
@@ -137,16 +141,20 @@ public function testGetTaxPerTaxRateWithFloor()
         self::assertSame(
             [
                 8 => [
+                    'discount' => 596,
                     'total' => 65160,
                     'tax' => 4826
                 ],
                 10 => [
-                    'total' => 717867,
+                    'discount' => 6563,
+                    'total' => 717868,
                     'tax' => 65260
                 ]
             ],
             $actual
         );
+
+        self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']);
     }
 
     /**
@@ -182,16 +190,172 @@ public function testGetTaxPerTaxRateWithCeil()
         self::assertSame(
             [
                 8 => [
-                    'total' => 65161,
+                    'discount' => 596,
+                    'total' => 65160,
                     'tax' => 4827
                 ],
                 10 => [
+                    'discount' => 6563,
                     'total' => 717868,
                     'tax' => 65261
                 ]
             ],
             $actual
         );
+
+        self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']);
+    }
+
+    /**
+     * @see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676
+     */
+    public function testGetTaxPerTaxRateWithRound2()
+    {
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '1',
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 1595,
+            8 => 7398,
+        ];
+        $discount_total = 92;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'discount' => 76,
+                    'total' => 7322,
+                    'tax' => 542
+                ],
+                10 => [
+                    'discount' => 16,
+                    'total' => 1579,
+                    'tax' => 144
+                ]
+            ],
+            $actual
+        );
+
+        self::assertSame(
+            '(8%対象: 7,322円 内消費税: 542円)'.PHP_EOL.
+                '(10%対象: 1,579円 内消費税: 144円)'.PHP_EOL,
+            SC_Helper_TaxRule_Ex::getTaxDetail($arrTaxableTotal, $discount_total)
+        );
+
+        self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']);
+    }
+
+    /**
+     * @see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testGetTaxPerTaxRateWithFloor2()
+    {
+        self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly');
+
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '2', // floor
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 1595,
+            8 => 7398,
+        ];
+        $discount_total = 92;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'discount' => 76,
+                    'total' => 7322,
+                    'tax' => 542
+                ],
+                10 => [
+                    'discount' => 16,
+                    'total' => 1579,
+                    'tax' => 143
+                ]
+            ],
+            $actual
+        );
+
+        self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']);
+    }
+
+    /**
+     * @see https://github.com/EC-CUBE/ec-cube2/pull/762#issuecomment-1897799676
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
+    public function testGetTaxPerTaxRateWithCeil2()
+    {
+        self::markTestSkipped('Skip this test because @runInSeparateProcess does not work properly');
+
+        $this->setUpTaxRule([
+            [
+                'tax_rule_id' => 1004,
+                'apply_date' => '2019-10-01 00:00:00',
+                'tax_rate' => '10',
+                'calc_rule' => '3', // ceil
+                'product_id' => '0',
+                'product_class_id' => '0',
+                'del_flg' => '0',
+                'member_id' => 1,
+                'create_date' => '2000-01-01 00:00:00',
+                'update_date' => '2000-01-01 00:00:00',
+            ],
+        ]);
+
+        $arrTaxableTotal = [
+            10 => 1595,
+            8 => 7398,
+        ];
+        $discount_total = 92;
+
+        $actual = SC_Helper_TaxRule_Ex::getTaxPerTaxRate($arrTaxableTotal, $discount_total);
+        self::assertSame(
+            [
+                8 => [
+                    'discount' => 76,
+                    'total' => 7322,
+                    'tax' => 543
+                ],
+                10 => [
+                    'discount' => 16,
+                    'total' => 1579,
+                    'tax' => 144
+                ]
+            ],
+            $actual
+        );
+
+        self::assertSame(array_sum($arrTaxableTotal) - $discount_total, $actual[8]['total'] + $actual[10]['total']);
     }
 
     protected function setUpTaxRule(array $taxs = [])

From e90cdb144bc4588097100246f70dd00a43428934 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Mon, 5 Feb 2024 16:13:25 +0900
Subject: [PATCH 66/88] =?UTF-8?q?PHPStan=20=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=82=92=20phpstan.neon.dist=20=E3=81=AE=20ignoreErrors=20?=
 =?UTF-8?q?=E3=81=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- #816 で revert を想定している。
---
 phpstan.neon.dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 1252320d97..9d2d392744 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -40,3 +40,6 @@ parameters:
     -
       message: "#^Variable \\$SJIS_widths might not be defined\\.$#"
       path: data/class/helper/SC_Helper_FPDI.php
+    -
+      message: "#^Inner named functions are not supported by PHPStan\\.#"
+      path: data/class/SC_Initial.php

From ea00242d2a6845b82cba2925c54954b7002af46b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:04:08 +0000
Subject: [PATCH 67/88] Bump codecov/codecov-action from 3 to 4

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/coverage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index e734c4efc1..62c9868b84 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -105,7 +105,7 @@ jobs:
         mv data/config/config.php.bak data/config/config.php
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         files: ./coverage1.xml,./coverage2.xml,./coverage3.xml
         # token: ${{ secrets.CODECOV_TOKEN }}

From 95c85b7e0f724c925c7fcc7b8a10e7e5a326bdc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:32:04 +0000
Subject: [PATCH 68/88] Bump eslint from 8.36.0 to 8.56.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.36.0 to 8.56.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.36.0...v8.56.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 154 +++++++++++++++++++++++++--------------------------
 2 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/package.json b/package.json
index eba638e5eb..423c24c19f 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.2.5",
     "browser-sync-webpack-plugin": "^2.3.0",
-    "eslint": "^8.36.0",
+    "eslint": "^8.56.0",
     "eslint-config-jquery": "^3.0.0",
     "eslint-plugin-import": "^2.27.5",
     "tar": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 8c550e58b0..8243125d2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
 "@ampproject/remapping@^2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
@@ -976,19 +981,19 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0":
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.1.tgz#087cb8d9d757bb22e9c9946c9c0c2bf8806830f1"
-  integrity sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.1.tgz#7888fe7ec8f21bc26d646dbd2c11cd776e21192d"
-  integrity sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.5.0"
+    espree "^9.6.0"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -996,23 +1001,23 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.36.0":
-  version "8.36.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.36.0.tgz#9837f768c03a1e4a30bd304a64fb8844f0e72efe"
-  integrity sha512-lxJ9R5ygVm8ZWgYdUweoq5ownDlJ4upvoWmO4eLxBYHdMo+vZ/Rx0EN6MbKWDJOSUGrqJy2Gt+Dyv/VKml0fjg==
+"@eslint/js@8.56.0":
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
+  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
 "@faker-js/faker@^7.6.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
   integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==
 
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+"@humanwhocodes/config-array@^0.11.13":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -1020,10 +1025,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917"
+  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==
 
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
@@ -1291,6 +1296,11 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -1449,17 +1459,22 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
+acorn@^8.5.0, acorn@^8.7.1:
   version "8.8.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
+acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2109,10 +2124,10 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -2122,32 +2137,33 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  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@^8.36.0:
-  version "8.36.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.36.0.tgz#1bd72202200a5492f91803b113fb8a83b11285cf"
-  integrity sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==
+eslint@^8.56.0:
+  version "8.56.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
+  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.1"
-    "@eslint/js" "8.36.0"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.56.0"
+    "@humanwhocodes/config-array" "^0.11.13"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.5.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -2155,32 +2171,29 @@ eslint@^8.36.0:
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.5.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.0.tgz#3646d4e3f58907464edba852fa047e6a27bdf113"
-  integrity sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw==
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.1"
 
 esquery@^1.4.2:
   version "1.5.0"
@@ -2491,11 +2504,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
-
 graphemer@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
@@ -2584,7 +2592,7 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -2835,11 +2843,6 @@ jquery@*, jquery@3, jquery@>=1.3.2:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
   integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==
 
-js-sdsl@^4.1.4:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
-  integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -3161,17 +3164,17 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 p-limit@^2.2.0:
   version "2.3.0"
@@ -3676,7 +3679,7 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "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==
@@ -4033,11 +4036,6 @@ wildcard@^2.0.0:
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-word-wrap@^1.2.3:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
-  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

From 6d2f611f50e361c8c7b489c503424693e07272fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 09:32:35 +0000
Subject: [PATCH 69/88] Bump @playwright/test from 1.29.2 to 1.41.2

Bumps [@playwright/test](https://github.com/microsoft/playwright) from 1.29.2 to 1.41.2.
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.29.2...v1.41.2)

---
updated-dependencies:
- dependency-name: "@playwright/test"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 33 +++++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index eba638e5eb..5047a73f19 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.20.2",
     "@faker-js/faker": "^7.6.0",
-    "@playwright/test": "^1.29.2",
+    "@playwright/test": "^1.41.2",
     "@types/date-fns": "^2.6.0",
     "@types/faker": "^6.6.9",
     "@types/tar": "^6.1.11",
diff --git a/yarn.lock b/yarn.lock
index 8c550e58b0..77b3ee7458 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1102,13 +1102,12 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@playwright/test@^1.29.2":
-  version "1.29.2"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.29.2.tgz#c48184721d0f0b7627a886e2ec42f1efb2be339d"
-  integrity sha512-+3/GPwOgcoF0xLz/opTnahel1/y42PdcgZ4hs+BZGIUjtmEFSXGg+nFoaH3NSmuc7a6GSFwXDJ5L7VXpqzigNg==
+"@playwright/test@^1.41.2":
+  version "1.41.2"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.41.2.tgz#bd9db40177f8fd442e16e14e0389d23751cdfc54"
+  integrity sha512-qQB9h7KbibJzrDpkXkYvsmiDJK14FULCCZgEcoe2AvFAS64oCirWTwzTlAYEbKaRxWs5TFesE1Na6izMv3HfGg==
   dependencies:
-    "@types/node" "*"
-    playwright-core "1.29.2"
+    playwright "1.41.2"
 
 "@types/date-fns@^2.6.0":
   version "2.6.0"
@@ -2359,6 +2358,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+fsevents@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -3260,10 +3264,19 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   dependencies:
     find-up "^4.0.0"
 
-playwright-core@1.29.2:
-  version "1.29.2"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.29.2.tgz#2e8347e7e8522409f22b244e600e703b64022406"
-  integrity sha512-94QXm4PMgFoHAhlCuoWyaBYKb92yOcGVHdQLoxQ7Wjlc7Flg4aC/jbFW7xMR52OfXMVkWicue4WXE7QEegbIRA==
+playwright-core@1.41.2:
+  version "1.41.2"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.41.2.tgz#db22372c708926c697acc261f0ef8406606802d9"
+  integrity sha512-VaTvwCA4Y8kxEe+kfm2+uUUw5Lubf38RxF7FpBxLPmGe5sdNkSg5e3ChEigaGrX7qdqT3pt2m/98LiyvU2x6CA==
+
+playwright@1.41.2:
+  version "1.41.2"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.41.2.tgz#4e760b1c79f33d9129a8c65cc27953be6dd35042"
+  integrity sha512-v0bOa6H2GJChDL8pAeLa/LZC4feoAMbSQm1/jF/ySsWWoaNItvrMP7GEkvEEFyCTUYKMxjQKaTSg5up7nR6/8A==
+  dependencies:
+    playwright-core "1.41.2"
+  optionalDependencies:
+    fsevents "2.3.2"
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"

From 4fa87c10088b458d6ffed85b6ed219480c574e05 Mon Sep 17 00:00:00 2001
From: shinya <pemomomo@gmail.com>
Date: Tue, 6 Feb 2024 10:59:24 +0900
Subject: [PATCH 70/88] =?UTF-8?q?checkout=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/auto-merge.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 58b40697c8..73ff4c9ecb 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -17,6 +17,10 @@ jobs:
       PR_URL: ${{github.event.pull_request.html_url}}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
+      - name: Checkout repository with preceding commits
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Approve PR
         run: gh pr review "$PR_URL" --approve
       ## いきなりマージするのが怖いので、一旦自動承認（↑）だけにする
@@ -30,7 +34,7 @@ jobs:
     steps:
       - name: failed
         # 失敗したときにデバッグ用に情報を出力しておく
-        run:  |
+        run: |
           echo 'Haven't met the conditions to merge yet'
           echo '${{ toJSON(github.event.workflow_run) }}'
-          exit 1
\ No newline at end of file
+          exit 1

From fffa6d9983c01a4fe910611caa0389e56c2b9df9 Mon Sep 17 00:00:00 2001
From: shinya <pemomomo@gmail.com>
Date: Thu, 8 Feb 2024 10:44:41 +0900
Subject: [PATCH 71/88] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?=
 =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9B=E6=96=B9=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/auto-merge.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 73ff4c9ecb..346976993b 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -33,8 +33,10 @@ jobs:
       github.event.workflow_run.conclusion == 'failure'
     steps:
       - name: failed
+        env:
+          WORKFLOW_RUN_CONTEXT: ${{ toJson(github.event.workflow_run) }}
         # 失敗したときにデバッグ用に情報を出力しておく
         run: |
-          echo 'Haven't met the conditions to merge yet'
-          echo '${{ toJSON(github.event.workflow_run) }}'
+          echo "Haven't met the conditions to merge yet"
+          echo "$WORKFLOW_RUN_CONTEXT"
           exit 1

From b11d670eef05c8579dc6347b14511f2cc2928096 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Tue, 13 Feb 2024 02:29:08 +0900
Subject: [PATCH 72/88] =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E3=83=95?=
 =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=20dockerbuild/php.ini=20=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4=20#839?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dockerbuild/php.ini | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 dockerbuild/php.ini

diff --git a/dockerbuild/php.ini b/dockerbuild/php.ini
deleted file mode 100644
index 8482f7ea93..0000000000
--- a/dockerbuild/php.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-; Optimizations for Symfony, as documented on http://symfony.com/doc/current/performance.html
-opcache.max_accelerated_files = 20000
-opcache.memory_consumption=256
-realpath_cache_size = 4096K
-realpath_cache_ttl = 600

From 7a540b593b12791b4f38ed83c944125859c52ca2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 07:48:06 +0000
Subject: [PATCH 73/88] Bump eslint-config-jquery from 3.0.0 to 3.0.2

Bumps [eslint-config-jquery](https://github.com/jquery/eslint-config-jquery) from 3.0.0 to 3.0.2.
- [Commits](https://github.com/jquery/eslint-config-jquery/compare/v3.0.0...v3.0.2)

---
updated-dependencies:
- dependency-name: eslint-config-jquery
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 54e4696ada..d26ce7bee4 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "babel-loader": "^8.2.5",
     "browser-sync-webpack-plugin": "^2.3.0",
     "eslint": "^8.56.0",
-    "eslint-config-jquery": "^3.0.0",
+    "eslint-config-jquery": "^3.0.2",
     "eslint-plugin-import": "^2.27.5",
     "tar": "^6.2.0",
     "typescript": "^5.3.3",
diff --git a/yarn.lock b/yarn.lock
index b5730a430c..b301763245 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2073,10 +2073,10 @@ 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-config-jquery@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-jquery/-/eslint-config-jquery-3.0.0.tgz#3f6bd0a8cbc1636790a55513d7dbb39783d2be10"
-  integrity sha512-VDdRAIlNq1EM5P7J4JGQSCnZEIvIlNGGTUTCPT2wQNZ2GT69rsAwSIqZVcoiyZbwY7TaaMwLOxwSjqm+DEUjbA==
+eslint-config-jquery@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-jquery/-/eslint-config-jquery-3.0.2.tgz#112f5edf8941feef12b3d22e2107a182d2b35686"
+  integrity sha512-1CdP7AY5ZuhDGUXz+/b7FwhRnDoK0A1swz+2nZ+zpEYJ3EyV085AOAfpFJL2s+ioHDspNQEsGSsl9uUEm9/f/g==
 
 eslint-import-resolver-node@^0.3.7:
   version "0.3.7"

From 062563b2e7f7762774748883fd9477a5c35aa83f Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Fri, 16 Feb 2024 02:17:36 +0900
Subject: [PATCH 74/88] =?UTF-8?q?phpstan=20=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- excludePaths の指定を (暗黙の analyseAndScan ではなく) analyse に限定する。
  - 若干メモリー消費が多くなると思われる。支障があれば、analyseAndScan で良いと思うが後項のような検出漏れを生じるかも。
  - 前項の変更に伴い新たに検出された、エラー `Class SC_SiteView constructor invoked with 1 parameter, 0 required.` を回避する。c893462a51a996a873a2f508766a3472271a1680 で削除されている引数が指定されていたもの。
  - 前項の変更に伴い新たに検出されなくなった、エラーを ignoreErrors から削除する。
- excludePaths/analyseAndScan で、Smarty キャッシュは拡張子で指定する。インストラーのキャッシュも除外される。
- 1973616c6cf6eaaca01bd8ca298aad26e0b0b691 で追記した bootstrapFiles の定義が不要となった様子なので削除する。
---
 data/class/pages/forgot/LC_Page_Forgot.php |  2 +-
 data/class/pages/rss/LC_Page_Rss.php       |  2 +-
 phpstan.neon.dist                          | 24 ++++++++++------------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/data/class/pages/forgot/LC_Page_Forgot.php b/data/class/pages/forgot/LC_Page_Forgot.php
index 8c147f46fc..5b4c4496dd 100644
--- a/data/class/pages/forgot/LC_Page_Forgot.php
+++ b/data/class/pages/forgot/LC_Page_Forgot.php
@@ -277,7 +277,7 @@ public function lfInitSecretCheckParam(&$objFormParam, $device_type)
     public function lfSendMail(&$CONF, $email, $customer_name, $new_password)
     {
         // パスワード変更お知らせメール送信
-        $objMailText = new SC_SiteView_Ex(false);
+        $objMailText = new SC_SiteView_Ex();
         $objMailText->setPage($this);
         $objMailText->assign('customer_name', $customer_name);
         $objMailText->assign('new_password', $new_password);
diff --git a/data/class/pages/rss/LC_Page_Rss.php b/data/class/pages/rss/LC_Page_Rss.php
index 348187a723..61566cfb88 100644
--- a/data/class/pages/rss/LC_Page_Rss.php
+++ b/data/class/pages/rss/LC_Page_Rss.php
@@ -60,7 +60,7 @@ public function init()
      */
     public function process()
     {
-        $objView = new SC_SiteView_Ex(false);
+        $objView = new SC_SiteView_Ex();
 
         //新着情報を取得
         $arrNews = $this->lfGetNews();
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 9d2d392744..d23977b88b 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -2,17 +2,18 @@ parameters:
   level: 1
   bootstrapFiles:
     - tests/require.php
-    - data/vendor/smarty/smarty/libs/plugins/function.html_radios.php
   excludePaths:
-    - data/Smarty/templates_c/*
-    - data/module/SOAP/*
-    - data/vendor/*
-    - data/downloads/*
-    - data/module/Calendar/Engine/PearDate.php
-    - data/class/helper/SC_Helper_Mobile.php
-    - data/class/SC_MobileEmoji.php
-    - data/class/SC_MobileImage.php
-    - data/**/flycheck_*.php
+    analyse:
+      - data/module/SOAP/*
+      - data/vendor/*
+      - data/downloads/*
+      - data/module/Calendar/Engine/PearDate.php
+      - data/class/helper/SC_Helper_Mobile.php
+      - data/class/SC_MobileEmoji.php
+      - data/class/SC_MobileImage.php
+      - data/**/flycheck_*.php
+    analyseAndScan:
+      - *.tpl.php
   ignoreErrors:
     -
       message: "#^Call to an undefined static method PEAR\\:\\:raiseError\\(\\)\\.$#"
@@ -34,9 +35,6 @@ parameters:
     # -
     #   message: "#^Constant SMARTY_PLUGINS_DIR not found\\.$#"
     #   path: data/smarty_extends/*
-    -
-      message: "#^Function smarty_function_escape_special_chars not found\\.$#"
-      path: data/smarty_extends/*
     -
       message: "#^Variable \\$SJIS_widths might not be defined\\.$#"
       path: data/class/helper/SC_Helper_FPDI.php

From 2072299b1bed689a400eb796d19ed7e1a32f4452 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:37:21 +0000
Subject: [PATCH 75/88] Bump @faker-js/faker from 7.6.0 to 8.4.1

Bumps [@faker-js/faker](https://github.com/faker-js/faker) from 7.6.0 to 8.4.1.
- [Release notes](https://github.com/faker-js/faker/releases)
- [Changelog](https://github.com/faker-js/faker/blob/next/CHANGELOG.md)
- [Commits](https://github.com/faker-js/faker/compare/v7.6.0...v8.4.1)

---
updated-dependencies:
- dependency-name: "@faker-js/faker"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 42 ++++--------------------------------------
 2 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 7ced74e1db..4f28ddf5ad 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.20.2",
-    "@faker-js/faker": "^7.6.0",
+    "@faker-js/faker": "^8.4.1",
     "@playwright/test": "^1.41.2",
     "@types/date-fns": "^2.6.0",
     "@types/faker": "^6.6.9",
diff --git a/yarn.lock b/yarn.lock
index f679023772..e8e84bde13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1006,10 +1006,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
   integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
 
-"@faker-js/faker@^7.6.0":
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
-  integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==
+"@faker-js/faker@^8.4.1":
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.4.1.tgz#5d5e8aee8fce48f5e189bf730ebd1f758f491451"
+  integrity sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg==
 
 "@humanwhocodes/config-array@^0.11.13":
   version "0.11.14"
@@ -1203,14 +1203,6 @@
     "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210"
-  integrity sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -1229,11 +1221,6 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd"
-  integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==
-
 "@typescript-eslint/types@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
@@ -1252,19 +1239,6 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/utils@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
@@ -1279,14 +1253,6 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2"
-  integrity sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"

From 6f4586ff32ef37fa08c265b391efa7fbdb328bbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 09:37:50 +0000
Subject: [PATCH 76/88] Bump css-loader from 6.7.3 to 6.10.0

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.7.3 to 6.10.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.7.3...v6.10.0)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 92 +++++++++++++++++-----------------------------------
 2 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/package.json b/package.json
index 7ced74e1db..82be719245 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "license": "GPL",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "css-loader": "^6.7.3",
+    "css-loader": "^6.10.0",
     "date-fns": "^2.29.3",
     "jquery": "3",
     "jquery-colorbox": "^1.6.4",
diff --git a/yarn.lock b/yarn.lock
index f679023772..c0c77de83f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1203,14 +1203,6 @@
     "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.55.0.tgz#e863bab4d4183ddce79967fe10ceb6c829791210"
-  integrity sha512-OK+cIO1ZGhJYNCL//a3ROpsd83psf4dUJ4j7pdNVzd5DmIk+ffkuUIX2vcZQbEW/IR41DYsfJTB19tpCboxQuw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-
 "@typescript-eslint/scope-manager@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
@@ -1229,11 +1221,6 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.55.0.tgz#9830f8d3bcbecf59d12f821e5bc6960baaed41fd"
-  integrity sha512-M4iRh4AG1ChrOL6Y+mETEKGeDnT7Sparn6fhZ5LtVJF1909D5O4uqK+C5NPbLmpfZ0XIIxCdwzKiijpZUOvOug==
-
 "@typescript-eslint/types@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
@@ -1252,19 +1239,6 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
 "@typescript-eslint/utils@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
@@ -1279,14 +1253,6 @@
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.55.0":
-  version "5.55.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.55.0.tgz#01ad414fca8367706d76cdb94adf788dc5b664a2"
-  integrity sha512-q2dlHHwWgirKh1D3acnuApXG+VNXpEY5/AwRxDVuEQpxWaB0jCDe0jFMVMALJ3ebSfuOVE8/rMS+9ZOYGg1GWw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.62.0":
   version "5.62.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
@@ -1836,19 +1802,19 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-loader@^6.7.3:
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd"
-  integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==
+css-loader@^6.10.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.10.0.tgz#7c172b270ec7b833951b52c348861206b184a4b7"
+  integrity sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.19"
+    postcss "^8.4.33"
     postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
-    postcss-modules-scope "^3.0.0"
+    postcss-modules-local-by-default "^4.0.4"
+    postcss-modules-scope "^3.1.1"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
-    semver "^7.3.8"
+    semver "^7.5.4"
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -3082,10 +3048,10 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 natural-compare-lite@^1.4.0:
   version "1.4.0"
@@ -3286,19 +3252,19 @@ postcss-modules-extract-imports@^3.0.0:
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+postcss-modules-local-by-default@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz#7cbed92abd312b94aaea85b68226d3dec39a14e6"
+  integrity sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
     postcss-value-parser "^4.1.0"
 
-postcss-modules-scope@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
-  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+postcss-modules-scope@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz#32cfab55e84887c079a19bbb215e721d683ef134"
+  integrity sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
@@ -3322,12 +3288,12 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.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.19:
-  version "8.4.31"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
+postcss@^8.4.33:
+  version "8.4.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
+  integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==
   dependencies:
-    nanoid "^3.3.6"
+    nanoid "^3.3.7"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -3556,10 +3522,10 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.7, semver@^7.3.8:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+semver@^7.3.7, semver@^7.5.4:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 

From bdf547d8842889a18b5a238aa9ef908775574d16 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Wed, 21 Feb 2024 14:22:09 +0900
Subject: [PATCH 77/88] =?UTF-8?q?=E5=86=8D=E3=82=A4=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=83=BC=E3=83=AB=E6=99=82=E3=80=8CSMTP=20=E3=83=9B?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=80=8D=E7=AD=89=E3=81=8C=E3=82=B0=E3=83=AC?=
 =?UTF-8?q?=E3=83=BC=E3=83=80=E3=82=A6=E3=83=B3=E3=81=97=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=20#846?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/install/templates/step1.tpl | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl
index 01da4d74b1..1e299f3abe 100644
--- a/html/install/templates/step1.tpl
+++ b/html/install/templates/step1.tpl
@@ -22,21 +22,17 @@
 <script type="text/javascript">
 $(function() {
     $('.option').hide();
-    if ($('input[name=mail_backend]').val() == 'smtp') {
-        $('.smtp').attr('disabled', false);
-    } else {
-        $('.smtp').attr('disabled', true);
-    }
+    changeSmtpDisabled();
     $('#options').click(function() {
         $('.option').slideToggle();
     });
     $('input[name=mail_backend]').change(function() {
-        if ($(this).val() == 'smtp') {
-            $('.smtp').attr('disabled', false);
-        } else {
-            $('.smtp').attr('disabled', true);
-        }
+        changeSmtpDisabled();
     });
+    function changeSmtpDisabled() {
+        let disabled = $('input[name=mail_backend]:checked').val() != 'smtp';
+        $('.smtp').attr('disabled', disabled);
+    }
 });
 </script>
 <!--{strip}-->

From ed3153ac704d9b5dd0dfc8dc53046ba8b73b31a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 07:56:16 +0000
Subject: [PATCH 78/88] Bump @babel/preset-env from 7.20.2 to 7.23.9

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.20.2 to 7.23.9.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.9/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |    2 +-
 yarn.lock    | 1172 ++++++++++++++++++++++++++------------------------
 2 files changed, 606 insertions(+), 568 deletions(-)

diff --git a/package.json b/package.json
index bf7c4f582a..e9c513247e 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-env": "^7.23.9",
     "@faker-js/faker": "^8.4.1",
     "@playwright/test": "^1.41.2",
     "@types/date-fns": "^2.6.0",
diff --git a/yarn.lock b/yarn.lock
index fec7a1c62e..679759ec3b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23,12 +23,7 @@
     "@babel/highlight" "^7.23.4"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
-  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
-
-"@babel/compat-data@^7.23.5":
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98"
   integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==
@@ -71,15 +66,21 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
+"@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
+  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.15"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.23.6":
+"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
   integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
@@ -90,20 +91,22 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b"
-  integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==
+"@babel/helper-create-class-features-plugin@^7.22.15":
+  version "7.23.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz#25d55fafbaea31fd0e723820bb6cc3df72edf7ea"
+  integrity sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.9"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-member-expression-to-functions" "^7.23.0"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
   integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
@@ -111,44 +114,32 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-create-regexp-features-plugin@^7.22.15", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
+  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    regexpu-core "^5.3.1"
+    semver "^6.3.1"
+
+"@babel/helper-define-polyfill-provider@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz#465805b7361f461e86c680f1de21eaf88c25901b"
+  integrity sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
-    semver "^6.1.2"
-
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
 "@babel/helper-environment-visitor@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
-
-"@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -156,13 +147,6 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
@@ -170,19 +154,12 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
-  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
-  dependencies:
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+"@babel/helper-member-expression-to-functions@^7.22.15", "@babel/helper-member-expression-to-functions@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
+  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-module-imports@^7.22.15":
   version "7.22.15"
@@ -191,7 +168,7 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.23.3":
+"@babel/helper-module-transforms@^7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
   integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
@@ -202,45 +179,35 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
   dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
 
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9", "@babel/helper-replace-supers@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
-  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
+"@babel/helper-remap-async-to-generator@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
+  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.19.1"
-    "@babel/types" "^7.19.0"
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-wrap-function" "^7.22.20"
 
-"@babel/helper-simple-access@^7.19.4":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+"@babel/helper-replace-supers@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
+  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
   dependencies:
-    "@babel/types" "^7.20.2"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-member-expression-to-functions" "^7.22.15"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
 
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
@@ -249,19 +216,12 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
-  integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
-  dependencies:
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
 "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
@@ -275,35 +235,24 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
   integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
 
-"@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
-  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
-
 "@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
-  integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
+"@babel/helper-wrap-function@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
+  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.0"
-    "@babel/types" "^7.19.0"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.22.19"
 
 "@babel/helpers@^7.23.9":
   version "7.23.9"
@@ -328,150 +277,34 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
   integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
-  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-
-"@babel/plugin-proposal-async-generator-functions@^7.20.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
-  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-proposal-class-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
-  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
-"@babel/plugin-proposal-class-static-block@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
-  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
-  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
-  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
-  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
-  dependencies:
-    "@babel/compat-data" "^7.20.1"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.1"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
-  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz#5cd1c87ba9380d0afb78469292c954fee5d2411a"
+  integrity sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-proposal-private-methods@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
-  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz#f6652bb16b94f8f9c20c50941e16e9756898dc5d"
+  integrity sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.23.3"
 
-"@babel/plugin-proposal-private-property-in-object@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
-  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7":
+  version "7.23.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b"
+  integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
-  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -508,12 +341,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+"@babel/plugin-syntax-import-assertions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz#9c05a7f592982aff1a2768260ad84bcd3f0c77fc"
+  integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz#992aee922cf04512461d7dae3ff6951b90a2dc06"
+  integrity sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
@@ -578,255 +425,401 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.18.6":
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
-  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
-  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
+"@babel/plugin-transform-arrow-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz#94c6dcfd731af90f27a79509f9ab7fb2120fc38b"
+  integrity sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-remap-async-to-generator" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+"@babel/plugin-transform-async-generator-functions@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz#9adaeb66fc9634a586c5df139c6240d41ed801ce"
+  integrity sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-block-scoping@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz#f59b1767e6385c663fd0bce655db6ca9c8b236ed"
-  integrity sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==
+"@babel/plugin-transform-async-to-generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz#d1f513c7a8a506d43f47df2bf25f9254b0b051fa"
+  integrity sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-imports" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.20"
 
-"@babel/plugin-transform-classes@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
-  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
+"@babel/plugin-transform-block-scoped-functions@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz#fe1177d715fb569663095e04f3598525d98e8c77"
+  integrity sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.19.1"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz#b2d38589531c6c80fbe25e6b58e763622d2d3cf5"
+  integrity sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz#35c377db11ca92a785a718b6aa4e3ed1eb65dc48"
+  integrity sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz#2a202c8787a8964dd11dfcedf994d36bfc844ab5"
+  integrity sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.23.8":
+  version "7.23.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz#d08ae096c240347badd68cdf1b6d1624a6435d92"
+  integrity sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
+    "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
-  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
+"@babel/plugin-transform-computed-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz#652e69561fcc9d2b50ba4f7ac7f60dcf65e86474"
+  integrity sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.15"
 
-"@babel/plugin-transform-destructuring@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
-  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
+"@babel/plugin-transform-destructuring@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz#8c9ee68228b12ae3dff986e56ed1ba4f3c446311"
+  integrity sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+"@babel/plugin-transform-dotall-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz#3f7af6054882ede89c378d0cf889b854a993da50"
+  integrity sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+"@babel/plugin-transform-duplicate-keys@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz#664706ca0a5dfe8d066537f99032fc1dc8b720ce"
+  integrity sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+"@babel/plugin-transform-dynamic-import@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz#c7629e7254011ac3630d47d7f34ddd40ca535143"
+  integrity sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
-  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
+"@babel/plugin-transform-exponentiation-operator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz#ea0d978f6b9232ba4722f3dbecdd18f450babd18"
+  integrity sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+"@babel/plugin-transform-export-namespace-from@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz#084c7b25e9a5c8271e987a08cf85807b80283191"
+  integrity sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+"@babel/plugin-transform-for-of@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz#81c37e24171b37b370ba6aaffa7ac86bcb46f94e"
+  integrity sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+"@babel/plugin-transform-function-name@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz#8f424fcd862bf84cb9a1a6b42bc2f47ed630f8dc"
+  integrity sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
-  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
+"@babel/plugin-transform-json-strings@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz#a871d9b6bd171976efad2e43e694c961ffa3714d"
+  integrity sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
-  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
+"@babel/plugin-transform-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz#8214665f00506ead73de157eba233e7381f3beb4"
+  integrity sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-simple-access" "^7.19.4"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
-  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
+"@babel/plugin-transform-logical-assignment-operators@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz#e599f82c51d55fac725f62ce55d3a0886279ecb5"
+  integrity sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+"@babel/plugin-transform-member-expression-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz#e37b3f0502289f477ac0e776b05a833d853cabcc"
+  integrity sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
-  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
+"@babel/plugin-transform-modules-amd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz#e19b55436a1416829df0a1afc495deedfae17f7d"
+  integrity sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+"@babel/plugin-transform-modules-commonjs@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz#661ae831b9577e52be57dd8356b734f9700b53b4"
+  integrity sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+"@babel/plugin-transform-modules-systemjs@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz#105d3ed46e4a21d257f83a2f9e2ee4203ceda6be"
+  integrity sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/plugin-transform-parameters@^7.20.1":
-  version "7.20.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz#7b3468d70c3c5b62e46be0a47b6045d8590fb748"
-  integrity sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==
+"@babel/plugin-transform-modules-umd@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz#5d4395fccd071dfefe6585a4411aa7d6b7d769e9"
+  integrity sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
-  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
+"@babel/plugin-transform-new-target@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz#5491bb78ed6ac87e990957cea367eab781c4d980"
+  integrity sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    regenerator-transform "^0.15.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz#45556aad123fc6e52189ea749e33ce090637346e"
+  integrity sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+"@babel/plugin-transform-numeric-separator@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz#03d08e3691e405804ecdd19dd278a40cca531f29"
+  integrity sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-transform-spread@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
-  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
+"@babel/plugin-transform-object-rest-spread@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz#2b9c2d26bf62710460bdc0d1730d4f1048361b83"
+  integrity sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/compat-data" "^7.23.3"
+    "@babel/helper-compilation-targets" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.23.3"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+"@babel/plugin-transform-object-super@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz#81fdb636dcb306dd2e4e8fd80db5b2362ed2ebcd"
+  integrity sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.20"
 
-"@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+"@babel/plugin-transform-optional-catch-binding@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz#318066de6dacce7d92fa244ae475aa8d91778017"
+  integrity sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+"@babel/plugin-transform-optional-chaining@^7.23.3", "@babel/plugin-transform-optional-chaining@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz#6acf61203bdfc4de9d4e52e64490aeb3e52bd017"
+  integrity sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+"@babel/plugin-transform-parameters@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz#83ef5d1baf4b1072fa6e54b2b0999a7b2527e2af"
+  integrity sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+"@babel/plugin-transform-private-methods@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz#b2d7a3c97e278bfe59137a978d53b2c2e038c0e4"
+  integrity sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-property-in-object@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz#3ec711d05d6608fd173d9b8de39872d8dbf68bf5"
+  integrity sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz#54518f14ac4755d22b92162e4a852d308a560875"
+  integrity sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-regenerator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz#141afd4a2057298602069fce7f2dc5173e6c561c"
+  integrity sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    regenerator-transform "^0.15.2"
+
+"@babel/plugin-transform-reserved-words@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz#4130dcee12bd3dd5705c587947eb715da12efac8"
+  integrity sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-shorthand-properties@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz#97d82a39b0e0c24f8a981568a8ed851745f59210"
+  integrity sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-spread@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz#41d17aacb12bde55168403c6f2d6bdca563d362c"
+  integrity sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
+"@babel/plugin-transform-sticky-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz#dec45588ab4a723cb579c609b294a3d1bd22ff04"
+  integrity sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-template-literals@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz#5f0f028eb14e50b5d0f76be57f90045757539d07"
+  integrity sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz#9dfab97acc87495c0c449014eb9c547d8966bca4"
+  integrity sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz#1f66d16cab01fab98d784867d24f70c1ca65b925"
+  integrity sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-property-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz#19e234129e5ffa7205010feec0d94c251083d7ad"
+  integrity sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz#26897708d8f42654ca4ce1b73e96140fbad879dc"
+  integrity sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz#4fb6f0a719c2c5859d11f6b55a050cc987f3799e"
+  integrity sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.15"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/polyfill@^7.12.1":
   version "7.12.1"
@@ -836,38 +829,27 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
-  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
-  dependencies:
-    "@babel/compat-data" "^7.20.1"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.18.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+"@babel/preset-env@^7.23.9":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.9.tgz#beace3b7994560ed6bf78e4ae2073dff45387669"
+  integrity sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==
+  dependencies:
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-import-assertions" "^7.23.3"
+    "@babel/plugin-syntax-import-attributes" "^7.23.3"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -877,57 +859,76 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.18.6"
-    "@babel/plugin-transform-async-to-generator" "^7.18.6"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.20.2"
-    "@babel/plugin-transform-classes" "^7.20.2"
-    "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.20.2"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.18.8"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.19.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.20.1"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.18.6"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.19.0"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.20.2"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.23.3"
+    "@babel/plugin-transform-async-generator-functions" "^7.23.9"
+    "@babel/plugin-transform-async-to-generator" "^7.23.3"
+    "@babel/plugin-transform-block-scoped-functions" "^7.23.3"
+    "@babel/plugin-transform-block-scoping" "^7.23.4"
+    "@babel/plugin-transform-class-properties" "^7.23.3"
+    "@babel/plugin-transform-class-static-block" "^7.23.4"
+    "@babel/plugin-transform-classes" "^7.23.8"
+    "@babel/plugin-transform-computed-properties" "^7.23.3"
+    "@babel/plugin-transform-destructuring" "^7.23.3"
+    "@babel/plugin-transform-dotall-regex" "^7.23.3"
+    "@babel/plugin-transform-duplicate-keys" "^7.23.3"
+    "@babel/plugin-transform-dynamic-import" "^7.23.4"
+    "@babel/plugin-transform-exponentiation-operator" "^7.23.3"
+    "@babel/plugin-transform-export-namespace-from" "^7.23.4"
+    "@babel/plugin-transform-for-of" "^7.23.6"
+    "@babel/plugin-transform-function-name" "^7.23.3"
+    "@babel/plugin-transform-json-strings" "^7.23.4"
+    "@babel/plugin-transform-literals" "^7.23.3"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.23.4"
+    "@babel/plugin-transform-member-expression-literals" "^7.23.3"
+    "@babel/plugin-transform-modules-amd" "^7.23.3"
+    "@babel/plugin-transform-modules-commonjs" "^7.23.3"
+    "@babel/plugin-transform-modules-systemjs" "^7.23.9"
+    "@babel/plugin-transform-modules-umd" "^7.23.3"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.23.3"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.23.4"
+    "@babel/plugin-transform-numeric-separator" "^7.23.4"
+    "@babel/plugin-transform-object-rest-spread" "^7.23.4"
+    "@babel/plugin-transform-object-super" "^7.23.3"
+    "@babel/plugin-transform-optional-catch-binding" "^7.23.4"
+    "@babel/plugin-transform-optional-chaining" "^7.23.4"
+    "@babel/plugin-transform-parameters" "^7.23.3"
+    "@babel/plugin-transform-private-methods" "^7.23.3"
+    "@babel/plugin-transform-private-property-in-object" "^7.23.4"
+    "@babel/plugin-transform-property-literals" "^7.23.3"
+    "@babel/plugin-transform-regenerator" "^7.23.3"
+    "@babel/plugin-transform-reserved-words" "^7.23.3"
+    "@babel/plugin-transform-shorthand-properties" "^7.23.3"
+    "@babel/plugin-transform-spread" "^7.23.3"
+    "@babel/plugin-transform-sticky-regex" "^7.23.3"
+    "@babel/plugin-transform-template-literals" "^7.23.3"
+    "@babel/plugin-transform-typeof-symbol" "^7.23.3"
+    "@babel/plugin-transform-unicode-escapes" "^7.23.3"
+    "@babel/plugin-transform-unicode-property-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-regex" "^7.23.3"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.23.3"
+    "@babel/preset-modules" "0.1.6-no-external-plugins"
+    babel-plugin-polyfill-corejs2 "^0.4.8"
+    babel-plugin-polyfill-corejs3 "^0.9.0"
+    babel-plugin-polyfill-regenerator "^0.5.5"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
 
-"@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+"@babel/preset-modules@0.1.6-no-external-plugins":
+  version "0.1.6-no-external-plugins"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
 "@babel/runtime@^7.8.4":
   version "7.17.2"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
@@ -935,7 +936,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.18.10", "@babel/template@^7.22.15", "@babel/template@^7.23.9":
+"@babel/template@^7.22.15", "@babel/template@^7.23.9":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a"
   integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==
@@ -944,7 +945,7 @@
     "@babel/parser" "^7.23.9"
     "@babel/types" "^7.23.9"
 
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.23.9", "@babel/traverse@^7.7.0":
+"@babel/traverse@^7.23.9", "@babel/traverse@^7.7.0":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950"
   integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==
@@ -960,7 +961,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.18.6", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002"
   integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==
@@ -1563,29 +1564,29 @@ babel-loader@^8.2.5:
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+babel-plugin-polyfill-corejs2@^0.4.8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz#dbcc3c8ca758a290d47c3c6a490d59429b0d2269"
+  integrity sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==
   dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
+    "@babel/compat-data" "^7.22.6"
+    "@babel/helper-define-polyfill-provider" "^0.5.0"
+    semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs3@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz#9eea32349d94556c2ad3ab9b82ebb27d4bf04a81"
+  integrity sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
+    "@babel/helper-define-polyfill-provider" "^0.5.0"
+    core-js-compat "^3.34.0"
 
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-regenerator@^0.5.5:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz#8b0c8fc6434239e5d7b8a9d1f832bb2b0310f06a"
+  integrity sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.5.0"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -1626,7 +1627,7 @@ browser-sync-webpack-plugin@^2.3.0:
   dependencies:
     lodash "^4"
 
-browserslist@^4.14.5, browserslist@^4.21.4:
+browserslist@^4.14.5:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
   integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
@@ -1646,6 +1647,16 @@ browserslist@^4.22.2:
     node-releases "^2.0.14"
     update-browserslist-db "^1.0.13"
 
+browserslist@^4.22.3:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+  dependencies:
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -1674,6 +1685,11 @@ caniuse-lite@^1.0.30001580:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4"
   integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==
 
+caniuse-lite@^1.0.30001587:
+  version "1.0.30001588"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz#07f16b65a7f95dba82377096923947fb25bce6e3"
+  integrity sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1776,12 +1792,12 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-core-js-compat@^3.25.1:
-  version "3.25.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.25.5.tgz#0016e8158c904f7b059486639e6e82116eafa7d9"
-  integrity sha512-ovcyhs2DEBUIE0MGEKHP4olCUW/XYte3Vroyxuh38rD1wAO4dHohsovUC4eAOuzFxE6b+RXvBU3UZ9o0YhUTkA==
+core-js-compat@^3.31.0, core-js-compat@^3.34.0:
+  version "3.36.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.36.0.tgz#087679119bc2fdbdefad0d45d8e5d307d45ba190"
+  integrity sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==
   dependencies:
-    browserslist "^4.21.4"
+    browserslist "^4.22.3"
 
 core-js@^2.6.5:
   version "2.6.12"
@@ -1911,6 +1927,11 @@ electron-to-chromium@^1.4.648:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4"
   integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==
 
+electron-to-chromium@^1.4.668:
+  version "1.4.677"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.677.tgz#49ee77713516740bdde32ac2d1443c444f0dafe7"
+  integrity sha512-erDa3CaDzwJOpyvfKhOiJjBVNnMM0qxHq47RheVVwsSQrgBA9ZSGV9kdaOfZDPXcHzhG7lBxhj6A7KvfLJBd6Q==
+
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -3353,10 +3374,10 @@ regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
-regenerator-transform@^0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
-  integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
+regenerator-transform@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
@@ -3381,6 +3402,18 @@ regexpu-core@^5.1.0:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
+  dependencies:
+    "@babel/regjsgen" "^0.8.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
 regjsgen@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
@@ -3517,7 +3550,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -3855,6 +3888,11 @@ unicode-match-property-value-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
+
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"

From 45e5340a6aaf80bb60467bbb02744f940ae8578b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:28:42 +0000
Subject: [PATCH 79/88] Bump svenstaro/upload-release-action from 2.7.0 to
 2.9.0

Bumps [svenstaro/upload-release-action](https://github.com/svenstaro/upload-release-action) from 2.7.0 to 2.9.0.
- [Release notes](https://github.com/svenstaro/upload-release-action/releases)
- [Changelog](https://github.com/svenstaro/upload-release-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenstaro/upload-release-action/compare/2.7.0...2.9.0)

---
updated-dependencies:
- dependency-name: svenstaro/upload-release-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5cae9a1f12..77cf5c005d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -180,7 +180,7 @@ jobs:
 
       - name: Upload binaries to release of TGZ
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz
@@ -189,7 +189,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip
@@ -198,7 +198,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ md5 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.md5
@@ -207,7 +207,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ sha1 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.sha1
@@ -216,7 +216,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ sha256 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.sha256
@@ -225,7 +225,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP md5 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.md5
@@ -234,7 +234,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP sha1 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.sha1
@@ -243,7 +243,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP sha256 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@2.7.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.sha256

From 310633d85443c1bacd907ca43b9dfa7fb2e042ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:36:24 +0000
Subject: [PATCH 80/88] Bump eslint-plugin-import from 2.27.5 to 2.29.1

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.27.5 to 2.29.1.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.27.5...v2.29.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 681 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 437 insertions(+), 246 deletions(-)

diff --git a/package.json b/package.json
index 15af547075..6a5e2cfecf 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "browser-sync-webpack-plugin": "^2.3.0",
     "eslint": "^8.56.0",
     "eslint-config-jquery": "^3.0.2",
-    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import": "^2.29.1",
     "tar": "^6.2.0",
     "typescript": "^5.3.3",
     "webpack-cli": "^4.10.0",
diff --git a/yarn.lock b/yarn.lock
index b073f27e4e..baf5f695cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1474,15 +1474,23 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-buffer-byte-length@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
+  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
+  dependencies:
+    call-bind "^1.0.5"
+    is-array-buffer "^3.0.4"
+
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
     is-string "^1.0.7"
 
 array-union@^2.1.0:
@@ -1490,26 +1498,62 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.flat@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
-  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
+array.prototype.filter@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz#423771edeb417ff5914111fff4277ea0624c0d0e"
+  integrity sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.7"
+
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f"
+  integrity sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==
+  dependencies:
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.3.0"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
     es-shim-unscopables "^1.0.0"
 
+arraybuffer.prototype.slice@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6"
+  integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.2.1"
+    get-intrinsic "^1.2.3"
+    is-array-buffer "^3.0.4"
+    is-shared-array-buffer "^1.0.2"
+
 asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
@@ -1532,6 +1576,13 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
+available-typed-arrays@^1.0.6, available-typed-arrays@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
+  integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
+  dependencies:
+    possible-typed-array-names "^1.0.0"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -1670,6 +1721,17 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1868,6 +1930,15 @@ deep-is@^0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
+define-data-property@^1.0.1, define-data-property@^1.1.2, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
+  dependencies:
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    gopd "^1.0.1"
+
 define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -1875,11 +1946,12 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
-define-properties@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
-  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+define-properties@^1.2.0, define-properties@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
+    define-data-property "^1.0.1"
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
@@ -1950,84 +2022,83 @@ envinfo@^7.7.3:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
-es-abstract@^1.19.0:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
-    is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
-
-es-abstract@^1.20.4:
-  version "1.21.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
-  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    es-set-tostringtag "^2.0.1"
+es-abstract@^1.22.1, es-abstract@^1.22.3:
+  version "1.22.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.4.tgz#26eb2e7538c3271141f5754d31aabfdb215f27bf"
+  integrity sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    arraybuffer.prototype.slice "^1.0.3"
+    available-typed-arrays "^1.0.6"
+    call-bind "^1.0.7"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    es-set-tostringtag "^2.0.2"
     es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.4"
+    get-symbol-description "^1.0.2"
     globalthis "^1.0.3"
     gopd "^1.0.1"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
+    has-property-descriptors "^1.0.2"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.4"
-    is-array-buffer "^3.0.1"
+    hasown "^2.0.1"
+    internal-slot "^1.0.7"
+    is-array-buffer "^3.0.4"
     is-callable "^1.2.7"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
-    is-typed-array "^1.1.10"
+    is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
+    object-inspect "^1.13.1"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.6"
-    string.prototype.trimstart "^1.0.6"
+    object.assign "^4.1.5"
+    regexp.prototype.flags "^1.5.2"
+    safe-array-concat "^1.1.0"
+    safe-regex-test "^1.0.3"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.1"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.14"
+
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.0.0, es-errors@^1.2.1, es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
-es-set-tostringtag@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
-  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+es-set-tostringtag@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777"
+  integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
-    has-tostringtag "^1.0.0"
+    get-intrinsic "^1.2.4"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.1"
 
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
@@ -2036,6 +2107,13 @@ es-shim-unscopables@^1.0.0:
   dependencies:
     has "^1.0.3"
 
+es-shim-unscopables@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -2065,42 +2143,44 @@ eslint-config-jquery@^3.0.2:
   resolved "https://registry.yarnpkg.com/eslint-config-jquery/-/eslint-config-jquery-3.0.2.tgz#112f5edf8941feef12b3d22e2107a182d2b35686"
   integrity sha512-1CdP7AY5ZuhDGUXz+/b7FwhRnDoK0A1swz+2nZ+zpEYJ3EyV085AOAfpFJL2s+ioHDspNQEsGSsl9uUEm9/f/g==
 
-eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
-eslint-module-utils@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+eslint-module-utils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+eslint-plugin-import@^2.29.1:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
+  integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
   dependencies:
-    array-includes "^3.1.6"
-    array.prototype.flat "^1.3.1"
-    array.prototype.flatmap "^1.3.1"
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
     debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
-    has "^1.0.3"
-    is-core-module "^2.11.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.8.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
+    semver "^6.3.1"
+    tsconfig-paths "^3.15.0"
 
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -2368,17 +2448,22 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -2388,7 +2473,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -2406,13 +2491,25 @@ get-intrinsic@^1.1.3:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
+get-symbol-description@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
+  integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==
+  dependencies:
+    call-bind "^1.0.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.4"
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -2540,11 +2637,23 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-property-descriptors@^1.0.1, has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
+  dependencies:
+    es-define-property "^1.0.0"
+
 has-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
   integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
 
+has-proto@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -2557,6 +2666,13 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
+has-tostringtag@^1.0.1, has-tostringtag@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
+  integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==
+  dependencies:
+    has-symbols "^1.0.3"
+
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -2564,6 +2680,13 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
+hasown@^2.0.0, hasown@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa"
+  integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==
+  dependencies:
+    function-bind "^1.1.2"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -2617,22 +2740,13 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
-  dependencies:
-    get-intrinsic "^1.1.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
-
-internal-slot@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
-  integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
+internal-slot@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
+  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
   dependencies:
-    get-intrinsic "^1.1.3"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    hasown "^2.0.0"
     side-channel "^1.0.4"
 
 interpret@^2.2.0:
@@ -2640,14 +2754,13 @@ interpret@^2.2.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
-is-array-buffer@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a"
-  integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==
+is-array-buffer@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
+  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
   dependencies:
     call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    is-typed-array "^1.1.10"
+    get-intrinsic "^1.2.1"
 
 is-bigint@^1.0.1:
   version "1.0.4"
@@ -2669,17 +2782,17 @@ is-callable@^1.1.3, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
+is-callable@^1.1.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.11.0, is-core-module@^2.9.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
-  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.9.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.5"
@@ -2700,7 +2813,7 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   dependencies:
     is-extglob "^2.1.1"
 
-is-negative-zero@^2.0.1, is-negative-zero@^2.0.2:
+is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
@@ -2737,11 +2850,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -2763,7 +2871,14 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+is-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
+  integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
+  dependencies:
+    which-typed-array "^1.1.14"
+
+is-typed-array@^1.1.9:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
@@ -2779,13 +2894,18 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-weakref@^1.0.1, is-weakref@^1.0.2:
+is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -2886,7 +3006,7 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^1.0.1:
+json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
@@ -3104,49 +3224,59 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
+object-inspect@^1.9.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
   integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
 
-object-inspect@^1.12.2:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
-  integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
-
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+object.assign@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.groupby@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.2.tgz#494800ff5bab78fd0eff2835ec859066e00192ec"
+  integrity sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==
+  dependencies:
+    array.prototype.filter "^1.0.3"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
+    es-abstract "^1.22.3"
+    es-errors "^1.0.0"
+
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 once@^1.3.0:
   version "1.4.0"
@@ -3268,6 +3398,11 @@ playwright@1.41.2:
   optionalDependencies:
     fsevents "2.3.2"
 
+possible-typed-array-names@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
+  integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
+
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
@@ -3381,14 +3516,15 @@ regenerator-transform@^0.15.2:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
+  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
+    call-bind "^1.0.6"
+    define-properties "^1.2.1"
+    es-errors "^1.3.0"
+    set-function-name "^2.0.1"
 
 regexpu-core@^5.1.0:
   version "5.2.1"
@@ -3485,7 +3621,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.12.0, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
+resolve@^1.12.0, resolve@^1.14.2, resolve@^1.9.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -3494,6 +3630,15 @@ resolve@^1.12.0, resolve@^1.14.2, resolve@^1.22.1, resolve@^1.9.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -3513,18 +3658,28 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+safe-array-concat@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692"
+  integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==
+  dependencies:
+    call-bind "^1.0.5"
+    get-intrinsic "^1.2.2"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex-test@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+safe-regex-test@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
+  integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
+    call-bind "^1.0.6"
+    es-errors "^1.3.0"
     is-regex "^1.1.4"
 
 safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
@@ -3550,7 +3705,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
+semver@^6.0.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -3569,6 +3724,28 @@ serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+set-function-length@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425"
+  integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==
+  dependencies:
+    define-data-property "^1.1.2"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.1"
+
+set-function-name@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
+  integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.2"
+
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -3645,39 +3822,32 @@ stealthy-require@^1.1.1:
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
   integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-string.prototype.trimend@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
-  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
-string.prototype.trimstart@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
-  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
 
 strip-ansi@^6.0.1:
   version "6.0.1"
@@ -3790,13 +3960,13 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tsconfig-paths@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
+    json5 "^1.0.2"
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
@@ -3836,6 +4006,38 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+typed-array-buffer@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3"
+  integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==
+  dependencies:
+    call-bind "^1.0.7"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67"
+  integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063"
+  integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-proto "^1.0.3"
+    is-typed-array "^1.1.13"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -3850,16 +4052,6 @@ typescript@^5.3.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
   integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -4029,17 +4221,16 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.14:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06"
+  integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
+    available-typed-arrays "^1.0.6"
+    call-bind "^1.0.5"
     for-each "^0.3.3"
     gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
+    has-tostringtag "^1.0.1"
 
 which@^2.0.1:
   version "2.0.2"

From 6876273b07ba1ba0df7177e8cddb7f885afd3089 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:37:46 +0000
Subject: [PATCH 81/88] Bump date-fns from 2.29.3 to 3.3.1

Bumps [date-fns](https://github.com/date-fns/date-fns) from 2.29.3 to 3.3.1.
- [Release notes](https://github.com/date-fns/date-fns/releases)
- [Changelog](https://github.com/date-fns/date-fns/blob/main/CHANGELOG.md)
- [Commits](https://github.com/date-fns/date-fns/compare/v2.29.3...v3.3.1)

---
updated-dependencies:
- dependency-name: date-fns
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 15af547075..6292e6a3fb 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
     "css-loader": "^6.10.0",
-    "date-fns": "^2.29.3",
+    "date-fns": "^3.3.1",
     "jquery": "3",
     "jquery-colorbox": "^1.6.4",
     "jquery-easing": "^0.0.1",
diff --git a/yarn.lock b/yarn.lock
index b073f27e4e..58855ff47d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1844,10 +1844,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@*, date-fns@^2.29.3:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
-  integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==
+date-fns@*, date-fns@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.3.1.tgz#7581daca0892d139736697717a168afbb908cfed"
+  integrity sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==
 
 debug@^3.2.7:
   version "3.2.7"

From 35b59101f9a0d4f982fcd9671fccd141e5066aae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:38:12 +0000
Subject: [PATCH 82/88] Bump jquery from 3.6.4 to 3.7.1

Bumps [jquery](https://github.com/jquery/jquery) from 3.6.4 to 3.7.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.4...3.7.1)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b073f27e4e..cf27233f97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2830,9 +2830,9 @@ jquery-migrate@^3.4.1:
   integrity sha512-6RaV23lLAYccu8MtLfy2sIxOvx+bulnWHm/pvffAi7KOzPk1sN9IYglpkl1ZNCj1FSgSNDPS2fSZ1hWsXc200Q==
 
 jquery@*, jquery@3, jquery@>=1.3.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.4.tgz#ba065c188142100be4833699852bf7c24dc0252f"
-  integrity sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
+  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
 
 js-tokens@^4.0.0:
   version "4.0.0"

From 91f8dae81dc26662b3b9c7e2da5d3f7bbdc3eb3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:38:53 +0000
Subject: [PATCH 83/88] Bump webpack from 5.76.0 to 5.90.3

Bumps [webpack](https://github.com/webpack/webpack) from 5.76.0 to 5.90.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.76.0...v5.90.3)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 396 +++++++++++++++++++++++----------------------------
 2 files changed, 179 insertions(+), 219 deletions(-)

diff --git a/package.json b/package.json
index 15af547075..43fe591e8b 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "slick-carousel": "^1.8.1",
     "style-loader": "^3.3.4",
     "url-loader": "^4.1.1",
-    "webpack": "^5.76.0"
+    "webpack": "^5.90.3"
   },
   "devDependencies": {
     "@babel/core": "^7.23.9",
diff --git a/yarn.lock b/yarn.lock
index b073f27e4e..8e38189139 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1053,15 +1053,20 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
 "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
@@ -1071,6 +1076,11 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
 "@jridgewell/trace-mapping@^0.3.17":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
@@ -1079,6 +1089,14 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.20":
+  version "0.3.23"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.23.tgz#afc96847f3f07841477f303eed687707a5aacd80"
+  integrity sha512-9/4foRoUKp8s96tSkh8DlAAc5A0Ty8vLXld+l9gjKKY6ckwI8G15f0hskGmuLZu78ZlGa1vtsfOa+lnB4vG6Jg==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
@@ -1138,10 +1156,10 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.51":
-  version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
-  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
+"@types/estree@*", "@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/faker@^6.6.9":
   version "6.6.9"
@@ -1267,125 +1285,125 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@webassemblyjs/ast@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
-  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
   dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
-"@webassemblyjs/floating-point-hex-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
-  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
-"@webassemblyjs/helper-api-error@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
-  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
-  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+"@webassemblyjs/helper-buffer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
 
-"@webassemblyjs/helper-numbers@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
-  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
-  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
-  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
 
-"@webassemblyjs/ieee754@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
-  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
-  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
-  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
-
-"@webassemblyjs/wasm-edit@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
-  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/helper-wasm-section" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-opt" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    "@webassemblyjs/wast-printer" "1.11.1"
-
-"@webassemblyjs/wasm-gen@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
-  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wasm-opt@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
-  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-buffer" "1.11.1"
-    "@webassemblyjs/wasm-gen" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-
-"@webassemblyjs/wasm-parser@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
-  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/helper-api-error" "1.11.1"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
-    "@webassemblyjs/ieee754" "1.11.1"
-    "@webassemblyjs/leb128" "1.11.1"
-    "@webassemblyjs/utf8" "1.11.1"
-
-"@webassemblyjs/wast-printer@1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
-  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.1"
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+
+"@webassemblyjs/wasm-edit@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
+
+"@webassemblyjs/wasm-gen@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
     "@xtuc/long" "4.2.2"
 
 "@webpack-cli/configtest@^1.2.0":
@@ -1415,22 +1433,17 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-acorn-import-assertions@^1.7.6:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
-  integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.5.0, acorn@^8.7.1:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
-
-acorn@^8.9.0:
+acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -1627,27 +1640,7 @@ browser-sync-webpack-plugin@^2.3.0:
   dependencies:
     lodash "^4"
 
-browserslist@^4.14.5:
-  version "4.21.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
-  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
-  dependencies:
-    caniuse-lite "^1.0.30001400"
-    electron-to-chromium "^1.4.251"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.9"
-
-browserslist@^4.22.2:
-  version "4.22.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6"
-  integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==
-  dependencies:
-    caniuse-lite "^1.0.30001580"
-    electron-to-chromium "^1.4.648"
-    node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
-
-browserslist@^4.22.3:
+browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.22.3:
   version "4.23.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
   integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
@@ -1675,16 +1668,6 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001414"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001414.tgz#5f1715e506e71860b4b07c50060ea6462217611e"
-  integrity sha512-t55jfSaWjCdocnFdKQoO+d2ct9C59UZg4dY3OnUlSZ447r8pUtIKdp0hpAzrGFultmTC+Us+KpKi4GZl/LXlFg==
-
-caniuse-lite@^1.0.30001580:
-  version "1.0.30001581"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4"
-  integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==
-
 caniuse-lite@^1.0.30001587:
   version "1.0.30001588"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz#07f16b65a7f95dba82377096923947fb25bce6e3"
@@ -1917,16 +1900,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-electron-to-chromium@^1.4.251:
-  version "1.4.270"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.270.tgz#2c6ea409b45cdb5c3e0cb2c08cf6c0ba7e0f2c26"
-  integrity sha512-KNhIzgLiJmDDC444dj9vEOpZEgsV96ult9Iff98Vanumn+ShJHd5se8aX6KeVxdc0YQeqdrezBZv89rleDbvSg==
-
-electron-to-chromium@^1.4.648:
-  version "1.4.648"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4"
-  integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg==
-
 electron-to-chromium@^1.4.668:
   version "1.4.677"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.677.tgz#49ee77713516740bdde32ac2d1443c444f0dafe7"
@@ -1937,10 +1910,10 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-enhanced-resolve@^5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
-  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
+enhanced-resolve@^5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -2015,10 +1988,10 @@ es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
-es-module-lexer@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
-  integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
+es-module-lexer@^1.2.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
+  integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
 
 es-set-tostringtag@^2.0.1:
   version "2.0.1"
@@ -3094,11 +3067,6 @@ node-releases@^2.0.14:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
   integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
-node-releases@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
-  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -3541,10 +3509,10 @@ schema-utils@^2.6.5:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
@@ -3562,10 +3530,10 @@ semver@^7.3.7, semver@^7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
@@ -3620,7 +3588,7 @@ source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.6.0, source-map@^0.6.1:
+source-map@^0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -3744,24 +3712,24 @@ tar@^6.2.0:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-terser-webpack-plugin@^5.1.3:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
-  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
+    serialize-javascript "^6.0.1"
+    terser "^5.26.0"
 
-terser@^5.7.2:
-  version "5.14.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
-  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
+terser@^5.26.0:
+  version "5.28.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.28.1.tgz#bf00f7537fd3a798c352c2d67d67d65c915d1b28"
+  integrity sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -3906,14 +3874,6 @@ update-browserslist-db@^1.0.13:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-browserslist-db@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz#2924d3927367a38d5c555413a7ce138fc95fcb18"
-  integrity sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==
-  dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
-
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
@@ -3988,22 +3948,22 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.76.0:
-  version "5.76.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
-  integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
+webpack@^5.90.3:
+  version "5.90.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.90.3.tgz#37b8f74d3ded061ba789bb22b31e82eed75bd9ac"
+  integrity sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^0.0.51"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
     acorn "^8.7.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
+    acorn-import-assertions "^1.9.0"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.10.0"
-    es-module-lexer "^0.9.0"
+    enhanced-resolve "^5.15.0"
+    es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
@@ -4012,9 +3972,9 @@ webpack@^5.76.0:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.0"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
+    terser-webpack-plugin "^5.3.10"
     watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 

From a7699d4129e4cc8317d6a195e6f3cc8a5336710f Mon Sep 17 00:00:00 2001
From: daichi_otani <daichi_otani@ec-cube.co.jp>
Date: Tue, 27 Feb 2024 14:59:45 +0900
Subject: [PATCH 84/88] add codecov token

---
 .github/workflows/coverage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 62c9868b84..aec1aac8f9 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -108,7 +108,7 @@ jobs:
       uses: codecov/codecov-action@v4
       with:
         files: ./coverage1.xml,./coverage2.xml,./coverage3.xml
-        # token: ${{ secrets.CODECOV_TOKEN }}
+        token: ${{ secrets.CODECOV_TOKEN }}
         flags: tests
         # yml: ./codecov.yml
         fail_ci_if_error: true

From e1042d9c45c7a70758b193683460e4989485817d Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sat, 2 Mar 2024 20:20:39 +0900
Subject: [PATCH 85/88] =?UTF-8?q?PHP=208=20=E3=81=A7=20PHPUnit=20=E3=81=8C?=
 =?UTF-8?q?=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88?=
 =?UTF-8?q?=E3=82=92=E5=9B=9E=E9=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

全体実行で一部が FAILURES となっていた。グローバル変数が消失(若しくは汚染)していたと考えられる。
PHP 8.1 で発現を確認。PHP 7.4 では発生しない。PHPUnit のバージョンが古いのが原因か。
https://xoops.ec-cube.net/modules/newbb/viewtopic.php?topic_id=28010&forum=4
---
 tests/class/modifier/Modifier_ScriptEscapeTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/class/modifier/Modifier_ScriptEscapeTest.php b/tests/class/modifier/Modifier_ScriptEscapeTest.php
index 4d32d460ad..8c92118781 100644
--- a/tests/class/modifier/Modifier_ScriptEscapeTest.php
+++ b/tests/class/modifier/Modifier_ScriptEscapeTest.php
@@ -2,7 +2,11 @@
 require 'data/smarty_extends/modifier.script_escape.php';
 
 /**
+ * (省略。アノテーションを認識されるのに必要なようなので記述している。)
  *
+ * PHP 8.1 でグローバル変数が消失する不具合を回避するため、下で `backupGlobals` を指定している。本質的には PHPUnit が PHP8 に対応していないのが原因と考えられる。
+ *
+ * @backupGlobals disabled
  */
 class Modifier_ScriptEscapeTest extends PHPUnit_Framework_TestCase
 {

From 7b80da7aad305735dbaa6c00ba575d1887d65d06 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sat, 2 Mar 2024 20:28:37 +0900
Subject: [PATCH 86/88] =?UTF-8?q?Revert=20"PHP=208=20=E3=81=A7=20PHPUnit?=
 =?UTF-8?q?=20=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B7=E5=90=88=E3=82=92=E5=9B=9E=E9=81=BF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e1042d9c45c7a70758b193683460e4989485817d.
---
 tests/class/modifier/Modifier_ScriptEscapeTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/class/modifier/Modifier_ScriptEscapeTest.php b/tests/class/modifier/Modifier_ScriptEscapeTest.php
index 8c92118781..4d32d460ad 100644
--- a/tests/class/modifier/Modifier_ScriptEscapeTest.php
+++ b/tests/class/modifier/Modifier_ScriptEscapeTest.php
@@ -2,11 +2,7 @@
 require 'data/smarty_extends/modifier.script_escape.php';
 
 /**
- * (省略。アノテーションを認識されるのに必要なようなので記述している。)
  *
- * PHP 8.1 でグローバル変数が消失する不具合を回避するため、下で `backupGlobals` を指定している。本質的には PHPUnit が PHP8 に対応していないのが原因と考えられる。
- *
- * @backupGlobals disabled
  */
 class Modifier_ScriptEscapeTest extends PHPUnit_Framework_TestCase
 {

From 7631399269d4c02a113d30909e9531296c4e5009 Mon Sep 17 00:00:00 2001
From: Seasoft <info@seasoft.jp.net>
Date: Sat, 2 Mar 2024 20:20:39 +0900
Subject: [PATCH 87/88] =?UTF-8?q?PHP=208=20=E3=81=A7=20PHPUnit=20=E3=81=8C?=
 =?UTF-8?q?=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88?=
 =?UTF-8?q?=E3=82=92=E5=9B=9E=E9=81=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

全体実行で一部が FAILURES となっていた。グローバル変数が消失(若しくは汚染)していたと考えられる。
PHP 8.1 で発現を確認。PHP 7.4 では発生しない。PHPUnit のバージョンが古いのが原因か。
https://xoops.ec-cube.net/modules/newbb/viewtopic.php?topic_id=28010&forum=4
---
 tests/class/modifier/Modifier_ScriptEscapeTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/class/modifier/Modifier_ScriptEscapeTest.php b/tests/class/modifier/Modifier_ScriptEscapeTest.php
index 4d32d460ad..8c92118781 100644
--- a/tests/class/modifier/Modifier_ScriptEscapeTest.php
+++ b/tests/class/modifier/Modifier_ScriptEscapeTest.php
@@ -2,7 +2,11 @@
 require 'data/smarty_extends/modifier.script_escape.php';
 
 /**
+ * (省略。アノテーションを認識されるのに必要なようなので記述している。)
  *
+ * PHP 8.1 でグローバル変数が消失する不具合を回避するため、下で `backupGlobals` を指定している。本質的には PHPUnit が PHP8 に対応していないのが原因と考えられる。
+ *
+ * @backupGlobals disabled
  */
 class Modifier_ScriptEscapeTest extends PHPUnit_Framework_TestCase
 {

From 90e1f01eb11da0ddb0290f968acccd799530431e Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Mon, 4 Mar 2024 10:41:00 +0900
Subject: [PATCH 88/88] =?UTF-8?q?CentOS7=20=E3=81=AE=20EOL=20=E3=81=B8?=
 =?UTF-8?q?=E5=90=91=E3=81=91=E3=81=A6=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0?=
 =?UTF-8?q?=E8=A6=81=E4=BB=B6=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see https://github.com/EC-CUBE/ec-cube2/issues/681
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 938482f6d7..33280a3e44 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![GitHub Actions status](https://github.com/EC-CUBE/ec-cube2/workflows/CI/CD%20for%20EC-CUBE/badge.svg)](https://github.com/EC-CUBE/ec-cube2/actions)
 [![codecov](https://codecov.io/gh/EC-CUBE/ec-cube2/branch/master/graph/badge.svg?token=4oNLGhIQwy)](https://codecov.io/gh/EC-CUBE/ec-cube2)
-[![PHP Versions Supported](https://img.shields.io/badge/php-%3E%3D%205.4-8892BF.svg)](#php-version-support)
+[![PHP Versions Supported](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](#php-version-support)
 [![GitHub All Releases](https://img.shields.io/github/downloads/EC-CUBE/ec-cube2/total)](https://github.com/EC-CUBE/ec-cube2/releases)
 
 ---
@@ -28,14 +28,14 @@ Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに
 
 * EC-CUBE 2.13 系の PHP7 及び PHP8 対応バージョンです。
 * `master` ブランチで開発を行っています。
+* PHP5.4互換ブランチは [compatible/php5.4](https://github.com/EC-CUBE/ec-cube2/tree/compatible/php5.4) にて保守しています。(2024年6月末日まで)
 
 #### システム要件
 
 | 分類      | ソフトウェア         | Version                                                                 |
 |-----------|----------------------|-------------------------------------------------------------------------|
-| WebServer | IIS                  | 8.x or higher<br> PHP8は非対応                                                    |
 | WebServer | Apache               | 2.4.x or higher<br> (mod_rewrite / mod_ssl 必須)                        |
-| PHP       | PHP                  | 5.4.16 or higher                                                        |
+| PHP       | PHP                  | 7.4.33 or higher                                                        |
 | Database  | PostgreSQL           | 9.x or higher                                                           |
 | Database  | MySQL                | 5.x / 8.x or higher<br> (InnoDBエンジン 必須)                           |
 
@@ -44,7 +44,7 @@ Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに
 | 分類           | Extensions                                                                                                                                                                                                                                                                               |
 |----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | 必須      | pgsql / mysqli (利用するデータベースに合わせること) <br> pdo_pgsql / pdo_mysql (利用するデータベースに合わせること) <br> pdo <br> mbstring <br> zlib <br> ctype <br> session <br> JSON <br> xml <br> libxml <br> OpenSSL <br> zip <br> cURL <br> gd                                      |
-| 推奨      | hash <br> APCu / WinCache (利用する環境に合わせること) <br> Zend OPcache <br> mcrypt                                                                                                                                                                                                     |
+| 推奨      | hash <br> APCu <br> Zend OPcache
 
 ## インストール方法