From 9bdf20819b897c07696d1377b37c4cee66bd2188 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Tue, 8 Dec 2020 16:29:57 +0900 Subject: [PATCH 001/214] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA?= =?UTF-8?q?=E3=81=AB=E7=B4=90=E4=BB=98=E3=81=84=E3=81=9F=E5=95=86=E5=93=81?= =?UTF-8?q?=E3=81=8C0=E3=81=A8=E3=81=AA=E3=81=A3=E3=81=9F=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AB=20dtb=5Fcategory=5Ftotal=5Fcount=20=E3=81=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=20#125?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 商品0件の場合、dtb_category_count dtb_category_total_count に残さない。 変数名を整理。 配列を短縮構文で記述。 --- data/class/helper/SC_Helper_DB.php | 140 ++++++++++++----------------- 1 file changed, 59 insertions(+), 81 deletions(-) diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php index f11a3ef80e..8ced595517 100644 --- a/data/class/helper/SC_Helper_DB.php +++ b/data/class/helper/SC_Helper_DB.php @@ -723,35 +723,37 @@ public function sfCountCategory($objQuery = NULL, $is_force_all_count = false, $ } //共通のfrom/where文の構築 - $sql_where = SC_Product_Ex::getProductDispConditions('alldtl'); + $where_alldtl = SC_Product_Ex::getProductDispConditions('alldtl', $for_reseller); // 在庫無し商品の非表示 if ($is_nostock_hidden) { - $where_products_class = '(stock >= 1 OR stock_unlimited = 1)'; - $from = $objProduct->alldtlSQL($where_products_class); + $from_alldtl = $objProduct->alldtlSQL('(stock >= 1 OR stock_unlimited = 1)'); } else { - $from = 'dtb_products as alldtl'; + $from_alldtl = 'dtb_products as alldtl'; } //dtb_category_countの構成 // 各カテゴリに所属する商品の数を集計。集計対象には子カテゴリを含まない。 - //まずテーブル内容の元を取得 - if (!$is_force_all_count) { - $arrCategoryCountOld = $objQuery->select('category_id,product_count', 'dtb_category_count'); + if ($is_force_all_count) { + $objQuery->delete('dtb_category_count'); + $arrCategoryCountOld = []; } else { - $arrCategoryCountOld = array(); + // テーブル内容の元を取得 + $arrCategoryCountOld = $objQuery->select('category_id, product_count', 'dtb_category_count'); } //各カテゴリ内の商品数を数えて取得 $sql = <<< __EOS__ - SELECT T1.category_id, count(T2.category_id) as product_count + SELECT T1.category_id, count(*) as product_count FROM dtb_category AS T1 - LEFT JOIN dtb_product_categories AS T2 + INNER JOIN dtb_product_categories AS T2 ON T1.category_id = T2.category_id - LEFT JOIN $from + INNER JOIN $from_alldtl ON T2.product_id = alldtl.product_id - WHERE $sql_where - GROUP BY T1.category_id, T2.category_id + AND $where_alldtl + WHERE T1.del_flg = 0 + GROUP BY T1.category_id + HAVING count(*) <> 0 __EOS__; $arrCategoryCountNew = $objQuery->getAll($sql); @@ -760,12 +762,12 @@ public function sfCountCategory($objQuery = NULL, $is_force_all_count = false, $ //各カテゴリ毎のデータ値において以前との差を見る //古いデータの構造入れ替え - $arrOld = array(); + $arrOld = []; foreach ($arrCategoryCountOld as $item) { $arrOld[$item['category_id']] = $item['product_count']; } //新しいデータの構造入れ替え - $arrNew = array(); + $arrNew = []; foreach ($arrCategoryCountNew as $item) { $arrNew[$item['category_id']] = $item['product_count']; } @@ -773,105 +775,81 @@ public function sfCountCategory($objQuery = NULL, $is_force_all_count = false, $ unset($arrCategoryCountOld); unset($arrCategoryCountNew); - $arrDiffCategory_id = array(); - //新しいカテゴリ一覧から見て商品数が異なるデータが無いか確認 - foreach ($arrNew as $cid => $count) { - if ($arrOld[$cid] != $count) { - $arrDiffCategory_id[] = $cid; - } - } + $arrNotExistsProductCategoryId = []; //削除カテゴリを想定して、古いカテゴリ一覧から見て商品数が異なるデータが無いか確認。 - foreach ($arrOld as $cid => $count) { - if ($arrNew[$cid] != $count && $count > 0) { - $arrDiffCategory_id[] = $cid; + foreach ($arrOld as $category_id => $count) { + // 商品が存在しない + if (!isset($arrNew[$category_id])) { + $arrNotExistsProductCategoryId[] = $category_id; } - } - - //対象IDが無ければ終了 - if (count($arrDiffCategory_id) == 0) { - if ($is_out_trans) { - $objQuery->commit(); + // 変更なし + elseif ($arrNew[$category_id] == $count) { + unset($arrNew[$category_id]); } + } - return; + foreach ($arrNotExistsProductCategoryId as $category_id) { + $objQuery->delete('dtb_category_count', 'category_id = ?', array($category_id)); } - //差分対象カテゴリIDの重複を除去 - $arrDiffCategory_id = array_unique($arrDiffCategory_id); + // 差分があったIDとその親カテゴリID + $arrTgtCategoryId = $arrNotExistsProductCategoryId; - //dtb_category_countの更新 差分のあったカテゴリだけ更新する。 - foreach ($arrDiffCategory_id as $cid) { - $sqlval = array(); + // dtb_category_countの更新 差分のあったカテゴリだけ更新する。 + foreach ($arrNew as $category_id => $count) { + $sqlval = []; $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; - $sqlval['product_count'] = (string) $arrNew[$cid]; - if ($sqlval['product_count'] =='') { - $sqlval['product_count'] = (string) '0'; - } - if (isset($arrOld[$cid])) { - $objQuery->update('dtb_category_count', $sqlval, 'category_id = ?', array($cid)); + $sqlval['product_count'] = $count; + if (isset($arrOld[$category_id])) { + $objQuery->update('dtb_category_count', $sqlval, 'category_id = ?', array($category_id)); } else { - if ($is_force_all_count) { - $ret = $objQuery->update('dtb_category_count', $sqlval, 'category_id = ?', array($cid)); - if ($ret > 0) { - continue; - } - } - $sqlval['category_id'] = $cid; + $sqlval['category_id'] = $category_id; $objQuery->insert('dtb_category_count', $sqlval); } + $arrParentID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); + $arrTgtCategoryId = array_merge($arrTgtCategoryId, $arrParentID); } + $arrTgtCategoryId = array_unique($arrTgtCategoryId); unset($arrOld); unset($arrNew); - //差分があったIDとその親カテゴリIDのリストを取得する - $arrTgtCategory_id = array(); - foreach ($arrDiffCategory_id as $parent_category_id) { - $arrTgtCategory_id[] = $parent_category_id; - $arrParentID = $this->sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $parent_category_id); - $arrTgtCategory_id = array_unique(array_merge($arrTgtCategory_id, $arrParentID)); - } - - unset($arrDiffCategory_id); - //dtb_category_total_count 集計処理開始 //更新対象カテゴリIDだけ集計しなおす。 - $arrUpdateData = array(); - $where_products_class = ''; - if ($is_nostock_hidden) { - $where_products_class .= '(stock >= 1 OR stock_unlimited = 1)'; - } - $from = $objProduct->alldtlSQL($where_products_class); - foreach ($arrTgtCategory_id as $category_id) { - $arrWhereVal = array(); + $arrUpdateData = []; + foreach ($arrTgtCategoryId as $category_id) { + $arrWhereVal = []; list($tmp_where, $arrTmpVal) = $this->sfGetCatWhere($category_id); if ($tmp_where != '') { - $sql_where_product_ids = 'product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; + $where_product_ids = 'product_id IN (SELECT product_id FROM dtb_product_categories WHERE ' . $tmp_where . ')'; $arrWhereVal = $arrTmpVal; } else { - $sql_where_product_ids = '0<>0'; // 一致させない + $where_product_ids = '0<>0'; // 一致させない } - $where = "($sql_where) AND ($sql_where_product_ids)"; + $where = "($where_alldtl) AND ($where_product_ids)"; - $arrUpdateData[$category_id] = $objQuery->count($from, $where, $arrWhereVal); + $arrUpdateData[$category_id] = $objQuery->count($from_alldtl, $where, $arrWhereVal); } - unset($arrTgtCategory_id); + unset($arrTgtCategoryId); // 更新対象だけを更新。 - foreach ($arrUpdateData as $cid => $count) { - $sqlval = array(); - $sqlval['create_date'] = 'CURRENT_TIMESTAMP'; - $sqlval['product_count'] = $count; - if ($sqlval['product_count'] =='') { - $sqlval['product_count'] = (string) '0'; + foreach ($arrUpdateData as $category_id => $count) { + if ($count == 0) { + $objQuery->delete('dtb_category_total_count', 'category_id = ?', array($category_id)); + continue 1; } - $ret = $objQuery->update('dtb_category_total_count', $sqlval, 'category_id = ?', array($cid)); + $sqlval = [ + 'product_count' => $count, + 'create_date' => 'CURRENT_TIMESTAMP', + ]; + $ret = $objQuery->update('dtb_category_total_count', $sqlval, 'category_id = ?', array($category_id)); if (!$ret) { - $sqlval['category_id'] = $cid; + $sqlval['category_id'] = $category_id; $objQuery->insert('dtb_category_total_count', $sqlval); } } + // トランザクション終了処理 if ($is_out_trans) { $objQuery->commit(); From 73b936c40719594815e012258c960003c51799cc Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 19 Oct 2022 15:55:06 +0900 Subject: [PATCH 002/214] Bump Smarty 3.x to 4.2 --- .github/workflows/e2e-tests.yml | 4 - .github/workflows/main.yml | 4 +- composer.json | 4 +- composer.lock | 435 ++++++++++++++++++++++++++------ data/class/SC_View.php | 4 +- 5 files changed, 362 insertions(+), 89 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 977535f893..686b54ca8e 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -91,10 +91,6 @@ jobs: matrix: db: [ 'pgsql', 'mysql' ] tag: - - '5.6-apache' - - '7.1-apache' - - '7.2-apache' - - '7.3-apache' - '7.4-apache' include: - db: mysql diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8ea172d52..a667b08b5a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: operating-system: [ ubuntu-22.04 ] - php: [ '5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ] + php: [ '7.4', '8.0', '8.1' ] db: [ mysql, pgsql ] include: - db: mysql @@ -149,7 +149,7 @@ jobs: fail-fast: false matrix: operating-system: [ windows-2019 ] - php: [ 5.5, 5.6, 7.1, 7.2, 7.3, 7.4 ] + php: [ 7.4 ] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/composer.json b/composer.json index 29263b233c..051298d35c 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "config": { "vendor-dir": "data/vendor", "platform": { - "php": "5.4.16" + "php": "7.4.0" }, "optimize-autoloader": true, "sort-packages": true, @@ -28,7 +28,7 @@ "php5friends/phpunit48": ">=4.8.41" }, "require": { - "php": ">=5.4.16", + "php": ">=7.4", "ext-gd": "*", "ext-mbstring": "*", "mobiledetect/mobiledetectlib": "^2.8", diff --git a/composer.lock b/composer.lock index 1e980dc3ff..a599f8d8fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "af90042f8bc44df63d44bc963ea3f29e", + "content-hash": "36815e3347d499dac579369f873bcffc", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -729,29 +729,29 @@ }, { "name": "smarty/smarty", - "version": "v3.1.46", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "b3ade90dece67812410954528e0039fb5b73bcf7" + "reference": "ffa2b81a8e354a49fd8a2f24742dc9dc399e8007" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/b3ade90dece67812410954528e0039fb5b73bcf7", - "reference": "b3ade90dece67812410954528e0039fb5b73bcf7", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ffa2b81a8e354a49fd8a2f24742dc9dc399e8007", + "reference": "ffa2b81a8e354a49fd8a2f24742dc9dc399e8007", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8", + "phpunit/phpunit": "^8.5 || ^7.5", "smarty/smarty-lexer": "^3.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -775,53 +775,54 @@ { "name": "Rodney Rehm", "email": "rodney.rehm@medialize.de" + }, + { + "name": "Simon Wisselink", + "homepage": "https://www.iwink.nl/" } ], "description": "Smarty - the compiling PHP template engine", - "homepage": "http://www.smarty.net", + "homepage": "https://smarty-php.github.io/smarty/", "keywords": [ "templating" ], "support": { - "forum": "http://www.smarty.net/forums/", - "irc": "irc://irc.freenode.org/smarty", + "forum": "https://github.com/smarty-php/smarty/discussions", "issues": "https://github.com/smarty-php/smarty/issues", - "source": "https://github.com/smarty-php/smarty/tree/v3.1.46" + "source": "https://github.com/smarty-php/smarty/tree/v4.2.1" }, - "time": "2022-08-01T21:58:13+00:00" + "time": "2022-09-14T10:59:01+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1 || ^8.0" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^9", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.22" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -835,20 +836,34 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/master" + "source": "https://github.com/doctrine/instantiator/tree/1.4.1" }, - "time": "2015-06-14T21:17:01+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-03-03T08:28:38+00:00" }, { "name": "fzaninotto/faker", @@ -1097,16 +1112,16 @@ }, { "name": "php5friends/phpunit48", - "version": "4.8.43", + "version": "4.8.44", "source": { "type": "git", "url": "https://github.com/php5friends/phpunit48.git", - "reference": "a1c5a88b7649c2d1be4d44dddc0db4ffbfed4eb8" + "reference": "5811d801a5e5f6e73b169bd04a55d8217adbe2d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php5friends/phpunit48/zipball/a1c5a88b7649c2d1be4d44dddc0db4ffbfed4eb8", - "reference": "a1c5a88b7649c2d1be4d44dddc0db4ffbfed4eb8", + "url": "https://api.github.com/repos/php5friends/phpunit48/zipball/5811d801a5e5f6e73b169bd04a55d8217adbe2d4", + "reference": "5811d801a5e5f6e73b169bd04a55d8217adbe2d4", "shasum": "" }, "require": { @@ -1170,45 +1185,97 @@ ], "support": { "issues": "https://github.com/php5friends/phpunit48/issues", - "source": "https://github.com/php5friends/phpunit48/tree/4.8.43" + "source": "https://github.com/php5friends/phpunit48/tree/4.8.44" + }, + "time": "2022-09-29T05:23:03+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src/" + } }, - "time": "2021-10-28T05:14:50+00:00" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + }, + "time": "2020-06-27T09:03:43+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "2.0.5", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", - "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { - "php": ">=5.3.3" + "ext-filter": "*", + "php": "^7.2 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.3", + "webmozart/assert": "^1.9.1" }, "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/" - ] + "psr-4": { + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1218,14 +1285,74 @@ "authors": [ { "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" + "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "account@ijaap.nl" } ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + }, + "time": "2021-10-19T17:43:47+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "1.6.2", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0", + "phpdocumentor/reflection-common": "^2.0" + }, + "require-dev": { + "ext-tokenizer": "*", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + } }, - "time": "2016-01-25T08:17:30+00:00" + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" + }, + "time": "2022-10-14T12:47:21+00:00" }, { "name": "phpspec/prophecy", @@ -1920,22 +2047,92 @@ }, "time": "2015-06-21T13:59:46+00:00" }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, { "name": "symfony/polyfill-ctype", - "version": "v1.19.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b", - "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" }, "suggest": { "ext-ctype": "For best performance" @@ -1943,7 +2140,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.19-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1981,7 +2178,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -1997,32 +2194,40 @@ "type": "tidelift" } ], - "time": "2020-10-23T09:01:57+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/yaml", - "version": "v2.8.52", + "version": "v5.4.14", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "02c1859112aa779d9ab394ae4f3381911d84052b" + "reference": "e83fe9a72011f07c662da46a05603d66deeeb487" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/02c1859112aa779d9ab394ae4f3381911d84052b", - "reference": "02c1859112aa779d9ab394ae4f3381911d84052b", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e83fe9a72011f07c662da46a05603d66deeeb487", + "reference": "e83fe9a72011f07c662da46a05603d66deeeb487", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/polyfill-ctype": "~1.8" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "^1.8" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } + "conflict": { + "symfony/console": "<5.3" }, + "require-dev": { + "symfony/console": "^5.3|^6.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -2045,12 +2250,84 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v2.8.52" + "source": "https://github.com/symfony/yaml/tree/v5.4.14" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-10-03T15:15:50+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/assert.git", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "php": "^7.2 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<4.6.1 || 4.6.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.13" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.11.0" }, - "time": "2018-11-11T11:18:13+00:00" + "time": "2022-06-03T18:03:27+00:00" } ], "aliases": [], @@ -2059,13 +2336,13 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.4.16", + "php": ">=7.4", "ext-gd": "*", "ext-mbstring": "*" }, "platform-dev": [], "platform-overrides": { - "php": "5.4.16" + "php": "7.4.0" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } diff --git a/data/class/SC_View.php b/data/class/SC_View.php index a988525dd9..9b07de6da5 100644 --- a/data/class/SC_View.php +++ b/data/class/SC_View.php @@ -23,7 +23,7 @@ class SC_View { - /** @var SmartyBC */ + /** @var Smarty */ public $_smarty; /** @var LC_Page */ @@ -41,7 +41,7 @@ public function __construct() public function init() { // include_phpの利用のためSmartyBCを呼び出す、ホントはinclude_phpをなくしたいそうすれば、blank.tplもなくせる - $this->_smarty = new SmartyBC; + $this->_smarty = new Smarty; // see https://github.com/smarty-php/smarty/issues/605#issuecomment-742832333 $this->_smarty->setErrorReporting(E_ALL & ~E_WARNING & ~E_NOTICE); $this->_smarty->left_delimiter = ''; $this->_smarty->registerPlugin('modifier', 'sfDispDBDate', function ($dbdate, $time = true) { return SC_Utils_Ex::sfDispDBDate($dbdate, $time); }); From 0df2534e0c23f0980745590b05b31b6f1e996ead Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 21 Oct 2022 17:54:17 +0900 Subject: [PATCH 005/214] =?UTF-8?q?Smarty=203.1=20=E3=81=A8=204.2=20?= =?UTF-8?q?=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=92=E5=88=86=E3=81=91?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e-tests.yml | 6 + .github/workflows/main.yml | 11 +- composer.json | 8 +- composer.lock | 302 ++++++-------------------------- 4 files changed, 71 insertions(+), 256 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 686b54ca8e..058cd37e4a 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -91,6 +91,10 @@ jobs: matrix: db: [ 'pgsql', 'mysql' ] tag: + - '5.6-apache' + - '7.1-apache' + - '7.2-apache' + - '7.3-apache' - '7.4-apache' include: - db: mysql @@ -124,6 +128,8 @@ jobs: sh -c 'echo "> data/config/config.php' docker-compose build --build-arg TAG=${TAG} ec-cube docker-compose up -d + - run: docker-compose exec -T ec-cube composer require smarty/smarty "^3.1" + if: matrix.php < 7.1 - run: sleep 1 - run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c390971b9f..f48f92dbe1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: operating-system: [ ubuntu-22.04 ] - php: [ '7.4', '8.0', '8.1', '8.2snapshot' ] + php: [ '5.4', '5.5', '5.6', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2snapshot' ] db: [ mysql, pgsql ] include: - db: mysql @@ -81,6 +81,9 @@ jobs: - name: composer install run: composer install --no-interaction -o + - run: composer require smarty/smarty "^3.1" + if: matrix.php < 7.1 + - name: Setup PHP uses: nanasess/setup-php@master with: @@ -151,7 +154,7 @@ jobs: fail-fast: false matrix: operating-system: [ windows-2019 ] - php: [ 7.4 ] + php: [ 5.5, 5.6, 7.1, 7.2, 7.3, 7.4 ] steps: - name: Checkout uses: actions/checkout@v3 @@ -177,6 +180,10 @@ jobs: - name: composer install run: composer install --no-interaction -o + - run: composer require smarty/smarty "^3.1" + if: matrix.php < 7.1 + shell: bash + - name: Setup to database run: | choco install -y mysql --version 5.7.18 diff --git a/composer.json b/composer.json index 17296f1a1b..16aa29a6c0 100644 --- a/composer.json +++ b/composer.json @@ -22,14 +22,16 @@ } }, "require-dev": { + "doctrine/instantiator": "~1.0.5", "fzaninotto/faker": "^1.8", "nanasess/ec-cube2-class-extends-stubs": "^1.0", "nanasess/eccube2-fixture-generator": "^1.1", "php5friends/phpunit48": ">=4.8.41", - "symfony/yaml": "^4.4" + "phpdocumentor/reflection-docblock": "~2.0.5", + "symfony/yaml": "^2.8 || ^3.4 || ^4.4" }, "require": { - "php": ">=7.4", + "php": "^5.4 || ^7.0 || ^8.0", "ext-gd": "*", "ext-mbstring": "*", "mobiledetect/mobiledetectlib": "^2.8", @@ -43,7 +45,7 @@ "pear/xml_util": "*", "setasign/fpdf": "^1.8", "setasign/fpdi": "^1.6", - "smarty/smarty": "*" + "smarty/smarty": "^3.1 || ^4.2" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 0f9f34966d..86b691144b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e2ff7ae146c2548c446b185845b28e5c", + "content-hash": "775be6fecfb84911a47412429cd287a6", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -797,32 +797,34 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.4.1", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": ">=5.3,<8.0-DEV" }, "require-dev": { - "doctrine/coding-standard": "^9", + "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -836,34 +838,20 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" + "homepage": "http://ocramius.github.com/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "homepage": "https://github.com/doctrine/instantiator", "keywords": [ "constructor", "instantiate" ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "source": "https://github.com/doctrine/instantiator/tree/master" }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "fzaninotto/faker", @@ -1189,152 +1177,41 @@ }, "time": "2022-09-29T05:23:03+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "2.0.5", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", + "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", "shasum": "" }, "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" + "php": ">=5.3.3" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } + "phpunit/phpunit": "~4.0" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.6.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d", - "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d", - "shasum": "" - }, - "require": { - "php": "^7.4 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "*", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^9.5", - "rector/rector": "^0.13.9", - "vimeo/psalm": "^4.25" + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" + "psr-0": { + "phpDocumentor": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -1344,15 +1221,14 @@ "authors": [ { "name": "Mike van Riel", - "email": "me@mikevanriel.com" + "email": "mike.vanriel@naenius.com" } ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2" + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x" }, - "time": "2022-10-14T12:47:21+00:00" + "time": "2016-01-25T08:17:30+00:00" }, { "name": "phpspec/prophecy", @@ -2131,32 +2007,28 @@ }, { "name": "symfony/yaml", - "version": "v4.4.45", + "version": "v2.8.52", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" + "reference": "02c1859112aa779d9ab394ae4f3381911d84052b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", - "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/02c1859112aa779d9ab394ae4f3381911d84052b", + "reference": "02c1859112aa779d9ab394ae4f3381911d84052b", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=5.3.9", "symfony/polyfill-ctype": "~1.8" }, - "conflict": { - "symfony/console": "<3.4" - }, - "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -2179,84 +2051,12 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Loads and dumps YAML files", + "description": "Symfony Yaml Component", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v4.4.45" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-08-02T15:47:23+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.11.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "php": "^7.2 || ^8.0" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/symfony/yaml/tree/v2.8.52" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2018-11-11T11:18:13+00:00" } ], "aliases": [], @@ -2265,7 +2065,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.4", + "php": "^5.4 || ^7.0 || ^8.0", "ext-gd": "*", "ext-mbstring": "*" }, @@ -2273,5 +2073,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From 452384fc87a8b03a0b62b12f77721f8b23656d04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:08:56 +0000 Subject: [PATCH 006/214] Bump babel-loader from 8.2.5 to 9.1.3 Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.5 to 9.1.3. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v8.2.5...v9.1.3) --- updated-dependencies: - dependency-name: babel-loader dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 147 ++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 110 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index b197654df8..808eb80018 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@typescript-eslint/eslint-plugin": "^5.48.0", "@typescript-eslint/parser": "^5.55.0", "babel-eslint": "^10.0.3", - "babel-loader": "^8.2.5", + "babel-loader": "^9.1.3", "browser-sync-webpack-plugin": "^2.3.0", "eslint": "^8.36.0", "eslint-config-jquery": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 59d3b404d6..e24b5026d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1104,7 +1104,7 @@ dependencies: faker "*" -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== @@ -1412,11 +1412,25 @@ acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + 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-keywords@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + ajv@^6.10.0, 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" @@ -1427,6 +1441,16 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.0, ajv@^8.9.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -1531,15 +1555,13 @@ babel-eslint@^10.0.3: eslint-visitor-keys "^1.0.0" resolve "^1.12.0" -babel-loader@^8.2.5: - version "8.2.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" - integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== +babel-loader@^9.1.3: + version "9.1.3" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a" + integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw== dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" + find-cache-dir "^4.0.0" + schema-utils "^4.0.0" babel-plugin-polyfill-corejs2@^0.3.3: version "0.3.3" @@ -1724,10 +1746,10 @@ commander@^7.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +common-path-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" + integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== concat-map@0.0.1: version "0.0.1" @@ -2240,14 +2262,13 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== +find-cache-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2" + integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg== dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" + common-path-prefix "^3.0.0" + pkg-dir "^7.0.0" find-up@^4.0.0: version "4.1.0" @@ -2265,6 +2286,14 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" +find-up@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" + integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== + dependencies: + locate-path "^7.1.0" + path-exists "^5.0.0" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -2824,6 +2853,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" @@ -2902,6 +2936,13 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +locate-path@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" + integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== + dependencies: + p-locate "^6.0.0" + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -2931,13 +2972,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.2, make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -3124,6 +3158,13 @@ p-limit@^3.0.2: dependencies: yocto-queue "^0.1.0" +p-limit@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" + integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== + dependencies: + yocto-queue "^1.0.0" + p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -3138,6 +3179,13 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" +p-locate@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" + integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== + dependencies: + p-limit "^4.0.0" + p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" @@ -3155,6 +3203,11 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== +path-exists@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" + integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -3190,13 +3243,20 @@ picomatch@^2.2.3: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pkg-dir@^4.1.0, pkg-dir@^4.2.0: +pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" +pkg-dir@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" + integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA== + dependencies: + find-up "^6.3.0" + playwright-core@1.29.2: version "1.29.2" resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.29.2.tgz#2e8347e7e8522409f22b244e600e703b64022406" @@ -3395,6 +3455,11 @@ request@^2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -3464,15 +3529,6 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.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" @@ -3482,7 +3538,17 @@ 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: +schema-utils@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" + integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.9.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.1.0" + +semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -3997,6 +4063,11 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== +yocto-queue@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" + integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== + zaproxy@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/zaproxy/-/zaproxy-1.0.1.tgz#8e851a7094ba409f076b89fc8920f4d6c075b5b3" 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 007/214] 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] --- 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 28af2485adf2ff6cf0440e2ef787ece02de18e5a Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Sat, 2 Sep 2023 00:44:21 +0900 Subject: [PATCH 008/214] =?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 @@ ------------------------------------------------- -小　計 ￥ (うち消費税 ￥) +小　計 ￥ 値引き ￥ 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 @@ -小　計 ￥ (うち消費税 ￥) +小　計 ￥ 値引き ￥ 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 Date: Sun, 3 Sep 2023 23:00:38 +0900 Subject: [PATCH 009/214] 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 Date: Sat, 9 Sep 2023 01:21:54 +0900 Subject: [PATCH 010/214] =?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 Date: Sat, 9 Sep 2023 01:22:48 +0900 Subject: [PATCH 011/214] 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 @@ +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 c654b7037081deb0f40d0ac78eeb5ac8d0b45b67 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 13 Sep 2023 22:41:03 +0900 Subject: [PATCH 012/214] =?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 Date: Sat, 16 Sep 2023 23:19:27 +0900 Subject: [PATCH 013/214] 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 Date: Sun, 17 Sep 2023 02:20:21 +0900 Subject: [PATCH 014/214] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE?= =?UTF-8?q?=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 Date: Sun, 17 Sep 2023 02:20:21 +0900 Subject: [PATCH 015/214] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE?= =?UTF-8?q?=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 "> 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 Date: Sun, 17 Sep 2023 02:20:21 +0900 Subject: [PATCH 016/214] =?UTF-8?q?build-args=20=E3=82=92=E4=BF=AE?= =?UTF-8?q?=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 "> 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 988f46c4c761268f47b2a65d7dc88de49e7ceeda Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 20 Sep 2023 00:06:16 +0900 Subject: [PATCH 017/214] 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 f2e5f74e051eb66711b17647e47480d63a7d5054 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 19 Oct 2023 22:00:29 +0900 Subject: [PATCH 018/214] =?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 @@ 合計 - 円 + 円 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 @@ ------------------------------------------------- 小　計 ￥ (うち消費税 ￥) - -値引き ￥ + +値引き ￥ 送　料 ￥ 手数料 ￥ 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 @@
- 合計:円
+ 合計:円
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 @@ 小　計 ￥ (うち消費税 ￥) - -値引き ￥ + +値引き ￥ 送　料 ￥ 手数料 ￥ 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 @@
-
合計： 円
+
合計： 円
お誕生月ポイント： Pt
From c33e9ad87fefd4af4aa94afaba866ecc6e2b11e3 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 18 Dec 2023 01:15:59 +0900 Subject: [PATCH 019/214] Bump Smarty4.3 --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 16aa29a6c0..b4f51117fc 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "pear/xml_util": "*", "setasign/fpdf": "^1.8", "setasign/fpdi": "^1.6", - "smarty/smarty": "^3.1 || ^4.2" + "smarty/smarty": "^3.1 || ^4.3" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index bde9057c3e..44eaa0d5bf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "775be6fecfb84911a47412429cd287a6", + "content-hash": "df4fdb9be635c8cd1ad5f094d26e0543", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -735,16 +735,16 @@ }, { "name": "smarty/smarty", - "version": "v4.2.1", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "ffa2b81a8e354a49fd8a2f24742dc9dc399e8007" + "reference": "3931d8f54b8f7a4ffab538582d34d4397ba8daa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ffa2b81a8e354a49fd8a2f24742dc9dc399e8007", - "reference": "ffa2b81a8e354a49fd8a2f24742dc9dc399e8007", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/3931d8f54b8f7a4ffab538582d34d4397ba8daa5", + "reference": "3931d8f54b8f7a4ffab538582d34d4397ba8daa5", "shasum": "" }, "require": { @@ -795,9 +795,9 @@ "support": { "forum": "https://github.com/smarty-php/smarty/discussions", "issues": "https://github.com/smarty-php/smarty/issues", - "source": "https://github.com/smarty-php/smarty/tree/v3.1.48" + "source": "https://github.com/smarty-php/smarty/tree/v4.3.4" }, - "time": "2023-03-28T19:45:54+00:00" + "time": "2023-09-14T10:59:08+00:00" } ], "packages-dev": [ @@ -2079,5 +2079,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } From e332637fa75d4552d0ab589195bf0cced68ab3e9 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 20 Dec 2023 18:56:59 +0900 Subject: [PATCH 020/214] 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 @@ - + <!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--> 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 @@ - + 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 Date: Wed, 20 Dec 2023 19:50:58 +0900 Subject: [PATCH 021/214] =?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 Date: Wed, 20 Dec 2023 20:31:40 +0900 Subject: [PATCH 022/214] =?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 Date: Thu, 21 Dec 2023 20:30:55 +0900 Subject: [PATCH 023/214] =?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 Date: Thu, 21 Dec 2023 21:06:56 +0900 Subject: [PATCH 024/214] =?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 Date: Thu, 21 Dec 2023 21:05:57 +0900 Subject: [PATCH 025/214] =?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 e90552ae6cd9975e6bb3622d57fe037553d236be Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 3 Jan 2024 11:22:30 +0900 Subject: [PATCH 026/214] =?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 @@ - @@ -34,43 +33,22 @@ - - EC-CUBEインストール @@ -78,26 +56,78 @@ $(function(){ -
Loading...
-
-
+
+ +

Loading...

+
+ From 99563a82bb0ca091b754e37d7e9d7805bd1349e1 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 3 Jan 2024 11:37:21 +0900 Subject: [PATCH 027/214] =?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(){ EC-CUBEインストール +
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 @@ +
@@ -103,3 +104,4 @@ function fnChangeVisible(check_id, mod_id){
+ 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. *}--> +
@@ -36,11 +37,10 @@
-
-
+ 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(){
Loading...
-
-
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. *}--> + +
@@ -42,12 +44,11 @@
-
-
+ 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. *}--> +

必要なファイルのコピー

@@ -44,13 +45,12 @@
-
-
+ 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() { }); }); +
@@ -223,12 +224,11 @@ $(function() { -
-
+ 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) { } } +
@@ -101,13 +102,12 @@ function lfnChangePort(db_type) { -
-
+ 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 @@ //--> +
@@ -74,12 +75,11 @@ -
-
+ 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. *}--> + +
@@ -53,7 +55,6 @@   -
-
+ 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. *}--> + +
@@ -29,11 +31,10 @@ EC-CUBEのインストールを開始します。 -
-
+ From 795ce7c051eb47dde5fade6e5eef407542656488 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Mon, 1 Jan 2024 00:15:05 +0900 Subject: [PATCH 034/214] =?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 @@ Date: Thu, 4 Jan 2024 18:05:28 +0900 Subject: [PATCH 035/214] =?UTF-8?q?Revert=20"SC=5FHelper=5FHandleError=20?= =?UTF-8?q?=E3=81=A7=E5=AE=9A=E7=BE=A9=E5=89=8D=E3=81=AE=20ERROR=5FLOG=5FR?= =?UTF-8?q?EALFILE=20=E3=81=8C=E4=BD=BF=E3=82=8F=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=81=93=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 This reverts commit 795ce7c051eb47dde5fade6e5eef407542656488. ローカルで phpunit を通すため cherry-pick していたものを誤って含めてしまった。 --- data/class/helper/SC_Helper_HandleError.php | 45 ++++++--------------- tests/require.php | 3 -- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/data/class/helper/SC_Helper_HandleError.php b/data/class/helper/SC_Helper_HandleError.php index a1b1d81843..251376b42b 100644 --- a/data/class/helper/SC_Helper_HandleError.php +++ b/data/class/helper/SC_Helper_HandleError.php @@ -34,9 +34,6 @@ class SC_Helper_HandleError /** エラー処理中か */ static $under_error_handling = false; - /** display_errors の初期値 */ - static $default_display_errors; - /** * 処理の読み込みを行う * @@ -54,16 +51,21 @@ 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); - // E_USER_ERROR 以外のエラーを捕捉した場合の処理用 - register_shutdown_function(array(__CLASS__, 'handle_error')); - // 以降の処理では画面へのエラー表示は行なわない - ini_set('display_errors', 0); + // 実質的に 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); + } } } @@ -90,22 +92,10 @@ 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); @@ -117,10 +107,8 @@ public static function handle_warning($errno, $errstr, $errfile, $errline) case E_USER_WARNING: case E_CORE_WARNING: case E_COMPILE_WARNING: - if (defined('ERROR_LOG_REALFILE')) { - $message = "Warning($error_type_name): $errstr on [$errfile($errline)]"; - GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE); - } + $message = "Warning($error_type_name): $errstr on [$errfile($errline)]"; + GC_Utils_Ex::gfPrintLog($message, ERROR_LOG_REALFILE); return true; @@ -141,7 +129,6 @@ 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) { @@ -192,12 +179,6 @@ 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 b353025ed6..73154f19eb 100644 --- a/tests/require.php +++ b/tests/require.php @@ -1,9 +1,6 @@ Date: Thu, 4 Jan 2024 19:22:56 +0900 Subject: [PATCH 036/214] =?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 @@ - - EC-CUBEインストール From 3ed97bb129d68f0991127e756d5b8b48baafe744 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 4 Jan 2024 19:29:34 +0900 Subject: [PATCH 037/214] 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 @@
-

EC CUBE インストールが完了しました。

+

EC-CUBE インストールが完了しました。

管理画面にログインできます。
From 81c610c65d7aa40aa7677bcd8c83fb2a576d34a4 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Fri, 5 Jan 2024 18:28:21 +0900 Subject: [PATCH 038/214] =?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 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 039/214] 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] --- 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 Date: Tue, 23 Jan 2024 14:12:57 +0900 Subject: [PATCH 040/214] 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 Date: Wed, 24 Jan 2024 11:29:09 +0900 Subject: [PATCH 041/214] 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 61c481c17e6e0cce3baf99752084bec42f0dcfef Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 29 Jan 2024 22:34:50 +0900 Subject: [PATCH 042/214] 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 ae08724b83e1f1e4f50791803d15f9ffa9c9e977 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 5 Feb 2024 02:02:50 +0900 Subject: [PATCH 043/214] 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 Date: Mon, 5 Feb 2024 02:03:47 +0900 Subject: [PATCH 044/214] =?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 Date: Mon, 5 Feb 2024 16:13:25 +0900 Subject: [PATCH 045/214] =?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 046/214] 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] --- .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 047/214] 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] --- 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 048/214] 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] --- 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 fffa6d9983c01a4fe910611caa0389e56c2b9df9 Mon Sep 17 00:00:00 2001 From: shinya Date: Thu, 8 Feb 2024 10:44:41 +0900 Subject: [PATCH 049/214] =?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 Date: Tue, 13 Feb 2024 02:29:08 +0900 Subject: [PATCH 050/214] =?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 051/214] 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] --- 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 Date: Fri, 16 Feb 2024 02:17:36 +0900 Subject: [PATCH 052/214] =?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 6e70fb909a3642f19e7ea3fc672dbb829fc0a911 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Fri, 16 Feb 2024 12:28:58 +0900 Subject: [PATCH 053/214] =?UTF-8?q?fix=20#125=20=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E5=BC=95=E6=95=B0=E3=81=AB=E6=9C=AA?= =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E5=A4=89=E6=95=B0=E3=82=92=E6=B8=A1=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 別件と同時実装し、9bdf20819b897c07696d1377b37c4cee66bd2188 で本件を分離する際に混入したもの。実質的な動作に変化はない。 --- 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 60cf266ea9..50ab6152e7 100644 --- a/data/class/helper/SC_Helper_DB.php +++ b/data/class/helper/SC_Helper_DB.php @@ -772,7 +772,7 @@ public function sfCountCategory($objQuery = NULL, $is_force_all_count = false, $ } //共通のfrom/where文の構築 - $where_alldtl = SC_Product_Ex::getProductDispConditions('alldtl', $for_reseller); + $where_alldtl = SC_Product_Ex::getProductDispConditions('alldtl'); // 在庫無し商品の非表示 if ($is_nostock_hidden) { $from_alldtl = $objProduct->alldtlSQL('(stock >= 1 OR stock_unlimited = 1)'); From 5dacb7e66316aefc37479c5af32761b0f21c37a5 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Sat, 17 Feb 2024 01:06:37 +0900 Subject: [PATCH 054/214] =?UTF-8?q?fix=20#125=20=E8=A6=AA=E3=82=AB?= =?UTF-8?q?=E3=83=86=E3=82=B4=E3=83=AAID=E3=81=AE=E5=87=A6=E7=90=86?= =?UTF-8?q?=E6=BC=8F=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=E9=9D=9E?= =?UTF-8?q?=E6=8E=A8=E5=A5=A8=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=81=AE?= =?UTF-8?q?=E5=88=A9=E7=94=A8=E3=82=92=E5=9B=9E=E9=81=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/helper/SC_Helper_DB.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/data/class/helper/SC_Helper_DB.php b/data/class/helper/SC_Helper_DB.php index 50ab6152e7..7d0f916325 100644 --- a/data/class/helper/SC_Helper_DB.php +++ b/data/class/helper/SC_Helper_DB.php @@ -837,12 +837,15 @@ public function sfCountCategory($objQuery = NULL, $is_force_all_count = false, $ } } + // 差分があったIDとその親カテゴリID + $arrTgtCategoryId = $arrNotExistsProductCategoryId; + foreach ($arrNotExistsProductCategoryId as $category_id) { $objQuery->delete('dtb_category_count', 'category_id = ?', array($category_id)); - } - // 差分があったIDとその親カテゴリID - $arrTgtCategoryId = $arrNotExistsProductCategoryId; + $arrParentID = self::sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id); + $arrTgtCategoryId = array_merge($arrTgtCategoryId, $arrParentID); + } // dtb_category_countの更新 差分のあったカテゴリだけ更新する。 foreach ($arrNew as $category_id => $count) { @@ -855,7 +858,7 @@ public function sfCountCategory($objQuery = NULL, $is_force_all_count = false, $ $sqlval['category_id'] = $category_id; $objQuery->insert('dtb_category_count', $sqlval); } - $arrParentID = $this->sfGetParents('dtb_category', 'parent_category_id', 'category_id', $category_id); + $arrParentID = self::sfGetParentsArray('dtb_category', 'parent_category_id', 'category_id', $category_id); $arrTgtCategoryId = array_merge($arrTgtCategoryId, $arrParentID); } $arrTgtCategoryId = array_unique($arrTgtCategoryId); From 85f4df6ce00b9141c4a8de172b391e00dedaaaeb Mon Sep 17 00:00:00 2001 From: Seasoft Date: Sat, 17 Feb 2024 03:21:02 +0900 Subject: [PATCH 055/214] =?UTF-8?q?test=20#125=20=E5=BC=B7=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SC_Helper_DB_sfCountCategoryTest.php | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php index 72c07a9cbf..9c5a87160a 100644 --- a/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php +++ b/tests/class/helper/SC_Helper_DB/SC_Helper_DB_sfCountCategoryTest.php @@ -19,26 +19,49 @@ protected function setUp() public function testSfCountCategory() { + // 全カテゴリに1商品を割り当てる $this->objDb->updateProductCategories($this->category_ids, $this->product_id); $this->objDb->sfCountCategory($this->objQuery); + // 検証 $category_counts = $this->objQuery->select('*', 'dtb_category_count'); + $category_ids = []; foreach ($category_counts as $arrCategoryCount) { - $this->assertTrue(in_array($arrCategoryCount['category_id'], $this->category_ids)); + $category_ids[] = $arrCategoryCount['category_id']; $this->assertEquals(1, $arrCategoryCount['product_count']); } + + // カテゴリに過不足がないことを検証する。 + // TODO: phpUnit 7.5 以降になったら、assertEqualsCanonicalizing を使うべき。ただ、型の違いが無視されるか分からない。(array_diff は無視されるので都合が良い。) + $this->assertSame( + array_diff($category_ids, $this->category_ids), // 過剰を検出 + array_diff($this->category_ids, $category_ids), // 不足を検出 + '不足 (that 側に出力) または過剰 (to 側に出力) がある。' + ); } public function testSfCountCategoryWithTotalCount() { - $this->objDb->addProductBeforCategories($this->category_ids[0], $this->product_id); + // できるだけ深い階層のカテゴリをテスト対象とする。 + $arrCategory = $this->objQuery->getRow('*', 'dtb_category', '0=0 ORDER BY level DESC LIMIT 1'); + + // 商品カテゴリ登録 + $this->objDb->addProductBeforCategories($arrCategory['category_id'], $this->product_id); $this->objDb->sfCountCategory($this->objQuery); + // 検証 $category_total_counts = $this->objQuery->select('*', 'dtb_category_total_count'); - $this->assertCount(1, $category_total_counts); + $this->assertCount((int)$arrCategory['level'], $category_total_counts); foreach ($category_total_counts as $arrCategoryTotalCount) { $this->assertTrue(in_array($arrCategoryTotalCount['category_id'], $this->category_ids)); $this->assertEquals(1, $arrCategoryTotalCount['product_count']); } + + // 商品カテゴリ削除 + $this->objDb->removeProductByCategories($arrCategory['category_id'], $this->product_id); + $this->objDb->sfCountCategory($this->objQuery); + // 検証 + $category_ids = $this->objQuery->getCol('category_id', 'dtb_category_total_count'); + $this->assertEmpty($category_ids, 'dtb_category_total_count にデータが残っている。: ' . var_export($category_ids, true)); } public function testSfCountCategoryWithNoStockHidden() @@ -79,7 +102,6 @@ public function setUpCategories() $delete_tables = ['dtb_category', 'dtb_product_categories', 'dtb_category_total_count', 'dtb_category_count']; foreach ($delete_tables as $table) { $this->objQuery->delete($table); - } $this->product_id = $this->objGenerator->createProduct(); 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 056/214] 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] --- 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 057/214] 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] --- 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 Date: Wed, 21 Feb 2024 14:22:09 +0900 Subject: [PATCH 058/214] =?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 @@ 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 059/214] 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] --- 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 060/214] 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] --- .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 061/214] 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] --- 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 062/214] 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] --- 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 063/214] 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] --- 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 064/214] 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] --- 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 Date: Tue, 27 Feb 2024 14:59:45 +0900 Subject: [PATCH 065/214] 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 Date: Sat, 2 Mar 2024 20:20:39 +0900 Subject: [PATCH 066/214] =?UTF-8?q?PHP=208=20=E3=81=A7=20PHPUnit=20?= =?UTF-8?q?=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7?= =?UTF-8?q?=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 全体実行で一部が 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 Date: Sat, 2 Mar 2024 20:28:37 +0900 Subject: [PATCH 067/214] =?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 Date: Sat, 2 Mar 2024 20:20:39 +0900 Subject: [PATCH 068/214] =?UTF-8?q?PHP=208=20=E3=81=A7=20PHPUnit=20?= =?UTF-8?q?=E3=81=8C=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7?= =?UTF-8?q?=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 全体実行で一部が 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 Date: Mon, 4 Mar 2024 10:41:00 +0900 Subject: [PATCH 069/214] =?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
PHP8は非対応 | | WebServer | Apache | 2.4.x or higher
(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
(InnoDBエンジン 必須) | @@ -44,7 +44,7 @@ Pull requestを送信する際は、EC-CUBEのコピーライトポリシーに | 分類 | Extensions | |----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | 必須 | pgsql / mysqli (利用するデータベースに合わせること)
pdo_pgsql / pdo_mysql (利用するデータベースに合わせること)
pdo
mbstring
zlib
ctype
session
JSON
xml
libxml
OpenSSL
zip
cURL
gd | -| 推奨 | hash
APCu / WinCache (利用する環境に合わせること)
Zend OPcache
mcrypt | +| 推奨 | hash
APCu
Zend OPcache ## インストール方法 From f2664a5df1609c1374b905844e1aa95f06159dc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 09:56:36 +0000 Subject: [PATCH 070/214] Bump @playwright/test from 1.41.2 to 1.42.1 Bumps [@playwright/test](https://github.com/microsoft/playwright) from 1.41.2 to 1.42.1. - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.41.2...v1.42.1) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 0ce7dc6843..b25c067d65 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@babel/core": "^7.23.9", "@babel/preset-env": "^7.23.9", "@faker-js/faker": "^8.4.1", - "@playwright/test": "^1.41.2", + "@playwright/test": "^1.42.1", "@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 cf3d83805a..2f90bdeb37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1126,12 +1126,12 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@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== +"@playwright/test@^1.42.1": + version "1.42.1" + resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.42.1.tgz#9eff7417bcaa770e9e9a00439e078284b301f31c" + integrity sha512-Gq9rmS54mjBL/7/MvBaNOBwbfnh7beHvS6oS4srqXFcQHpQCV1+c8JXWE8VLPyRDhgS3H8x8A7hztqI9VnwrAQ== dependencies: - playwright "1.41.2" + playwright "1.42.1" "@types/date-fns@^2.6.0": version "2.6.0" @@ -3352,17 +3352,17 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -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-core@1.42.1: + version "1.42.1" + resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.42.1.tgz#13c150b93c940a3280ab1d3fbc945bc855c9459e" + integrity sha512-mxz6zclokgrke9p1vtdy/COWBH+eOZgYUVVU34C73M+4j4HLlQJHtfcqiqqxpP0o8HhMkflvfbquLX5dg6wlfA== -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== +playwright@1.42.1: + version "1.42.1" + resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.42.1.tgz#79c828b51fe3830211137550542426111dc8239f" + integrity sha512-PgwB03s2DZBcNRoW+1w9E+VkLBxweib6KTXM0M3tkiT4jVxKSi6PmVJ591J+0u10LUrgxB7dLRbiJqO5s2QPMg== dependencies: - playwright-core "1.41.2" + playwright-core "1.42.1" optionalDependencies: fsevents "2.3.2" From bb63e29ee5ae6ba1686dc679659e3768c825d96e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 09:56:49 +0000 Subject: [PATCH 071/214] Bump eslint from 8.56.0 to 8.57.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.56.0 to 8.57.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.56.0...v8.57.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 0ce7dc6843..488b0edd7b 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.56.0", + "eslint": "^8.57.0", "eslint-config-jquery": "^3.0.2", "eslint-plugin-import": "^2.29.1", "tar": "^6.2.0", diff --git a/yarn.lock b/yarn.lock index cf3d83805a..33196e535c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1002,17 +1002,17 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@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== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@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": +"@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== @@ -2181,16 +2181,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 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.56.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== +eslint@^8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" From 35d51b57590d5dcd9279971a637cfda2002cfd58 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 09:20:20 +0000 Subject: [PATCH 072/214] Bump pear/pear-core-minimal from 1.10.14 to 1.10.15 Bumps [pear/pear-core-minimal](https://github.com/pear/pear-core-minimal) from 1.10.14 to 1.10.15. - [Release notes](https://github.com/pear/pear-core-minimal/releases) - [Commits](https://github.com/pear/pear-core-minimal/compare/v1.10.14...v1.10.15) --- updated-dependencies: - dependency-name: pear/pear-core-minimal dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 8aa71983bb..12087779fc 100644 --- a/composer.lock +++ b/composer.lock @@ -358,16 +358,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.14", + "version": "v1.10.15", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32" + "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32", - "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/d457b5c93e5001fbf4b5726d21038266e029e3be", + "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be", "shasum": "" }, "require": { @@ -403,7 +403,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2023-11-26T16:15:38+00:00" + "time": "2024-03-09T19:38:40+00:00" }, { "name": "pear/pear_exception", From 03b016e923606b832455905c7db0a3e5889db51f Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Thu, 14 Mar 2024 22:43:22 +0900 Subject: [PATCH 073/214] Fix problem e2e tests --- composer.json | 2 +- composer.lock | 19 +++++++++++-------- e2e-tests/test/admin/system/index.test.ts | 4 ++-- e2e-tests/test/front_guest/entry.test.ts | 4 ++-- e2e-tests/test/front_guest/shopping.test.ts | 6 +++--- e2e-tests/test/installer/installer.test.ts | 4 ++-- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index b4f51117fc..61e18075f5 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "doctrine/instantiator": "~1.0.5", "fzaninotto/faker": "^1.8", "nanasess/ec-cube2-class-extends-stubs": "^1.0", - "nanasess/eccube2-fixture-generator": "^1.1", + "nanasess/eccube2-fixture-generator": "^1.2", "php5friends/phpunit48": ">=4.8.41", "phpdocumentor/reflection-docblock": "~2.0.5", "symfony/yaml": "^2.8 || ^3.4 || ^4.4" diff --git a/composer.lock b/composer.lock index dba8e720f5..33d4b38130 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "df4fdb9be635c8cd1ad5f094d26e0543", + "content-hash": "68a1a4c5d36015095a9a24aaf26a1df2", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -956,21 +956,24 @@ }, { "name": "nanasess/eccube2-fixture-generator", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/nanasess/eccube2-fixture-generator.git", - "reference": "9fd7a564df676716a6da52713036b0340fca82e3" + "reference": "c1e89014c77f830f3e6fb8d69ef16b10a3c50791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nanasess/eccube2-fixture-generator/zipball/9fd7a564df676716a6da52713036b0340fca82e3", - "reference": "9fd7a564df676716a6da52713036b0340fca82e3", + "url": "https://api.github.com/repos/nanasess/eccube2-fixture-generator/zipball/c1e89014c77f830f3e6fb8d69ef16b10a3c50791", + "reference": "c1e89014c77f830f3e6fb8d69ef16b10a3c50791", "shasum": "" }, "require": { "fzaninotto/faker": "^1.8" }, + "require-dev": { + "symfony/console": "^2.8 || ^3.4 || ^4.4 || ^5.4 || ^6.4" + }, "suggest": { "ec-cube2/cli": "Required if using the cli interface." }, @@ -995,9 +998,9 @@ ], "support": { "issues": "https://github.com/nanasess/eccube2-fixture-generator/issues", - "source": "https://github.com/nanasess/eccube2-fixture-generator/tree/1.1.1" + "source": "https://github.com/nanasess/eccube2-fixture-generator/tree/1.2.0" }, - "time": "2022-04-12T01:47:04+00:00" + "time": "2024-03-14T13:26:46+00:00" }, { "name": "php5friends/global-state11", @@ -2085,5 +2088,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/e2e-tests/test/admin/system/index.test.ts b/e2e-tests/test/admin/system/index.test.ts index 59fb5fc618..6134cc1d8a 100644 --- a/e2e-tests/test/admin/system/index.test.ts +++ b/e2e-tests/test/admin/system/index.test.ts @@ -40,9 +40,9 @@ test.describe.serial('システム設定＞メンバー管理画面を確認を }); const name = faker.name.lastName(); - const department = faker.company.companyName(); + const department = faker.company.name(); const user = fakerEn.internet.password(); - const password = fakerEn.fake('{{internet.password}}{{datatype.number}}'); + const password = fakerEn.helpers.fake('{{internet.password}}{{datatype.number}}'); test('メンバー登録を確認します', async () => { popup.on('dialog', dialog => dialog.accept()); await popup.fill('input[name=name]', name); diff --git a/e2e-tests/test/front_guest/entry.test.ts b/e2e-tests/test/front_guest/entry.test.ts index afc80b312b..3578664441 100644 --- a/e2e-tests/test/front_guest/entry.test.ts +++ b/e2e-tests/test/front_guest/entry.test.ts @@ -49,7 +49,7 @@ test.describe.serial('会員登録のテストをします', () => { await page.fill('input[name=name02]', faker.name.firstName()); await page.fill('input[name=kana01]', 'イシ'); await page.fill('input[name=kana02]', 'キュウブ'); - await page.fill('input[name=company_name]', faker.company.companyName()); + await page.fill('input[name=company_name]', faker.company.name()); await page.fill('input[name=zip01]', faker.address.zipCode('###')); await page.fill('input[name=zip02]', faker.address.zipCode('####')); await page.selectOption('select[name=pref]', { label: faker.address.state() }); @@ -61,7 +61,7 @@ test.describe.serial('会員登録のテストをします', () => { await page.fill('input[name=fax01]', faker.phone.number('###')); await page.fill('input[name=fax02]', faker.phone.number('###')); await page.fill('input[name=fax03]', faker.phone.number('###')); - email = fakerEN.fake(String(Date.now()) + '.{{internet.exampleEmail}}').toLowerCase(); + email = fakerEN.helpers.fake(String(Date.now()) + '.{{internet.exampleEmail}}').toLowerCase(); await page.fill('input[name=email]', email); await page.fill('input[name=email02]', email); const password = faker.datatype.uuid(); diff --git a/e2e-tests/test/front_guest/shopping.test.ts b/e2e-tests/test/front_guest/shopping.test.ts index ee14c23744..6344acf188 100644 --- a/e2e-tests/test/front_guest/shopping.test.ts +++ b/e2e-tests/test/front_guest/shopping.test.ts @@ -57,7 +57,7 @@ test.describe.serial('購入フロー(ゲスト)のテストをします', () => await page.fill('input[name=order_name02]', faker.name.firstName()); await page.fill('input[name=order_kana01]', 'イシ'); await page.fill('input[name=order_kana02]', 'キュウブ'); - await page.fill('input[name=order_company_name]', faker.company.companyName()); + await page.fill('input[name=order_company_name]', faker.company.name()); await page.fill('input[name=order_zip01]', faker.address.zipCode('###')); await page.fill('input[name=order_zip02]', faker.address.zipCode('####')); await page.selectOption('select[name=order_pref]', { label: faker.address.state() }); @@ -69,7 +69,7 @@ test.describe.serial('購入フロー(ゲスト)のテストをします', () => await page.fill('input[name=order_fax01]', faker.phone.number('###')); await page.fill('input[name=order_fax02]', faker.phone.number('###')); await page.fill('input[name=order_fax03]', faker.phone.number('###')); - email = fakerEN.fake(String(Date.now()) + '.{{internet.exampleEmail}}').toLowerCase(); + email = fakerEN.helpers.fake(String(Date.now()) + '.{{internet.exampleEmail}}').toLowerCase(); await page.fill('input[name=order_email]', email); await page.fill('input[name=order_email02]', email); const sex = faker.datatype.number({ min: 1, max: 2 }); @@ -86,7 +86,7 @@ test.describe.serial('購入フロー(ゲスト)のテストをします', () => await page.fill('input[name=shipping_name02]', faker.name.firstName()); await page.fill('input[name=shipping_kana01]', 'イシ'); await page.fill('input[name=shipping_kana02]', 'キュウブ'); - await page.fill('input[name=shipping_company_name]', faker.company.companyName()); + await page.fill('input[name=shipping_company_name]', faker.company.name()); await page.fill('input[name=shipping_zip01]', faker.address.zipCode('###')); await page.fill('input[name=shipping_zip02]', faker.address.zipCode('####')); await page.selectOption('select[name=shipping_pref]', { label: faker.address.state() }); diff --git a/e2e-tests/test/installer/installer.test.ts b/e2e-tests/test/installer/installer.test.ts index c6322f8555..837d0d7ee1 100644 --- a/e2e-tests/test/installer/installer.test.ts +++ b/e2e-tests/test/installer/installer.test.ts @@ -37,8 +37,8 @@ test.describe.serial('インストーラのテストをします', () => { await expect(page.locator('h2').first()).toHaveText('ECサイトの設定'); adminDirectory = faker.datatype.uuid().substring(0, 8); user = faker.internet.userName(); - password = faker.fake('{{internet.password}}{{datatype.number}}'); - await page.fill('input[name=shop_name]', faker.company.companyName()); + password = faker.helpers.fake('{{internet.password}}{{datatype.number}}'); + await page.fill('input[name=shop_name]', faker.company.name()); await page.fill('input[name=admin_mail]', faker.internet.exampleEmail()); await page.fill('input[name=login_id]', user); await page.fill('input[name=login_pass]', password); From da2b95b1668d22d8102279b264f252aaefc92253 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 15 Mar 2024 09:32:10 +0900 Subject: [PATCH 074/214] Add phpstan --- composer.json | 1 + composer.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 61e18075f5..4ae78d48ea 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "nanasess/eccube2-fixture-generator": "^1.2", "php5friends/phpunit48": ">=4.8.41", "phpdocumentor/reflection-docblock": "~2.0.5", + "phpstan/phpstan": "^1.10", "symfony/yaml": "^2.8 || ^3.4 || ^4.4" }, "require": { diff --git a/composer.lock b/composer.lock index 33d4b38130..0cd83b5eec 100644 --- a/composer.lock +++ b/composer.lock @@ -1312,6 +1312,68 @@ }, "time": "2020-03-05T15:02:03+00:00" }, + { + "name": "phpstan/phpstan", + "version": "1.10.62", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", + "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2024-03-13T12:27:20+00:00" + }, { "name": "phpunit/php-code-coverage", "version": "2.2.4", @@ -2088,5 +2150,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } From b127979162f31e9707473d11cf69f44da423b138 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 15 Mar 2024 09:37:47 +0900 Subject: [PATCH 075/214] =?UTF-8?q?MySQL=E3=81=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=80=85=E3=81=AE=E5=90=8D=E5=89=8D=E3=81=8C=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=8C=96=E3=81=91=E3=81=99=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eccube_install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eccube_install.sh b/eccube_install.sh index 1d43c3b60d..e7008ac233 100755 --- a/eccube_install.sh +++ b/eccube_install.sh @@ -176,6 +176,9 @@ dtb_tax_rule_tax_rule_id_seq get_optional_sql() { + if [ ${DBTYPE} = "mysql" ]; then + echo "SET CHARACTER SET 'utf8';" + fi echo "INSERT INTO dtb_member (member_id, login_id, password, name, salt, work, del_flg, authority, creator_id, rank, update_date) VALUES (2, 'admin', '${ADMINPASS}', '管理者', '${AUTH_MAGIC}', '1', '0', '0', '0', '1', current_timestamp);" echo "INSERT INTO dtb_baseinfo (id, shop_name, email01, email02, email03, email04, top_tpl, product_tpl, detail_tpl, mypage_tpl, update_date) VALUES (1, '${SHOP_NAME}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', '${ADMIN_MAIL}', 'default1', 'default1', 'default1', 'default1', current_timestamp);" } From 43b7cf0a83c421dcd6cedd7c260d0460359b06f9 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 15 Mar 2024 09:49:59 +0900 Subject: [PATCH 076/214] =?UTF-8?q?workflow=5Fcall=20=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Composit action を使用して、各JOBで dockerbuild を実行する - Pull Request で docker push できないため --- .github/actions/dockerbuild/action.yml | 66 ++++++ .github/workflows/auto-merge.yml | 42 ---- .github/workflows/dockerbuild.yml | 177 +++------------- .github/workflows/e2e-tests.yml | 147 +++++++------ .github/workflows/main.yml | 280 ++++--------------------- .github/workflows/phpstan.yml | 85 +++----- .github/workflows/success.yml | 11 + .github/workflows/unit-tests.yml | 79 +++++++ docker-compose.owaspzap.daemon.yml | 9 + 9 files changed, 345 insertions(+), 551 deletions(-) create mode 100644 .github/actions/dockerbuild/action.yml delete mode 100644 .github/workflows/auto-merge.yml create mode 100644 .github/workflows/success.yml create mode 100644 .github/workflows/unit-tests.yml diff --git a/.github/actions/dockerbuild/action.yml b/.github/actions/dockerbuild/action.yml new file mode 100644 index 0000000000..e0ef3cd85a --- /dev/null +++ b/.github/actions/dockerbuild/action.yml @@ -0,0 +1,66 @@ +inputs: + php-version: + default: '7.4' + requires: true +runs: + using: "Composite" + steps: + - name: downcase REPO + run: | + echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} + + - if: ${{ inputs.php-version >= 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} + + ## Used when creating multi-platform images + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v2 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v2 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + # set latest tag for default branch + type=raw,value=${{ inputs.php-version }}-apache,prefix=,enable={{is_default_branch}} + type=ref,event=branch,prefix=${{ inputs.php-version }}-apache- + type=ref,event=tag,prefix=${{ inputs.php-version }}-apache- + type=ref,event=pr,prefix=${{ inputs.php-version }}-apache-pr- + type=match,prefix=${{ inputs.php-version }}-apache-,pattern=eccube-(.*),group=1 + type=match,prefix=${{ inputs.php-version }}-apache-,pattern=eccube2-weekly-(.*),group=1 + type=semver,pattern={{raw}} + type=sha,format=short + + - name: Build and export to Docker + uses: docker/build-push-action@v5 + with: + context: . + load: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max + build-args: | + PHP_VERSION_TAG=${{ inputs.php-version }} + GD_OPTIONS=${{ env.GD_OPTIONS }} + EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} + APCU=${{ env.APCU }} + FORCE_YES=${{ env.FORCE_YES }} + APT_REPO=${{ env.APT_REPO }} + APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml deleted file mode 100644 index 346976993b..0000000000 --- a/.github/workflows/auto-merge.yml +++ /dev/null @@ -1,42 +0,0 @@ -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: Checkout repository with preceding commits - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - 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 - env: - WORKFLOW_RUN_CONTEXT: ${{ toJson(github.event.workflow_run) }} - # 失敗したときにデバッグ用に情報を出力しておく - run: | - echo "Haven't met the conditions to merge yet" - echo "$WORKFLOW_RUN_CONTEXT" - exit 1 diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 792c771d56..29546e8e03 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -1,13 +1,11 @@ name: Testing dockerbuild on: - push: - branches: - - "master" - paths: - - '**' - - '!*.md' - release: - types: [ published ] + workflow_call: + inputs: + event_name: + required: true + type: string + env: REGISTRY: ghcr.io @@ -21,157 +19,40 @@ 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', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] steps: - - name: downcase REPO - run: | - echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} - - - if: ${{ matrix.php == 5.4 }} - 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 "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 }} - 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=" >> ${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.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=" >> ${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@v4 - ## Used when creating multi-platform images - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v2 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v2 - - - name: Setup environment - 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@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - # set latest tag for default branch - type=raw,value=${{ matrix.php }}-apache,prefix=,enable={{is_default_branch}} - type=ref,event=branch,prefix=${{ matrix.php }}-apache- - type=ref,event=tag,prefix=${{ matrix.php }}-apache- - type=ref,event=pr,prefix=${{ matrix.php }}-apache-pr- - type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube-(.*),group=1 - type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube2-weekly-(.*),group=1 - - name: Build and export to Docker - uses: docker/build-push-action@v5 + - name: Build docker image + uses: ./.github/actions/dockerbuild with: - context: . - load: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - PHP_VERSION_TAG=${{ matrix.php }} - GD_OPTIONS=${{ env.GD_OPTIONS }} - EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} - APCU=${{ env.APCU }} - FORCE_YES=${{ env.FORCE_YES }} - APT_REPO=${{ env.APT_REPO }} - APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} - - - name: Setup to EC-CUBE - env: - REGISTRY: ${{ env.REGISTRY }} - IMAGE_NAME: ${{ env.IMAGE_NAME }} - TAG: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} - HTTP_URL: https://127.0.0.1:8085/ - HTTPS_URL: https://127.0.0.1:8085/ - run: | - sudo chown -R 1001:1000 zap - sudo chmod -R g+w zap - docker-compose up -d + php-version: ${{ matrix.php }} - - run: sleep 1 - - run: | - yarn install - yarn run playwright install --with-deps chromium - yarn playwright install-deps chromium + - name: Setup environment + run: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV - - name: Run to E2E testing - env: - GROUP: ${{ matrix.group }} - PATTERN: ${{ matrix.pattern }} - HTTPS_PROXY: 'localhost:8090' - HTTP_PROXY: 'localhost:8090' - CI: 1 - FORCE_COLOR: 1 - run: yarn test:e2e e2e-tests/test/front_guest - run: git checkout composer.* ## see https://docs.github.com/ja/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action - - name: Push Docker image - uses: docker/build-push-action@v5 - if: success() - with: - context: . - push: true - # platforms: linux/amd64,linux/arm64 - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - PHP_VERSION_TAG=${{ matrix.php }} - GD_OPTIONS=${{ env.GD_OPTIONS }} - EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} - APCU=${{ env.APCU }} - FORCE_YES=${{ env.FORCE_YES }} - APT_REPO=${{ env.APT_REPO }} - APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} + # - name: Push Docker image + # uses: docker/build-push-action@v5 + # if: success() && ${{ inputs.event_name != 'pull_request' }} + # with: + # context: . + # push: true + # # platforms: linux/amd64,linux/arm64 + # tags: ${{ steps.meta.outputs.tags }} + # labels: ${{ steps.meta.outputs.labels }} + # build-args: | + # PHP_VERSION_TAG=${{ matrix.php }} + # GD_OPTIONS=${{ env.GD_OPTIONS }} + # EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} + # APCU=${{ env.APCU }} + # FORCE_YES=${{ env.FORCE_YES }} + # APT_REPO=${{ env.APT_REPO }} + # APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} - name: Upload evidence if: failure() diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 06f3757f61..cb1bb2e2d9 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -2,16 +2,24 @@ name: E2E testing for EC-CUBE run-name: E2E testing for EC-CUBE on: - workflow_run: - workflows: [CI/CD for EC-CUBE] - types: [completed] - + workflow_call: + inputs: + ref_name: + required: false + type: string + base_ref: + required: false + type: string + event_name: + required: true + type: string + owner: + required: true + type: string 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: @@ -22,11 +30,15 @@ jobs: - 'test/front_login' - 'test/front_guest' - 'test/admin' - + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + db: [ mysql, pgsql ] steps: - name: Checkout uses: actions/checkout@v4 + - name: Build docker image + uses: ./.github/actions/dockerbuild + # - name: Create ADMIN_DIR # run: | # sudo apt-fast install -y sharutils @@ -34,6 +46,22 @@ jobs: - name: Setup environment run: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.dev.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV + - name: Setup environment + env: + REF_NAME: ${{ inputs.ref_name }} + BASE_REF: ${{ inputs.base_ref }} + EVENT_NAME: ${{ inputs.event_name }} + OWNER: ${{ inputs.owner }} + DB: ${{ matrix.db }} + PHP: ${{ matrix.php }} + run: | + echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV + echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV + if [ $EVENT_NAME = "pull_request" ]; then + echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + else + echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV + fi - if: matrix.pattern == 'test:e2e-extends' run: cp -rp tests/class/fixtures/page_extends/* data/class_extends/page_extends @@ -41,14 +69,19 @@ jobs: run: | sudo chown -R 1001:1000 zap sudo chmod -R g+w zap - docker build -t ec-cube2 --build-arg PHP_VERSION_TAG=7.4 . - docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:7.4-apache - TAG=7.4-apache docker-compose up -d - docker-compose exec -T ec-cube composer install - docker-compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" --ignore-platform-req=php -W - docker-compose exec -T ec-cube composer update 'symfony/*' --ignore-platform-req=php -W - docker-compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5 - docker-compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = 'zap_user@example.com' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);" + docker compose up -d --wait + docker compose exec -T ec-cube composer install + docker compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" --ignore-platform-req=php -W + docker compose exec -T ec-cube composer update 'symfony/*' --ignore-platform-req=php -W + docker compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5 + + - if: ${{ matrix.db == 'pgsql' }} + run: | + docker compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = 'zap_user@example.com' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);" + + - if: ${{ matrix.db == 'mysql' }} + run: | + docker compose exec mysql mysql --user=eccube_db_user --password=password eccube_db -e "UPDATE dtb_customer SET email = 'zap_user@example.com' WHERE customer_id = (SELECT customer_id FROM (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0) AS A);" - run: sleep 1 - run: | @@ -81,13 +114,11 @@ jobs: installer: name: Installer test runs-on: ubuntu-22.04 - if: | - github.event.workflow_run.conclusion == 'success' strategy: 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', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] include: - db: mysql dbport: '3306' @@ -102,63 +133,31 @@ jobs: dbname: 'eccube_db' dbhost: 'postgres' steps: - ## TODO GitHub Container Registry が使えるようになったら workflow_run で書き直す - - if: ${{ matrix.php == 5.4 }} - 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 "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 }} - 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=" >> ${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.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=" >> ${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@v4 + - name: Build docker image + uses: ./.github/actions/dockerbuild + with: + php-version: ${{ matrix.php }} + - name: Setup environment env: - DB_TYPE: ${{ matrix.db }} - run: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB_TYPE}.yml:docker-compose.dev.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV + REF_NAME: ${{ inputs.ref_name }} + BASE_REF: ${{ inputs.base_ref }} + EVENT_NAME: ${{ inputs.event_name }} + OWNER: ${{ inputs.owner }} + DB: ${{ matrix.db }} + PHP: ${{ matrix.php }} + run: | + echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV + echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV + if [ $EVENT_NAME = "pull_request" ]; then + echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + else + echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV + fi + - name: Setup to EC-CUBE env: HTTP_URL: https://127.0.0.1:8085/ @@ -168,12 +167,8 @@ jobs: sudo chown -R 1001:1000 zap sudo chmod -R g+w zap sh -c 'echo "> 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}" --build-arg FORCE_YES="${FORCE_YES}" --build-arg APT_REPO="${APT_REPO}" --build-arg APT_SECURITY_REPO="${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 - - - run: docker-compose exec -T ec-cube composer require smarty/smarty "^3.1" - if: matrix.php < 7.1 + docker compose up -d --wait + docker compose exec -T ec-cube composer install - run: sleep 1 - run: | diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05f2d4ad55..e80a786676 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,238 +1,50 @@ name: CI/CD for EC-CUBE -run-name: CI/CD for EC-CUBE on: - workflow_run: - workflows: [PHPStan] - types: [completed] - + push: + branches: + - '*' + tags: + - '*' + paths: + - '**' + - '!*.md' + pull_request: + paths: + - '**' + - '!*.md' 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: - 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: - - db: mysql - dbport: '3306' - dbuser: 'root' - dbpass: 'password' - dbname: 'eccube_db' - - db: pgsql - dbport: '5432' - dbuser: 'postgres' - dbpass: 'password' - dbname: 'eccube_db' - - services: - mysql: - image: mysql:5.7 - env: - MYSQL_ROOT_PASSWORD: password - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - postgres: - image: postgres:15 - env: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: password - POSTGRES_DB: postgres - POSTGRES_HOST_AUTH_METHOD: md5 - POSTGRES_INITDB_ARGS: --auth-host=md5 - ports: - - 5432:5432 - # needed because the postgres container does not provide a healthcheck - options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - mailcatcher: - image: schickling/mailcatcher - ports: - - 1080:1080 - - 1025:1025 - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v4 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - # see https://github.com/composer/composer/issues/10340 - - run: sudo composer selfupdate --2.2 - if: matrix.php < 7.2 - - - name: composer install - run: composer install --no-interaction -o - - - run: composer require smarty/smarty "^3.1" - if: matrix.php < 7.1 - - - name: Setup PHP - uses: nanasess/setup-php@master - with: - php-version: ${{ matrix.php }} - - - name: Setup PHP5.6 - if: matrix.php == '5.6' - run: sudo apt-fast install -y php5.6-fpm - - name: php-fpm - env: - PHP_VERSION: ${{ matrix.php }} - run: | - if [ -f /lib/systemd/system/php${PHP_VERSION}-fpm.service ] - then - sudo systemctl enable php${PHP_VERSION}-fpm - fi - - name: Install symfony/cli - # server:ca:install でエラーは出るが利用可能 - continue-on-error: true - run: | - sudo apt-fast -y install libnss3-tools - wget https://get.symfony.com/cli/installer -O - | bash - sudo mv ~/.symfony/bin/symfony /usr/local/bin/symfony - symfony local:php:list - symfony server:ca:install - - - name: Create ADMIN_DIR - run: | - sudo apt-fast install -y sharutils - echo "ADMIN_DIR=$(head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 | sed 's,[/+],_,g' | head -c10)/" >> $GITHUB_ENV - - - name: Setup to EC-CUBE - env: - DB: ${{ matrix.db }} - USER: ${{ matrix.dbuser }} - DBUSER: ${{ matrix.dbuser }} - DBPASS: ${{ matrix.dbpass }} - DBNAME: ${{ matrix.dbname }} - DBPORT: ${{ matrix.dbport }} - HTTP_URL: https://127.0.0.1:8085/ - HTTPS_URL: https://127.0.0.1:8085/ - run: | - sudo apt-fast install -y mysql-client postgresql-client - ./eccube_install.sh ${DB} - - - name: setup-chromedriver - uses: nanasess/setup-chromedriver@master - - - run: sleep 1 - - name: Run to PHPUnit - run: data/vendor/bin/phpunit --exclude-group classloader,mysql_prepare - - name: Run to PHPUnit classloader - run: data/vendor/bin/phpunit --group classloader - - name: Run to PHPUnit mysql_prepare - # XXX 連続してテストを実行すると、何故か MySQL の prepare statement に失敗するため個別に実行する - run: data/vendor/bin/phpunit --group mysql_prepare - - name: Run to PHPUnit SessionFactory - run: data/vendor/bin/phpunit tests/class/SC_SessionFactoryTest.php - - - name: Upload logs - if: failure() - uses: actions/upload-artifact@v4 - with: - name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs - path: data/logs - - run-on-windows: - name: Run on Windows - runs-on: ${{ matrix.operating-system }} - if: | - github.event.workflow_run.conclusion == 'success' - strategy: - fail-fast: false - matrix: - operating-system: [ windows-2022 ] - php: [ 5.5, 5.6, 7.1, 7.2, 7.3, 7.4 ] - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Get Composer Cache Directory - id: composer-cache - run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v4 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**\composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - run: echo "extension=gd" >> C:/tools/php/php.ini - shell: bash - - # see https://github.com/composer/composer/issues/10340 - - run: composer selfupdate --2.2 - if: matrix.php < 7.2 - - - name: composer install - run: composer install --no-interaction -o - - - run: composer require smarty/smarty "^3.1" - if: matrix.php < 7.1 - shell: bash - - - name: Start PostgreSQL on Windows - # see https://www.cybertec-postgresql.com/en/postgresql-github-actions-continuous-integration/ - run: | - echo $env:PGBIN >> $Env:GITHUB_PATH - $pgService = Get-Service -Name postgresql* - Set-Service -InputObject $pgService -Status running -StartupType automatic - Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru - $env:PGPASSWORD = 'root' - (Get-Content $env:PGDATA\postgresql.conf) | foreach { $_ -replace "#password_encryption = scram-sha-256","password_encryption = md5" } | Set-Content $env:PGDATA\postgresql.conf - (Get-Content $env:PGDATA\pg_hba.conf) | foreach { $_ -replace "scram-sha-256","md5" } | Set-Content $env:PGDATA\pg_hba.conf - Restart-Service -InputObject $pgService -Force - Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru - & $env:PGBIN\createuser -U postgres -d -R eccube_db_user - & $env:PGBIN\psql -U postgres -c "ALTER role eccube_db_user with password 'root';" postgres - & $env:PGBIN\createdb --owner=eccube_db_user eccube_db - - - name: Setup PHP - uses: nanasess/setup-php@master - with: - php-version: ${{ matrix.php }} - - - name: Setup to EC-CUBE - env: - DB: pgsql - DBUSER: eccube_db_user - DBPASS: root - DBNAME: eccube_db - DBPORT: 5432 - DBSERVER: 127.0.0.1 - HTTP_URL: http://127.0.0.1:8085/ - HTTPS_URL: http://127.0.0.1:8085/ - run: | - echo $PATH - bash eccube_install.sh pgsql - shell: bash - - run: sleep 1 - shell: bash - - name: Run to PHPUnit - run: data/vendor/bin/phpunit --exclude-group classloader - - name: Run to PHPUnit classloader - run: data/vendor/bin/phpunit --group classloader - - name: Run to PHPUnit SessionFactory - run: | - sed 's|http://|https://|g' -i.bak data/config/config.php - data/vendor/bin/phpunit tests/class/SC_SessionFactoryTest.php - - name: Upload logs - if: failure() - uses: actions/upload-artifact@v4 - with: - name: windows-php${{ matrix.php }}-${{ matrix.db }}-logs - path: data\logs + dockerbuild: + with: + event_name: ${{ github.event_name }} + uses: ./.github/workflows/dockerbuild.yml + phpstan: + with: + ref_name: ${{ github.ref_name }} + base_ref: ${{ github.base_ref }} + event_name: ${{ github.event_name }} + owner: ${{ github.repository_owner }} + needs: [ dockerbuild ] + uses: ./.github/workflows/phpstan.yml + unit-tests: + with: + ref_name: ${{ github.ref_name }} + base_ref: ${{ github.base_ref }} + event_name: ${{ github.event_name }} + owner: ${{ github.repository_owner }} + needs: [ dockerbuild ] + uses: ./.github/workflows/unit-tests.yml + e2e-tests: + with: + ref_name: ${{ github.ref_name }} + base_ref: ${{ github.base_ref }} + event_name: ${{ github.event_name }} + owner: ${{ github.repository_owner }} + needs: [ dockerbuild ] + uses: ./.github/workflows/e2e-tests.yml + success: + needs: + - phpstan + - unit-tests + - e2e-tests + uses: ./.github/workflows/success.yml diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 19950eb471..96d47fdb71 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -2,65 +2,48 @@ name: PHPStan run-name: PHPStan on: - push: - branches: - - '*' - tags: - - '*' - paths: - - '**' - - '!*.md' - pull_request: - paths: - - '**' - - '!*.md' - pull_request_review: - types: [submitted] - + workflow_call: + inputs: + ref_name: + required: false + type: string + base_ref: + required: false + type: string + event_name: + required: true + type: string + owner: + required: true + type: string jobs: phpstan: name: PHPStan - runs-on: ubuntu-latest - services: - postgres: - image: postgres:15 - env: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: password - POSTGRES_DB: postgres - ports: - - 5432:5432 - # needed because the postgres container does not provide a healthcheck - options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 steps: - name: "Checkout" uses: actions/checkout@v4 - - name: Setup PHP - uses: nanasess/setup-php@master + + - name: Build docker image + uses: ./.github/actions/dockerbuild with: - php-version: '8.1' - - name: composer install - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # 暫定対応 - run: | - sudo composer selfupdate - composer config github-oauth.github.com ${GITHUB_TOKEN} - composer install --dev --no-interaction -o --apcu-autoloader - composer require --dev --ignore-platform-req=php phpstan/phpstan + php-version: '8.3' - - name: Setup to EC-CUBE + - name: Setup environment env: - DB: pgsql - USER: postgres - DBUSER: postgres - DBPASS: password - DBNAME: eccube_db - DBPORT: 5432 - HTTP_URL: http://localhost:8085/ - HTTPS_URL: http://localhost:8085/ + REF_NAME: ${{ inputs.ref_name }} + BASE_REF: ${{ inputs.base_ref }} + EVENT_NAME: ${{ inputs.event_name }} + OWNER: ${{ inputs.owner }} run: | - ./eccube_install.sh ${DB} - - - name: PHPStan - run: data/vendor/bin/phpstan analyze data/ --error-format=github + echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.dev.yml" >> $GITHUB_ENV + echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV + if [ $EVENT_NAME = "pull_request" ]; then + echo "TAG=8.3-apache-${BASE_REF}" >> $GITHUB_ENV + else + echo "TAG=8.3-apache-${REF_NAME}" >> $GITHUB_ENV + fi + - run: | + docker compose up -d --wait + docker compose exec -T ec-cube composer install + - run: docker compose exec -T ec-cube php data/vendor/bin/phpstan --memory-limit=512M --no-progress analyze data/ --error-format=github diff --git a/.github/workflows/success.yml b/.github/workflows/success.yml new file mode 100644 index 0000000000..537ef3027e --- /dev/null +++ b/.github/workflows/success.yml @@ -0,0 +1,11 @@ +name: success + +on: + workflow_call: + +jobs: + success: + runs-on: ubuntu-latest + steps: + - name: success + run: echo "::notice::success!" diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml new file mode 100644 index 0000000000..31cb41d05a --- /dev/null +++ b/.github/workflows/unit-tests.yml @@ -0,0 +1,79 @@ +name: CI/CD for EC-CUBE +run-name: CI/CD for EC-CUBE + +on: + workflow_call: + inputs: + ref_name: + required: false + type: string + base_ref: + required: false + type: string + event_name: + required: true + type: string + owner: + required: true + type: string +jobs: + run-on-linux: + name: Run on Linux + runs-on: ${{ matrix.operating-system }} + strategy: + fail-fast: false + matrix: + operating-system: [ ubuntu-22.04 ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + db: [ mysql, pgsql ] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Build docker image + uses: ./.github/actions/dockerbuild + with: + php-version: ${{ matrix.php }} + + - name: Create ADMIN_DIR + run: | + sudo apt-fast install -y sharutils + echo "ADMIN_DIR=$(head -c 10 < /dev/random | uuencode -m - | tail -n 2 |head -n 1 | sed 's,[/+],_,g' | head -c10)/" >> $GITHUB_ENV + + - name: Setup environment + env: + REF_NAME: ${{ inputs.ref_name }} + BASE_REF: ${{ inputs.base_ref }} + EVENT_NAME: ${{ inputs.event_name }} + OWNER: ${{ inputs.owner }} + DB: ${{ matrix.db }} + PHP: ${{ matrix.php }} + run: | + echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml" >> $GITHUB_ENV + echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV + if [ $EVENT_NAME = "pull_request" ]; then + echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + else + echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV + fi + - run: | + docker compose up -d --wait + docker compose exec -T ec-cube composer install + - run: sleep 10 + - name: Run to PHPUnit + run: docker compose exec -T ec-cube php data/vendor/bin/phpunit --exclude-group classloader,mysql_prepare + - name: Run to PHPUnit classloader + run: docker compose exec -T ec-cube php data/vendor/bin/phpunit --group classloader + - name: Run to PHPUnit mysql_prepare + # XXX 連続してテストを実行すると、何故か MySQL の prepare statement に失敗するため個別に実行する + run: docker compose exec -T ec-cube php data/vendor/bin/phpunit --group mysql_prepare + - name: Run to PHPUnit SessionFactory + run: docker compose exec -T ec-cube php data/vendor/bin/phpunit tests/class/SC_SessionFactoryTest.php + + - name: Upload logs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs + path: data/logs diff --git a/docker-compose.owaspzap.daemon.yml b/docker-compose.owaspzap.daemon.yml index 4861fb97b1..352fc8a744 100644 --- a/docker-compose.owaspzap.daemon.yml +++ b/docker-compose.owaspzap.daemon.yml @@ -3,3 +3,12 @@ version: "3" services: zap: command: bash -c "zap.sh -daemon -addonupdate -addoninstall help_ja_JP -addoninstall wappalyzer -addoninstall sequence -addonuninstall hud -configfile /zap/wrk/options.properties -certpubdump /zap/wrk/owasp_zap_root_ca.cer -host 0.0.0.0 -port 8090 -config api.addrs.addr.name=.* -config api.addrs.addr.regex=true" + healthcheck: + interval: 1m30s + retries: 3 + test: + - CMD + - curl + - -f + - http://zap:8090/UI/core/ + timeout: 10s From f2c93d6d7d737ccdaed84c8ce324b0c12d00581c Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 15 Mar 2024 15:12:32 +0900 Subject: [PATCH 077/214] =?UTF-8?q?Composit=20action=20=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E3=81=97=E3=81=A6=E3=80=81=E5=90=84JOB=E3=81=A7=20doc?= =?UTF-8?q?kerbuild=20=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Pull Request で docker push できないため --- .github/actions/dockerbuild/action.yml | 29 +++++++++++++++----------- .github/workflows/dockerbuild.yml | 6 ++++++ .github/workflows/e2e-tests.yml | 2 ++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/.github/actions/dockerbuild/action.yml b/.github/actions/dockerbuild/action.yml index e0ef3cd85a..6957de097a 100644 --- a/.github/actions/dockerbuild/action.yml +++ b/.github/actions/dockerbuild/action.yml @@ -1,15 +1,25 @@ +name: 'Docker build action' +description: 'Builds a Docker image for PHP' inputs: php-version: + description: 'PHP version to build' default: '7.4' - requires: true + required: true + registry: + description: 'Docker registry to push to' + default: 'ghcr.io' + required: true + runs: - using: "Composite" + using: "composite" steps: - name: downcase REPO + shell: 'bash' run: | echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} - if: ${{ inputs.php-version >= 7.4 }} + shell: 'bash' run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} @@ -24,18 +34,11 @@ runs: # - name: Set up Docker Buildx # uses: docker/setup-buildx-action@v2 - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: ${{ inputs.registry }}/${{ env.IMAGE_NAME }} tags: | # set latest tag for default branch type=raw,value=${{ inputs.php-version }}-apache,prefix=,enable={{is_default_branch}} @@ -47,6 +50,8 @@ runs: type=semver,pattern={{raw}} type=sha,format=short + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Build and export to Docker uses: docker/build-push-action@v5 with: @@ -54,8 +59,8 @@ runs: load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max + cache-from: type=gha,scope=php-${{ inputs.php-version }} + cache-to: type=gha,mode=max,scope=php-${{ inputs.php-version }} build-args: | PHP_VERSION_TAG=${{ inputs.php-version }} GD_OPTIONS=${{ env.GD_OPTIONS }} diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 29546e8e03..37d5299557 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -33,6 +33,12 @@ jobs: - name: Setup environment 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@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - run: git checkout composer.* ## see https://docs.github.com/ja/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index cb1bb2e2d9..f9617ffb2f 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -38,6 +38,8 @@ jobs: - name: Build docker image uses: ./.github/actions/dockerbuild + with: + php-version: ${{ matrix.php }} # - name: Create ADMIN_DIR # run: | From a33e129e5bde3a7adb339bfd9f85bc35598435c8 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 15 Mar 2024 15:30:44 +0900 Subject: [PATCH 078/214] =?UTF-8?q?docker=20push=20=E3=81=AF=E5=BE=93?= =?UTF-8?q?=E6=9D=A5=E3=81=AE=20dockerbuild=20workflow=20=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild-and-push.yml | 147 +++++++++++++++++++++ .github/workflows/dockerbuild.yml | 43 ------ 2 files changed, 147 insertions(+), 43 deletions(-) create mode 100644 .github/workflows/dockerbuild-and-push.yml diff --git a/.github/workflows/dockerbuild-and-push.yml b/.github/workflows/dockerbuild-and-push.yml new file mode 100644 index 0000000000..429c03c3c9 --- /dev/null +++ b/.github/workflows/dockerbuild-and-push.yml @@ -0,0 +1,147 @@ +name: Docker build and push +on: + push: + branches: + - "master" + paths: + - '**' + - '!*.md' + release: + types: [ published ] +env: + REGISTRY: ghcr.io + +jobs: + dockerbuild: + name: dockerbuild + runs-on: ubuntu-22.04 + permissions: + contents: read + packages: write + strategy: + fail-fast: false + matrix: + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + + steps: + - name: downcase REPO + run: | + echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${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@v4 + ## Used when creating multi-platform images + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v2 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v2 + + - name: Setup environment + 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@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + # set latest tag for default branch + type=raw,value=${{ matrix.php }}-apache,prefix=,enable={{is_default_branch}} + type=ref,event=branch,prefix=${{ matrix.php }}-apache- + type=ref,event=tag,prefix=${{ matrix.php }}-apache- + type=ref,event=pr,prefix=${{ matrix.php }}-apache-pr- + type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube-(.*),group=1 + type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube2-weekly-(.*),group=1 + + - name: Build and export to Docker + uses: docker/build-push-action@v5 + with: + context: . + load: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | + PHP_VERSION_TAG=${{ matrix.php }} + GD_OPTIONS=${{ env.GD_OPTIONS }} + EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} + APCU=${{ env.APCU }} + FORCE_YES=${{ env.FORCE_YES }} + APT_REPO=${{ env.APT_REPO }} + APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} + + - name: Setup to EC-CUBE + env: + REGISTRY: ${{ env.REGISTRY }} + IMAGE_NAME: ${{ env.IMAGE_NAME }} + TAG: ${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} + HTTP_URL: https://127.0.0.1:8085/ + HTTPS_URL: https://127.0.0.1:8085/ + run: | + sudo chown -R 1001:1000 zap + sudo chmod -R g+w zap + docker-compose up -d + + - run: sleep 1 + - run: | + yarn install + yarn run playwright install --with-deps chromium + yarn playwright install-deps chromium + + - name: Run to E2E testing + env: + GROUP: ${{ matrix.group }} + PATTERN: ${{ matrix.pattern }} + HTTPS_PROXY: 'localhost:8090' + HTTP_PROXY: 'localhost:8090' + CI: 1 + FORCE_COLOR: 1 + run: yarn test:e2e e2e-tests/test/front_guest + + - run: git checkout composer.* + ## see https://docs.github.com/ja/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action + - name: Push Docker image + uses: docker/build-push-action@v5 + if: success() + with: + context: . + push: true + # platforms: linux/amd64,linux/arm64 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | + PHP_VERSION_TAG=${{ matrix.php }} + GD_OPTIONS=${{ env.GD_OPTIONS }} + EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} + APCU=${{ env.APCU }} + FORCE_YES=${{ env.FORCE_YES }} + APT_REPO=${{ env.APT_REPO }} + APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} + + - name: Upload evidence + if: failure() + uses: actions/upload-artifact@v4 + with: + name: linux-php${{ matrix.php }}-evidence + path: 'test-results/' + - name: Upload logs + if: failure() + uses: actions/upload-artifact@v4 + with: + name: linux-php${{ matrix.php }}-logs + path: data/logs diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 37d5299557..b5686cdb32 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -29,46 +29,3 @@ jobs: uses: ./.github/actions/dockerbuild with: php-version: ${{ matrix.php }} - - - name: Setup environment - 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@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - run: git checkout composer.* - ## see https://docs.github.com/ja/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action - # - name: Push Docker image - # uses: docker/build-push-action@v5 - # if: success() && ${{ inputs.event_name != 'pull_request' }} - # with: - # context: . - # push: true - # # platforms: linux/amd64,linux/arm64 - # tags: ${{ steps.meta.outputs.tags }} - # labels: ${{ steps.meta.outputs.labels }} - # build-args: | - # PHP_VERSION_TAG=${{ matrix.php }} - # GD_OPTIONS=${{ env.GD_OPTIONS }} - # EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }} - # APCU=${{ env.APCU }} - # FORCE_YES=${{ env.FORCE_YES }} - # APT_REPO=${{ env.APT_REPO }} - # APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }} - - - name: Upload evidence - if: failure() - uses: actions/upload-artifact@v4 - with: - name: linux-php${{ matrix.php }}-evidence - path: 'test-results/' - - name: Upload logs - if: failure() - uses: actions/upload-artifact@v4 - with: - name: linux-php${{ matrix.php }}-logs - path: data/logs From 42e8c93197d1df620fed9b49f503d24b8ec9a218 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:12:07 +0000 Subject: [PATCH 079/214] Bump date-fns from 3.3.1 to 3.6.0 Bumps [date-fns](https://github.com/date-fns/date-fns) from 3.3.1 to 3.6.0. - [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/v3.3.1...v3.6.0) --- updated-dependencies: - dependency-name: date-fns dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c4e04e2086..6fb94e2819 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dependencies": { "@babel/polyfill": "^7.12.1", "css-loader": "^6.10.0", - "date-fns": "^3.3.1", + "date-fns": "^3.6.0", "jquery": "3", "jquery-colorbox": "^1.6.4", "jquery-easing": "^0.0.1", diff --git a/yarn.lock b/yarn.lock index f7123efb9f..6a44f5fd1f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1889,10 +1889,10 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -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== +date-fns@*, date-fns@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" + integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww== debug@^3.2.7: version "3.2.7" From 972fbbd056fde3dbc8b641c8f91835c0f1ea7061 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:36:35 +0000 Subject: [PATCH 080/214] Bump mobiledetect/mobiledetectlib from 2.8.45 to 3.74.3 Bumps [mobiledetect/mobiledetectlib](https://github.com/serbanghita/Mobile-Detect) from 2.8.45 to 3.74.3. - [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.45...3.74.3) --- updated-dependencies: - dependency-name: mobiledetect/mobiledetectlib dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index b4f51117fc..e9c484dbf3 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "php": "^5.4 || ^7.0 || ^8.0", "ext-gd": "*", "ext-mbstring": "*", - "mobiledetect/mobiledetectlib": "^2.8", + "mobiledetect/mobiledetectlib": "^3.74", "nanasess/mdb2": "^2.5", "nanasess/php8-compat": "^1.0", "pear/archive_tar": "^1.4.3", diff --git a/composer.lock b/composer.lock index d5799a1f1f..d472458aab 100644 --- a/composer.lock +++ b/composer.lock @@ -4,35 +4,37 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "df4fdb9be635c8cd1ad5f094d26e0543", + "content-hash": "b324eef6e09f705d4eacbb43a76d5b23", "packages": [ { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.45", + "version": "3.74.3", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "96aaebcf4f50d3d2692ab81d2c5132e425bca266" + "reference": "39582ab62f86b40e4edb698159f895929a29c346" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/96aaebcf4f50d3d2692ab81d2c5132e425bca266", - "reference": "96aaebcf4f50d3d2692ab81d2c5132e425bca266", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/39582ab62f86b40e4edb698159f895929a29c346", + "reference": "39582ab62f86b40e4edb698159f895929a29c346", "shasum": "" }, "require": { - "php": ">=5.0.0" + "php": ">=7.4" }, "require-dev": { - "phpunit/phpunit": "~4.8.36" + "friendsofphp/php-cs-fixer": "^3.14", + "phpunit/phpunit": "^9.6", + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { - "psr-0": { - "Detection": "namespaced/" + "psr-4": { + "Detection\\": "src/" }, "classmap": [ - "Mobile_Detect.php" + "src/MobileDetect.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -43,7 +45,7 @@ { "name": "Serban Ghita", "email": "serbanghita@gmail.com", - "homepage": "http://mobiledetect.net", + "homepage": "https://mobiledetect.net", "role": "Developer" } ], @@ -58,7 +60,7 @@ ], "support": { "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.45" + "source": "https://github.com/serbanghita/Mobile-Detect/tree/3.74.3" }, "funding": [ { @@ -66,7 +68,7 @@ "type": "github" } ], - "time": "2023-11-07T21:57:25+00:00" + "time": "2023-10-27T16:28:04+00:00" }, { "name": "nanasess/mdb2", @@ -2085,5 +2087,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 40e68159e3e40c0bbdb54b8189a8891241a4b0d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:36:44 +0000 Subject: [PATCH 081/214] Bump setasign/fpdi from 1.6.2 to 2.6.0 Bumps [setasign/fpdi](https://github.com/Setasign/FPDI) from 1.6.2 to 2.6.0. - [Release notes](https://github.com/Setasign/FPDI/releases) - [Commits](https://github.com/Setasign/FPDI/compare/1.6.2...v2.6.0) --- updated-dependencies: - dependency-name: setasign/fpdi dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 55 ++++++++++++++++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index b4f51117fc..ec79c0f256 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "pear/xml_serializer": "*", "pear/xml_util": "*", "setasign/fpdf": "^1.8", - "setasign/fpdi": "^1.6", + "setasign/fpdi": "^2.6", "smarty/smarty": "^3.1 || ^4.3" }, "autoload": { diff --git a/composer.lock b/composer.lock index d5799a1f1f..7665df8dfb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "df4fdb9be635c8cd1ad5f094d26e0543", + "content-hash": "0f2da3d50a7a9e17b72e8ada3abd7165", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -688,32 +688,40 @@ }, { "name": "setasign/fpdi", - "version": "1.6.2", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea" + "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6ad58897a6d97cc2d2cd2adaeda343b25a368ea", - "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6db878129ec6c7e141316ee71872923e7f1b7ad", + "reference": "a6db878129ec6c7e141316ee71872923e7f1b7ad", "shasum": "" }, + "require": { + "ext-zlib": "*", + "php": "^5.6 || ^7.0 || ^8.0" + }, + "conflict": { + "setasign/tfpdf": "<1.31" + }, + "require-dev": { + "phpunit/phpunit": "~5.7", + "setasign/fpdf": "~1.8.6", + "setasign/tfpdf": "~1.33", + "squizlabs/php_codesniffer": "^3.5", + "tecnickcom/tcpdf": "~6.2" + }, "suggest": { - "setasign/fpdf": "FPDI will extend this class but as it is also possible to use \"tecnickcom/tcpdf\" as an alternative there's no fixed dependency configured.", - "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.", - "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF." + "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured." }, "type": "library", "autoload": { - "classmap": [ - "filters/", - "fpdi.php", - "fpdf_tpl.php", - "fpdi_pdf_parser.php", - "pdf_context.php" - ] + "psr-4": { + "setasign\\Fpdi\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -724,6 +732,11 @@ "name": "Jan Slabon", "email": "jan.slabon@setasign.com", "homepage": "https://www.setasign.com" + }, + { + "name": "Maximilian Kresse", + "email": "maximilian.kresse@setasign.com", + "homepage": "https://www.setasign.com" } ], "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.", @@ -735,9 +748,15 @@ ], "support": { "issues": "https://github.com/Setasign/FPDI/issues", - "source": "https://github.com/Setasign/FPDI/tree/master" + "source": "https://github.com/Setasign/FPDI/tree/v2.6.0" }, - "time": "2017-05-11T14:25:49+00:00" + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi", + "type": "tidelift" + } + ], + "time": "2023-12-11T16:03:32+00:00" }, { "name": "smarty/smarty", @@ -2085,5 +2104,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 57ac059482811c94ca85236daf91da58663a3300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:36:48 +0000 Subject: [PATCH 082/214] Bump smarty/smarty from 4.3.4 to 4.4.1 Bumps [smarty/smarty](https://github.com/smarty-php/smarty) from 4.3.4 to 4.4.1. - [Release notes](https://github.com/smarty-php/smarty/releases) - [Changelog](https://github.com/smarty-php/smarty/blob/v4.4.1/CHANGELOG.md) - [Commits](https://github.com/smarty-php/smarty/compare/v4.3.4...v4.4.1) --- updated-dependencies: - dependency-name: smarty/smarty dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index d5799a1f1f..ec53648a2b 100644 --- a/composer.lock +++ b/composer.lock @@ -741,16 +741,16 @@ }, { "name": "smarty/smarty", - "version": "v4.3.4", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "3931d8f54b8f7a4ffab538582d34d4397ba8daa5" + "reference": "f4152e9b814ae2369b6e4935c05e1e0c3654318d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/3931d8f54b8f7a4ffab538582d34d4397ba8daa5", - "reference": "3931d8f54b8f7a4ffab538582d34d4397ba8daa5", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/f4152e9b814ae2369b6e4935c05e1e0c3654318d", + "reference": "f4152e9b814ae2369b6e4935c05e1e0c3654318d", "shasum": "" }, "require": { @@ -801,9 +801,9 @@ "support": { "forum": "https://github.com/smarty-php/smarty/discussions", "issues": "https://github.com/smarty-php/smarty/issues", - "source": "https://github.com/smarty-php/smarty/tree/v4.3.4" + "source": "https://github.com/smarty-php/smarty/tree/v4.4.1" }, - "time": "2023-09-14T10:59:08+00:00" + "time": "2024-02-26T13:58:37+00:00" } ], "packages-dev": [ @@ -2085,5 +2085,5 @@ "platform-overrides": { "php": "7.4.0" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 6be4f90db082d8f819f24f336461c9a4ad87b9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AE=E3=81=B6?= Date: Mon, 18 Mar 2024 20:07:51 +0900 Subject: [PATCH 083/214] =?UTF-8?q?dtb=5Fshipping=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=83=83=E3=83=89=E3=83=AD=E3=83=83=E3=82=AF=E3=82=92=E5=9B=9E?= =?UTF-8?q?=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/helper/SC_Helper_Purchase.php | 34 +++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/data/class/helper/SC_Helper_Purchase.php b/data/class/helper/SC_Helper_Purchase.php index 897b074617..71c34bb509 100644 --- a/data/class/helper/SC_Helper_Purchase.php +++ b/data/class/helper/SC_Helper_Purchase.php @@ -679,7 +679,10 @@ public static function registerShipping($order_id, $arrParams, $convert_shipping $objQuery = SC_Query_Ex::getSingletonInstance(); $table = 'dtb_shipping'; $where = 'order_id = ?'; - $objQuery->delete($table, $where, array($order_id)); + + if ($objQuery->count($table, $where, [$order_id]) > 0) { + $objQuery->delete($table, $where, array($order_id)); + } foreach ($arrParams as $key => $arrShipping) { $arrValues = $objQuery->extractOnlyColsOf($table, $arrShipping); @@ -709,6 +712,21 @@ public static function registerShipping($order_id, $arrParams, $convert_shipping $objQuery->insert($table, $arrValues); } + + $sql_sub = <<< __EOS__ + SELECT deliv_time + FROM dtb_delivtime + WHERE time_id = dtb_shipping.time_id + AND deliv_id = (SELECT dtb_order.deliv_id FROM dtb_order WHERE order_id = dtb_shipping.order_id) + __EOS__; + $objQuery->update( + 'dtb_shipping', + array(), + $where, + array($order_id), + array('shipping_time' => "($sql_sub)") + ); + } /** @@ -1267,20 +1285,6 @@ public static function sfUpdateOrderNameCol($order_id, $temp_table = false) } else { $tgt_table = 'dtb_order'; $sql_where = 'order_id = ?'; - - $sql_sub = <<< __EOS__ - SELECT deliv_time - FROM dtb_delivtime - WHERE time_id = dtb_shipping.time_id - AND deliv_id = (SELECT dtb_order.deliv_id FROM dtb_order WHERE order_id = dtb_shipping.order_id) -__EOS__; - $objQuery->update( - 'dtb_shipping', - array(), - $sql_where, - array($order_id), - array('shipping_time' => "($sql_sub)") - ); } $objQuery->update( From 5e2194d518b0933aa2079fac4a92315982ee246e Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 19 Mar 2024 01:01:32 +0900 Subject: [PATCH 084/214] Fix MobileDetect --- data/class/SC_SmartphoneUserAgent.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/class/SC_SmartphoneUserAgent.php b/data/class/SC_SmartphoneUserAgent.php index 0e4d5a66a3..22b8ea1f65 100644 --- a/data/class/SC_SmartphoneUserAgent.php +++ b/data/class/SC_SmartphoneUserAgent.php @@ -21,6 +21,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +use Detection\MobileDetect; + /** * スマートフォンの情報を扱うクラス. * @@ -36,7 +38,7 @@ class SC_SmartphoneUserAgent */ public static function isSmartphone() { - $detect = new Mobile_Detect; + $detect = new MobileDetect(); // SPでかつPC表示OFFの場合 // TabletはPC扱い return ($detect->isMobile() && !$detect->isTablet()) && !SC_SmartphoneUserAgent_Ex::getSmartphonePcFlag(); From c2b82cd86355a588fa9e22d235a699a5bcf08685 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Tue, 19 Mar 2024 01:08:13 +0900 Subject: [PATCH 085/214] Fix Fpdi --- data/module/fpdi/japanese.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/module/fpdi/japanese.php b/data/module/fpdi/japanese.php index b695477101..007d0225b9 100644 --- a/data/module/fpdi/japanese.php +++ b/data/module/fpdi/japanese.php @@ -1,5 +1,6 @@ 278,'!'=>299,'"'=>353,'#'=>614,'$'=>614,'%'=>721,'&'=>735,'\''=>216, '('=>323,')'=>323,'*'=>449,'+'=>529,','=>219,'-'=>306,'.'=>219,'/'=>453,'0'=>614,'1'=>614, '2'=>614,'3'=>614,'4'=>614,'5'=>614,'6'=>614,'7'=>614,'8'=>614,'9'=>614,':'=>219,';'=>219, @@ -11,7 +12,7 @@ 'n'=>579,'o'=>550,'p'=>578,'q'=>566,'r'=>410,'s'=>444,'t'=>340,'u'=>575,'v'=>512,'w'=>760, 'x'=>503,'y'=>529,'z'=>453,'{'=>326,'|'=>380,'}'=>326,'~'=>387); -class PDF_Japanese extends FPDI +class PDF_Japanese extends Fpdi { function AddCIDFont($family, $style, $name, $cw, $CMap, $registry) { From defc1df6c5fd383e52a579239c94c34417a06756 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 22 Mar 2024 20:09:25 +0900 Subject: [PATCH 086/214] =?UTF-8?q?dockerbuild=20=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=82=92=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - テスト実行時の docker build ではキャッシュを保存しない --- .github/actions/dockerbuild/action.yml | 6 +++++- .github/workflows/dockerbuild.yml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/dockerbuild/action.yml b/.github/actions/dockerbuild/action.yml index 6957de097a..297a65eec1 100644 --- a/.github/actions/dockerbuild/action.yml +++ b/.github/actions/dockerbuild/action.yml @@ -9,6 +9,10 @@ inputs: description: 'Docker registry to push to' default: 'ghcr.io' required: true + cache-to: + description: 'Add the Docker build layer to the cache' + default: ~ + required: false runs: using: "composite" @@ -60,7 +64,7 @@ runs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha,scope=php-${{ inputs.php-version }} - cache-to: type=gha,mode=max,scope=php-${{ inputs.php-version }} + cache-to: ${{ inputs.cache-to }} build-args: | PHP_VERSION_TAG=${{ inputs.php-version }} GD_OPTIONS=${{ env.GD_OPTIONS }} diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index b5686cdb32..5e9cb2c0c9 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -29,3 +29,4 @@ jobs: uses: ./.github/actions/dockerbuild with: php-version: ${{ matrix.php }} + cache-to: type=gha,mode=max,scope=php-${{ matrix.php }} From 777e5792e9196c7a1cf2aa5d4688f6570843af33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 09:54:20 +0000 Subject: [PATCH 087/214] Bump phpstan/phpstan from 1.10.62 to 1.10.65 Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.62 to 1.10.65. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.62...1.10.65) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5589d62317..dfb23c3722 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "68a1a4c5d36015095a9a24aaf26a1df2", + "content-hash": "0224e4b0021428d8b0873acedf754cb2", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -1314,16 +1314,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.62", + "version": "1.10.65", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9" + "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cd5c8a1660ed3540b211407c77abf4af193a6af9", - "reference": "cd5c8a1660ed3540b211407c77abf4af193a6af9", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3c657d057a0b7ecae19cb12db446bbc99d8839c6", + "reference": "3c657d057a0b7ecae19cb12db446bbc99d8839c6", "shasum": "" }, "require": { @@ -1372,7 +1372,7 @@ "type": "tidelift" } ], - "time": "2024-03-13T12:27:20+00:00" + "time": "2024-03-23T10:30:26+00:00" }, { "name": "phpunit/php-code-coverage", From f407a46ce643953b628945552ede6685f2beda78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:56:18 +0000 Subject: [PATCH 088/214] Bump symfony/polyfill-ctype from 1.26.0 to 1.29.0 Bumps [symfony/polyfill-ctype](https://github.com/symfony/polyfill-ctype) from 1.26.0 to 1.29.0. - [Commits](https://github.com/symfony/polyfill-ctype/compare/v1.26.0...v1.29.0) --- updated-dependencies: - dependency-name: symfony/polyfill-ctype dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index dfb23c3722..f36f0c768d 100644 --- a/composer.lock +++ b/composer.lock @@ -2002,16 +2002,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -2025,9 +2025,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2064,7 +2061,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -2080,7 +2077,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/yaml", From e4cb5a45ca48ac30ce552f01130215533d1d918c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 09:18:35 +0000 Subject: [PATCH 089/214] Bump doctrine/instantiator from 1.0.5 to 1.5.0 Bumps [doctrine/instantiator](https://github.com/doctrine/instantiator) from 1.0.5 to 1.5.0. - [Release notes](https://github.com/doctrine/instantiator/releases) - [Commits](https://github.com/doctrine/instantiator/compare/1.0.5...1.5.0) --- updated-dependencies: - dependency-name: doctrine/instantiator dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 48 ++++++++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 4ae78d48ea..351caa642f 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } }, "require-dev": { - "doctrine/instantiator": "~1.0.5", + "doctrine/instantiator": "~1.5.0", "fzaninotto/faker": "^1.8", "nanasess/ec-cube2-class-extends-stubs": "^1.0", "nanasess/eccube2-fixture-generator": "^1.2", diff --git a/composer.lock b/composer.lock index f36f0c768d..0e7a10cd4b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0224e4b0021428d8b0873acedf754cb2", + "content-hash": "14034a897938f540b2df29261d2c3d21", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -809,34 +809,32 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1 || ^8.0" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" @@ -850,20 +848,34 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/master" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, - "time": "2015-06-14T21:17:01+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:15:36+00:00" }, { "name": "fzaninotto/faker", From fadb5b1482c0a0e5ff6aa72f0f38d9a949636b30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 09:00:59 +0000 Subject: [PATCH 090/214] Bump smarty/smarty from 4.4.1 to 5.0.2 Bumps [smarty/smarty](https://github.com/smarty-php/smarty) from 4.4.1 to 5.0.2. - [Release notes](https://github.com/smarty-php/smarty/releases) - [Changelog](https://github.com/smarty-php/smarty/blob/v5.0.2/CHANGELOG.md) - [Commits](https://github.com/smarty-php/smarty/compare/v4.4.1...v5.0.2) --- updated-dependencies: - dependency-name: smarty/smarty dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 110 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 98 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 4ae78d48ea..cdf2f0c91b 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,7 @@ "pear/xml_util": "*", "setasign/fpdf": "^1.8", "setasign/fpdi": "^1.6", - "smarty/smarty": "^3.1 || ^4.3" + "smarty/smarty": "^5.0.2" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index f36f0c768d..fafc8d9924 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0224e4b0021428d8b0873acedf754cb2", + "content-hash": "a43896d8a7925355d796f71cd8ea207e", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -741,35 +741,39 @@ }, { "name": "smarty/smarty", - "version": "v4.4.1", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "f4152e9b814ae2369b6e4935c05e1e0c3654318d" + "reference": "bbd09c7bfaa6c2c091adc4568a944f765bb4f1d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/f4152e9b814ae2369b6e4935c05e1e0c3654318d", - "reference": "f4152e9b814ae2369b6e4935c05e1e0c3654318d", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/bbd09c7bfaa6c2c091adc4568a944f765bb4f1d9", + "reference": "bbd09c7bfaa6c2c091adc4568a944f765bb4f1d9", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0", + "symfony/polyfill-mbstring": "^1.27" }, "require-dev": { "phpunit/phpunit": "^8.5 || ^7.5", - "smarty/smarty-lexer": "^3.1" + "smarty/smarty-lexer": "^4.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { - "classmap": [ - "libs/" - ] + "files": [ + "src/functions.php" + ], + "psr-4": { + "Smarty\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -801,9 +805,89 @@ "support": { "forum": "https://github.com/smarty-php/smarty/discussions", "issues": "https://github.com/smarty-php/smarty/issues", - "source": "https://github.com/smarty-php/smarty/tree/v4.4.1" + "source": "https://github.com/smarty-php/smarty/tree/v5.0.2" + }, + "time": "2024-03-28T10:23:18+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } }, - "time": "2024-02-26T13:58:37+00:00" + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" } ], "packages-dev": [ From 6ff624c914fcd10cca2b19179d9c8534671009a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 09:01:07 +0000 Subject: [PATCH 091/214] Bump pear/archive_tar from 1.4.14 to 1.5.0 Bumps [pear/archive_tar](https://github.com/pear/Archive_Tar) from 1.4.14 to 1.5.0. - [Release notes](https://github.com/pear/Archive_Tar/releases) - [Commits](https://github.com/pear/Archive_Tar/compare/1.4.14...1.5.0) --- updated-dependencies: - dependency-name: pear/archive_tar dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/composer.lock b/composer.lock index f36f0c768d..1b8d20f07c 100644 --- a/composer.lock +++ b/composer.lock @@ -160,16 +160,16 @@ }, { "name": "pear/archive_tar", - "version": "1.4.14", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "4d761c5334c790e45ef3245f0864b8955c562caa" + "reference": "b439c859564f5cbb0f64ad6002d0afe84a889602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa", - "reference": "4d761c5334c790e45ef3245f0864b8955c562caa", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/b439c859564f5cbb0f64ad6002d0afe84a889602", + "reference": "b439c859564f5cbb0f64ad6002d0afe84a889602", "shasum": "" }, "require": { @@ -200,7 +200,7 @@ "./" ], "license": [ - "BSD-3-Clause" + "BSD-2-Clause" ], "authors": [ { @@ -226,17 +226,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar", "source": "https://github.com/pear/Archive_Tar" }, - "funding": [ - { - "url": "https://github.com/mrook", - "type": "github" - }, - { - "url": "https://www.patreon.com/michielrook", - "type": "patreon" - } - ], - "time": "2021-07-20T13:53:39+00:00" + "time": "2024-03-16T16:21:40+00:00" }, { "name": "pear/console_getopt", @@ -362,12 +352,12 @@ "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be" + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/d457b5c93e5001fbf4b5726d21038266e029e3be", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c", + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c", "shasum": "" }, "require": { @@ -380,9 +370,9 @@ }, "type": "library", "autoload": { - "psr-0": { - "": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "include-path": [ @@ -403,7 +393,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2024-03-09T19:38:40+00:00" + "time": "2024-03-16T18:41:45+00:00" }, { "name": "pear/pear_exception", From 2af9eacc0f2c1a50b899624eb24f785b9a193752 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 5 Apr 2024 10:07:01 +0900 Subject: [PATCH 092/214] Use fakerphp/faker --- composer.json | 4 +- composer.lock | 180 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 156 insertions(+), 28 deletions(-) diff --git a/composer.json b/composer.json index 4ae78d48ea..5235d35d24 100644 --- a/composer.json +++ b/composer.json @@ -23,9 +23,9 @@ }, "require-dev": { "doctrine/instantiator": "~1.0.5", - "fzaninotto/faker": "^1.8", + "fakerphp/faker": "^1.23", "nanasess/ec-cube2-class-extends-stubs": "^1.0", - "nanasess/eccube2-fixture-generator": "^1.2", + "nanasess/eccube2-fixture-generator": "^2.0", "php5friends/phpunit48": ">=4.8.41", "phpdocumentor/reflection-docblock": "~2.0.5", "phpstan/phpstan": "^1.10", diff --git a/composer.lock b/composer.lock index f36f0c768d..ca7efc8b67 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0224e4b0021428d8b0873acedf754cb2", + "content-hash": "7fbcc88d7d9d2b25ee19311bc8d5dd54", "packages": [ { "name": "mobiledetect/mobiledetectlib", @@ -866,33 +866,42 @@ "time": "2015-06-14T21:17:01+00:00" }, { - "name": "fzaninotto/faker", - "version": "v1.9.2", + "name": "fakerphp/faker", + "version": "v1.23.1", "source": { "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e" + "url": "https://github.com/FakerPHP/Faker.git", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/bfb4fe148adbf78eff521199619b93a52ae3554b", + "reference": "bfb4fe148adbf78eff521199619b93a52ae3554b", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.4 || ^8.0", + "psr/container": "^1.0 || ^2.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "conflict": { + "fzaninotto/faker": "*" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", + "doctrine/persistence": "^1.3 || ^2.0", "ext-intl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^2.9.2" + "phpunit/phpunit": "^9.5.26", + "symfony/phpunit-bridge": "^5.4.16" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } + "suggest": { + "doctrine/orm": "Required to use Faker\\ORM\\Doctrine", + "ext-curl": "Required by Faker\\Provider\\Image to download images.", + "ext-dom": "Required by Faker\\Provider\\HtmlLorem for generating random HTML.", + "ext-iconv": "Required by Faker\\Provider\\ru_RU\\Text::realText() for generating real Russian text.", + "ext-mbstring": "Required for multibyte Unicode string functionality." }, + "type": "library", "autoload": { "psr-4": { "Faker\\": "src/Faker/" @@ -914,11 +923,10 @@ "fixtures" ], "support": { - "issues": "https://github.com/fzaninotto/Faker/issues", - "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2" + "issues": "https://github.com/FakerPHP/Faker/issues", + "source": "https://github.com/FakerPHP/Faker/tree/v1.23.1" }, - "abandoned": true, - "time": "2020-12-11T09:56:16+00:00" + "time": "2024-01-02T13:46:09+00:00" }, { "name": "nanasess/ec-cube2-class-extends-stubs", @@ -956,20 +964,20 @@ }, { "name": "nanasess/eccube2-fixture-generator", - "version": "1.2.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/nanasess/eccube2-fixture-generator.git", - "reference": "c1e89014c77f830f3e6fb8d69ef16b10a3c50791" + "reference": "59546afe58352a486f32ef6b2db8c07169e9b5f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nanasess/eccube2-fixture-generator/zipball/c1e89014c77f830f3e6fb8d69ef16b10a3c50791", - "reference": "c1e89014c77f830f3e6fb8d69ef16b10a3c50791", + "url": "https://api.github.com/repos/nanasess/eccube2-fixture-generator/zipball/59546afe58352a486f32ef6b2db8c07169e9b5f9", + "reference": "59546afe58352a486f32ef6b2db8c07169e9b5f9", "shasum": "" }, "require": { - "fzaninotto/faker": "^1.8" + "fakerphp/faker": "^1.23" }, "require-dev": { "symfony/console": "^2.8 || ^3.4 || ^4.4 || ^5.4 || ^6.4" @@ -998,9 +1006,9 @@ ], "support": { "issues": "https://github.com/nanasess/eccube2-fixture-generator/issues", - "source": "https://github.com/nanasess/eccube2-fixture-generator/tree/1.2.0" + "source": "https://github.com/nanasess/eccube2-fixture-generator/tree/2.0.0" }, - "time": "2024-03-14T13:26:46+00:00" + "time": "2024-04-05T00:58:13+00:00" }, { "name": "php5friends/global-state11", @@ -1655,6 +1663,59 @@ "abandoned": true, "time": "2015-10-02T06:51:40+00:00" }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, { "name": "sebastian/comparator", "version": "1.2.4", @@ -2000,6 +2061,73 @@ }, "time": "2015-06-21T13:59:46+00:00" }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "80d075412b557d41002320b96a096ca65aa2c98d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d", + "reference": "80d075412b557d41002320b96a096ca65aa2c98d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-24T14:02:46+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.29.0", From a83b3add5745608a1e173c806a0abce94b9e24f9 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 5 Apr 2024 10:49:16 +0900 Subject: [PATCH 093/214] =?UTF-8?q?GitHub=20Actions=20=E3=81=8C=E5=A4=B1?= =?UTF-8?q?=E6=95=97=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81=E3=83=98=E3=83=AB?= =?UTF-8?q?=E3=82=B9=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=83=88=E3=83=A9=E3=82=A4=E5=9B=9E=E6=95=B0=E3=82=92=E5=A2=97?= =?UTF-8?q?=E3=82=84=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.owaspzap.daemon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.owaspzap.daemon.yml b/docker-compose.owaspzap.daemon.yml index 352fc8a744..db7e0547ac 100644 --- a/docker-compose.owaspzap.daemon.yml +++ b/docker-compose.owaspzap.daemon.yml @@ -5,7 +5,7 @@ services: command: bash -c "zap.sh -daemon -addonupdate -addoninstall help_ja_JP -addoninstall wappalyzer -addoninstall sequence -addonuninstall hud -configfile /zap/wrk/options.properties -certpubdump /zap/wrk/owasp_zap_root_ca.cer -host 0.0.0.0 -port 8090 -config api.addrs.addr.name=.* -config api.addrs.addr.regex=true" healthcheck: interval: 1m30s - retries: 3 + retries: 5 test: - CMD - curl From 037d84776e0a8862890829c964c62c22ba4331d1 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 5 Apr 2024 11:40:56 +0900 Subject: [PATCH 094/214] =?UTF-8?q?--ignore-platform-req=3Dphp=20=E3=81=AF?= =?UTF-8?q?=20PHP5=20=E5=90=91=E3=81=91=E3=81=AE=E5=AF=BE=E5=BF=9C?= =?UTF-8?q?=E3=81=AA=E3=81=AE=E3=81=A7=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e-tests.yml | 4 ++-- .github/workflows/penetration-tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f9617ffb2f..004fea853b 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -73,8 +73,8 @@ jobs: sudo chmod -R g+w zap docker compose up -d --wait docker compose exec -T ec-cube composer install - docker compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" --ignore-platform-req=php -W - docker compose exec -T ec-cube composer update 'symfony/*' --ignore-platform-req=php -W + docker compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" -W + docker compose exec -T ec-cube composer update 'symfony/*' -W docker compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5 - if: ${{ matrix.db == 'pgsql' }} diff --git a/.github/workflows/penetration-tests.yml b/.github/workflows/penetration-tests.yml index 84e8ab692a..9b5a0c8c4a 100644 --- a/.github/workflows/penetration-tests.yml +++ b/.github/workflows/penetration-tests.yml @@ -49,8 +49,8 @@ jobs: sudo chmod -R g+w zap docker-compose up -d docker-compose exec -T ec-cube composer install - docker-compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" --ignore-platform-req=php -W - docker-compose exec -T ec-cube composer update 'symfony/*' --ignore-platform-req=php -W + docker-compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" -W + docker-compose exec -T ec-cube composer update 'symfony/*' -W docker-compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5 docker-compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = 'zap_user@example.com' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);" From 2b7468d9472d7316cee0e698236540ea87747cfc Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 5 Apr 2024 23:10:12 +0900 Subject: [PATCH 095/214] =?UTF-8?q?Smarty5=20=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/class/SC_AdminView.php | 4 +-- data/class/SC_InstallView.php | 4 +-- data/class/SC_MobileView.php | 4 +-- data/class/SC_SiteView.php | 8 +++--- data/class/SC_SmartphoneView.php | 4 +-- data/class/SC_View.php | 25 +++++++++++-------- data/smarty_extends/function.from_to.php | 4 --- .../function.html_radios_ex.php | 17 ------------- 8 files changed, 27 insertions(+), 43 deletions(-) delete mode 100644 data/smarty_extends/function.html_radios_ex.php diff --git a/data/class/SC_AdminView.php b/data/class/SC_AdminView.php index b53d02ba8d..78b5001da7 100644 --- a/data/class/SC_AdminView.php +++ b/data/class/SC_AdminView.php @@ -27,8 +27,8 @@ public function init() { parent::init(); - $this->_smarty->template_dir = realpath(TEMPLATE_ADMIN_REALDIR); - $this->_smarty->compile_dir = realpath(COMPILE_ADMIN_REALDIR); + $this->_smarty->setTemplateDir(realpath(TEMPLATE_ADMIN_REALDIR)); + $this->_smarty->setCompileDir(realpath(COMPILE_ADMIN_REALDIR)); $this->assign('TPL_URLPATH_PC', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . '/'); $this->assign('TPL_URLPATH_DEFAULT', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . '/'); $this->assign('TPL_URLPATH', ROOT_URLPATH . USER_DIR . USER_PACKAGE_DIR . 'admin/'); diff --git a/data/class/SC_InstallView.php b/data/class/SC_InstallView.php index 991dac0d02..ce5f8402d3 100644 --- a/data/class/SC_InstallView.php +++ b/data/class/SC_InstallView.php @@ -27,7 +27,7 @@ public function __construct($template_dir, $compile_dir = COMPILE_REALDIR) { parent::__construct(); - $this->_smarty->template_dir = realpath($template_dir); - $this->_smarty->compile_dir = realpath($compile_dir); + $this->_smarty->setTemplateDir(realpath($template_dir)); + $this->_smarty->setCompileDir(realpath($compile_dir)); } } diff --git a/data/class/SC_MobileView.php b/data/class/SC_MobileView.php index 17aff5e401..95c00ee69d 100644 --- a/data/class/SC_MobileView.php +++ b/data/class/SC_MobileView.php @@ -30,8 +30,8 @@ public function init() { parent::init(); - $this->_smarty->template_dir = realpath(MOBILE_TEMPLATE_REALDIR); - $this->_smarty->compile_dir = realpath(MOBILE_COMPILE_REALDIR); + $this->_smarty->setTemplateDir(realpath(MOBILE_TEMPLATE_REALDIR)); + $this->_smarty->setCompileDir(realpath(MOBILE_COMPILE_REALDIR)); $this->assignTemplatePath(DEVICE_TYPE_MOBILE); } } diff --git a/data/class/SC_SiteView.php b/data/class/SC_SiteView.php index 0d0d58a636..55a052a399 100644 --- a/data/class/SC_SiteView.php +++ b/data/class/SC_SiteView.php @@ -27,8 +27,8 @@ public function init() { parent::init(); - $this->_smarty->template_dir = realpath(TEMPLATE_REALDIR); - $this->_smarty->compile_dir = realpath(COMPILE_REALDIR); + $this->_smarty->setTemplateDir(realpath(TEMPLATE_REALDIR)); + $this->_smarty->setCompileDir(realpath(COMPILE_REALDIR)); $this->assignTemplatePath(DEVICE_TYPE_PC); } @@ -38,7 +38,7 @@ public function init() */ public function setPrevURL() { - $objCartSess = new SC_CartSession_Ex(); - $objCartSess->setPrevURL($_SERVER['REQUEST_URI']); + $objCartSess = new SC_CartSession_Ex(); + $objCartSess->setPrevURL($_SERVER['REQUEST_URI']); } } diff --git a/data/class/SC_SmartphoneView.php b/data/class/SC_SmartphoneView.php index 12b540a80a..4796af5380 100644 --- a/data/class/SC_SmartphoneView.php +++ b/data/class/SC_SmartphoneView.php @@ -27,8 +27,8 @@ public function init() { parent::init(); - $this->_smarty->template_dir = realpath(SMARTPHONE_TEMPLATE_REALDIR); - $this->_smarty->compile_dir = realpath(SMARTPHONE_COMPILE_REALDIR); + $this->_smarty->setTemplateDir(realpath(SMARTPHONE_TEMPLATE_REALDIR)); + $this->_smarty->setCompileDir(realpath(SMARTPHONE_COMPILE_REALDIR)); $this->assignTemplatePath(DEVICE_TYPE_SMARTPHONE); } } diff --git a/data/class/SC_View.php b/data/class/SC_View.php index 7ded6219a4..143fc42ca4 100644 --- a/data/class/SC_View.php +++ b/data/class/SC_View.php @@ -23,7 +23,7 @@ class SC_View { - /** @var Smarty */ + /** @var \Smarty\Smarty */ public $_smarty; /** @var LC_Page */ @@ -41,9 +41,9 @@ public function __construct() public function init() { // include_phpの利用のためSmartyBCを呼び出す、ホントはinclude_phpをなくしたいそうすれば、blank.tplもなくせる - $this->_smarty = new Smarty; - $this->_smarty->left_delimiter = ''; + $this->_smarty = new \Smarty\Smarty(); + $this->_smarty->setLeftDelimiter(''); $this->_smarty->registerPlugin('modifier', 'sfDispDBDate', function ($dbdate, $time = true) { return SC_Utils_Ex::sfDispDBDate($dbdate, $time); }); $this->_smarty->registerPlugin('modifier', 'sfGetErrorColor', array('SC_Utils_Ex', 'sfGetErrorColor')); $this->_smarty->registerPlugin('modifier', 'sfTrim', array('SC_Utils_Ex', 'sfTrim')); @@ -58,6 +58,11 @@ public function init() $this->_smarty->registerPlugin('modifier', 'sfMbConvertEncoding', array('SC_Utils_Ex', 'sfMbConvertEncoding')); $this->_smarty->registerPlugin('modifier', 'sfGetEnabled', array('SC_Utils_Ex', 'sfGetEnabled')); $this->_smarty->registerPlugin('modifier', 'sfNoImageMainList', array('SC_Utils_Ex', 'sfNoImageMainList')); + $this->_smarty->registerPlugin('modifier', 'file_exists', 'file_exists'); + $this->_smarty->registerPlugin('modifier', 'function_exists', 'function_exists'); + $this->_smarty->registerPlugin('modifier', 'preg_quote', 'preg_quote'); + $this->_smarty->registerPlugin('modifier', 'is_numeric', 'is_numeric'); + $this->_smarty->registerPlugin('modifier', 'php_uname', 'php_uname'); // XXX register_function で登録すると if で使用できないのではないか？ $this->_smarty->registerPlugin('function','sfIsHTTPS', array('SC_Utils_Ex', 'sfIsHTTPS')); $this->_smarty->registerPlugin('function','sfSetErrorStyle', array('SC_Utils_Ex', 'sfSetErrorStyle')); @@ -141,10 +146,10 @@ public function registFilter() /** * prefilter用のフィルタ関数。プラグイン用のフックポイント処理を実行 * @param string $source ソース - * @param Smarty_Internal_Template $smarty Smartyのコンパイラクラス + * @param \Smarty\Template $smarty Smartyのコンパイラクラス * @return string $source ソース */ - public function prefilter_transform($source, Smarty_Internal_Template $template) + public function prefilter_transform($source, \Smarty\Template $template) { if (!is_null($this->objPage)) { // フックポイントを実行. @@ -160,10 +165,10 @@ public function prefilter_transform($source, Smarty_Internal_Template $template) /** * outputfilter用のフィルタ関数。プラグイン用のフックポイント処理を実行 * @param string $source ソース - * @param Smarty_Internal_Template $smarty Smartyのコンパイラクラス + * @param \Smarty\Template $smarty Smartyのコンパイラクラス * @return string $source ソース */ - public function outputfilter_transform($source, Smarty_Internal_Template $template) + public function outputfilter_transform($source, \Smarty\Template $template) { if (!is_null($this->objPage)) { // フックポイントを実行. @@ -281,9 +286,9 @@ public function lower_compatibility_smarty($tpl_source, $smarty) * @param Smarty_Internal_Template $template * @return string 現在のテンプレートファイルパス */ - public function getCurrentTemplateFile(Smarty_Internal_Template $template) + public function getCurrentTemplateFile(\Smarty\Template $template) { - $current_file = str_replace($template->smarty->getTemplateDir(), '', $template->source->filepath); + $current_file = str_replace($template->getSmarty()->getTemplateDir(), '', $template->getSource()->getFilepath()); return str_replace('\\', '/', $current_file); // Windows 向けにパスの区切り文字を正規化する } } diff --git a/data/smarty_extends/function.from_to.php b/data/smarty_extends/function.from_to.php index 98f3cb86ad..b5778a9712 100644 --- a/data/smarty_extends/function.from_to.php +++ b/data/smarty_extends/function.from_to.php @@ -32,10 +32,6 @@ */ function smarty_function_from_to($params, &$smarty) { - if (!is_callable('smarty_function_escape_special_chars')) { - require_once(SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'); - } - $from = null; $to = null; $separator = ' ～ '; diff --git a/data/smarty_extends/function.html_radios_ex.php b/data/smarty_extends/function.html_radios_ex.php deleted file mode 100644 index 69487e3955..0000000000 --- a/data/smarty_extends/function.html_radios_ex.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Sun, 7 Apr 2024 23:17:35 +0900 Subject: [PATCH 096/214] Adjust time zone to PHP --- e2e-tests/test/admin/total/total.test.ts | 4 ++- package.json | 1 + yarn.lock | 45 +++++++++++++++++++++--- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/e2e-tests/test/admin/total/total.test.ts b/e2e-tests/test/admin/total/total.test.ts index 50565cba3c..5f06a62072 100644 --- a/e2e-tests/test/admin/total/total.test.ts +++ b/e2e-tests/test/admin/total/total.test.ts @@ -1,5 +1,7 @@ import { test, expect, chromium, Page } from '@playwright/test'; import { ZapClient, Mode, ContextType } from '../../../utils/ZapClient'; +import { toZonedTime } from 'date-fns-tz'; + import fs from 'fs/promises'; import { ADMIN_DIR } from '../../../config/default.config'; @@ -25,7 +27,7 @@ test.describe.serial('売上集計画面を確認をします', () => { await page.goto(url); }); - const current = new Date(); + const current = toZonedTime(new Date(), 'Asia/Tokyo'); test.describe('期間別集計の確認をします', () => { const method = 'term'; test('期間別集計画面を開きます', async () => { diff --git a/package.json b/package.json index ab98d20d60..232e9db0ab 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@babel/polyfill": "^7.12.1", "css-loader": "^6.10.0", "date-fns": "^3.6.0", + "date-fns-tz": "^3.0.0", "jquery": "3", "jquery-colorbox": "^1.6.4", "jquery-easing": "^0.0.1", diff --git a/yarn.lock b/yarn.lock index 3cdb7e8271..d6ee4f0612 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1442,16 +1442,23 @@ 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.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== + ajv-formats@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== dependencies: ajv "^8.0.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== + +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-keywords@^5.1.0: version "5.1.0" @@ -1904,6 +1911,13 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +date-fns-tz@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-3.0.0.tgz#0559cd6a1aa8eca1d140f1682ad7f0e77429c13e" + integrity sha512-YgRowJwvCAAjN1A5F2l1ZjnYKThX7YDq399qo+ThXFpeOqinN1u8SUqfM5IdRQSpai18Iy3EBMb6/CXTSnDstg== + dependencies: + lodash.clonedeep "^4.5.0" + date-fns@*, date-fns@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf" @@ -3076,6 +3090,11 @@ locate-path@^7.1.0: dependencies: p-locate "^6.0.0" +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -3391,6 +3410,13 @@ picomatch@^2.2.3: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + pkg-dir@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" @@ -3706,6 +3732,15 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +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" + ajv-keywords "^3.5.2" + schema-utils@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" @@ -3716,7 +3751,7 @@ schema-utils@^4.0.0: ajv-formats "^2.1.1" ajv-keywords "^5.1.0" -semver@^6.0.0, semver@^6.3.1: +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== From 2637cd4be55c64abc46d54deb06c444895ad8714 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 8 Apr 2024 23:23:21 +0900 Subject: [PATCH 097/214] =?UTF-8?q?=E3=82=A8=E3=83=93=E3=83=87=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f9617ffb2f..62a2022b1a 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -56,6 +56,8 @@ jobs: OWNER: ${{ inputs.owner }} DB: ${{ matrix.db }} PHP: ${{ matrix.php }} + PATTERN: ${{ matrix.pattern }} + GROUP: ${{ matrix.group }} run: | echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV @@ -64,6 +66,8 @@ jobs: else echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV fi + echo "PATTERN=${PATTERN//:/-}" >> $GITHUB_ENV + echo "GROUP=${GROUP//\//-}" >> $GITHUB_ENV - if: matrix.pattern == 'test:e2e-extends' run: cp -rp tests/class/fixtures/page_extends/* data/class_extends/page_extends @@ -105,13 +109,13 @@ jobs: if: failure() uses: actions/upload-artifact@v4 with: - name: linux-php${{ matrix.tag }}-${{ matrix.db }}-evidence + name: linux-php${{ matrix.php }}-${{ matrix.db }}-${{ env.PATTERN }}-${{ env.GROUP }}-evidence path: 'test-results/' - name: Upload logs if: failure() uses: actions/upload-artifact@v4 with: - name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs + name: linux-php${{ matrix.php }}-${{ matrix.db }}-${{ env.PATTERN }}-${{ env.GROUP }}-logs path: data/logs installer: name: Installer test From a7a2b1a43b6437008436bdb52168aaa1f8270f00 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 10 Apr 2024 00:53:35 +0900 Subject: [PATCH 098/214] =?UTF-8?q?DB=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=A0?= =?UTF-8?q?=E3=82=BE=E3=83=BC=E3=83=B3=E3=82=92=20Asia/Tokyo=20=E3=81=AB?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.mysql.yml | 3 ++- docker-compose.pgsql.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 9ba2db1abd..ea0ea5c86b 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -36,12 +36,13 @@ services: mysql: image: mysql:5.7 - command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci + command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-time-zone=+09:00 ports: - '13306:3306' volumes: - mysql-database:/var/lib/mysql environment: + TZ: Asia/Tokyo MYSQL_ROOT_PASSWORD: password MYSQL_DATABASE: eccube_db MYSQL_USER: eccube_db_user diff --git a/docker-compose.pgsql.yml b/docker-compose.pgsql.yml index 96cacf6e60..1d3c1e406d 100644 --- a/docker-compose.pgsql.yml +++ b/docker-compose.pgsql.yml @@ -37,6 +37,7 @@ services: postgres: image: postgres environment: + - TZ=Asia/Tokyo - POSTGRES_DB=eccube_db - POSTGRES_USER=eccube_db_user - POSTGRES_PASSWORD=password From ac8187c2b2c71d4c7ace45180257a812881d5ebb Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Wed, 10 Apr 2024 01:25:53 +0900 Subject: [PATCH 099/214] =?UTF-8?q?docker-compose.mysql.yml=20=E3=81=AE?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=20mysql:?= =?UTF-8?q?8.0=20=E3=81=B8=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.mysql.yml | 2 +- eccube_install.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 9ba2db1abd..1a0b7f8537 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -35,7 +35,7 @@ services: PASSWORD_HASH_ALGOS: sha256 mysql: - image: mysql:5.7 + image: mysql:8.0 command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci ports: - '13306:3306' diff --git a/eccube_install.sh b/eccube_install.sh index e7008ac233..025f2c2189 100755 --- a/eccube_install.sh +++ b/eccube_install.sh @@ -269,16 +269,16 @@ case "${DBTYPE}" in #${MYSQL} -u ${ROOTUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} -e "GRANT ALL ON \`${DBNAME}\`.* TO '${DBUSER}'@'%' IDENTIFIED BY '${DBPASS}'" echo "create table..." echo "SET SESSION default_storage_engine = InnoDB; SET sql_mode = 'NO_ENGINE_SUBSTITUTION';" | - cat - ${SQL_DIR}/create_table_mysqli.sql | + cat - ${SQL_DIR}/create_table_mysqli.sql | sed -e 's/rank/`rank`/g' | ${MYSQL} -h ${DBSERVER} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME} echo "insert data..." echo "SET CHARACTER SET 'utf8';" | - cat - ${SQL_DIR}/insert_data.sql | + cat - ${SQL_DIR}/insert_data.sql | sed -e 's/rank/`rank`/g' | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME} echo "create sequence table..." create_sequence_tables echo "execute optional SQL..." - get_optional_sql | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME} + get_optional_sql | sed -e 's/rank/`rank`/g' | ${MYSQL} -u ${DBUSER} -h ${DBSERVER} -P ${DBPORT} ${PASSOPT} ${DBNAME} ;; esac From 83a904ec6ba4b65cee57e77cf5f322cd9da9586b Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 15 Apr 2024 01:55:58 +0900 Subject: [PATCH 100/214] Fix Smarty::templateExists see https://github.com/EC-CUBE/ec-cube2/issues/888 --- data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php b/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php index fd7509c968..a4add90a74 100644 --- a/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php +++ b/data/class/pages/upgrade/LC_Page_Upgrade_ProductsList.php @@ -201,7 +201,7 @@ public function process() $template = 'ownersstore/products_list.tpl'; - if (!$objView->_smarty->template_exists($template)) { + if (!$objView->_smarty->templateExists($template)) { $objLog->log('* template not exist, use default template'); // デフォルトテンプレートを使用 $template = DATA_REALDIR . 'Smarty/templates/default/admin/' . $template; From 58601007499c4d15a68719453bfea4e54ff3700b Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 15 Apr 2024 14:08:56 +0900 Subject: [PATCH 101/214] Add nofilter see https://github.com/EC-CUBE/ec-cube2/pull/748 --- data/Smarty/templates/admin/admin_popup_header.tpl | 2 +- data/Smarty/templates/admin/login_frame.tpl | 2 +- data/Smarty/templates/admin/main_frame.tpl | 2 +- data/Smarty/templates/default/popup_header.tpl | 2 +- data/Smarty/templates/sphone/popup_header.tpl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/Smarty/templates/admin/admin_popup_header.tpl b/data/Smarty/templates/admin/admin_popup_header.tpl index ffbc5f3d70..b114476a55 100644 --- a/data/Smarty/templates/admin/admin_popup_header.tpl +++ b/data/Smarty/templates/admin/admin_popup_header.tpl @@ -37,7 +37,7 @@