Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/babel/preset-env-7…
Browse files Browse the repository at this point in the history 
….26.0
  • Loading branch information
@nanasess
nanasess authored Dec 11, 2024
2 parents 0e43780 + 3e6abcb commit 52c0d0e
Show file tree
Hide file tree
Showing 8 changed files with 946 additions and 657 deletions.
1,376 changes: 918 additions & 458 deletions composer.lock
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,13 @@ public function action()
$objFormParam->convParam();
$this->arrErr = $objFormParam->checkError();
$select_file = SC_Helper_FileManager_Ex::convertToAbsolutePath($objFormParam->getValue('select_file'));
if ($select_file === realpath(USER_REALDIR)) {
GC_Utils_Ex::gfPrintLog($select_file.' は削除できません.');
$tpl_onload = "alert('user_dataは削除できません');";
$this->setTplOnLoad($tpl_onload);

break;
}
$path_exists = SC_Utils::checkFileExistsWithInBasePath($select_file, USER_REALDIR);
if (SC_Utils_Ex::isBlank($this->arrErr) && $path_exists) {
SC_Helper_FileManager_Ex::deleteFile($select_file);
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/test/installer/installer.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ test.describe.serial('インストーラのテストをします', () => {
await expect(page.locator('h2').first()).toHaveText('ECサイトの設定');
adminDirectory = faker.string.uuid().substring(0, 8);
user = faker.internet.userName();
password = faker.helpers.fake('{{internet.password}}{{datatype.number}}');
password = faker.helpers.fake('{{internet.password}}{{number.int}}');
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);
Expand Down
2 changes: 1 addition & 1 deletion html/js/eccube.js
View file

Large diffs are not rendered by default.

178 changes: 0 additions & 178 deletions html/js/eccube.js.LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,181 +19,3 @@
* jQuery Migrate - v3.5.2 - 2024-07-17T22:31Z
* Copyright OpenJS Foundation and other contributors
*/

/*! !!../../css-loader/dist/cjs.js!./colorbox.css */

/*! !!../../css-loader/dist/cjs.js!./slick-theme.css */

/*! !!../../css-loader/dist/cjs.js!./slick.css */

/*! !../../style-loader/dist/runtime/injectStylesIntoStyleTag.js */

/*! !../../style-loader/dist/runtime/insertBySelector.js */

/*! !../../style-loader/dist/runtime/insertStyleElement.js */

/*! !../../style-loader/dist/runtime/setAttributesWithoutAttributes.js */

/*! !../../style-loader/dist/runtime/styleDomAPI.js */

/*! !../../style-loader/dist/runtime/styleTagTransform.js */

/*! -!./jquery.js */

/*! ../../css-loader/dist/runtime/api.js */

/*! ../../css-loader/dist/runtime/getUrl.js */

/*! ../../css-loader/dist/runtime/sourceMaps.js */

/*! ../../expose-loader/dist/runtime/getGlobalThis.js */

/*! ./ajax-loader.gif */

/*! ./fonts/slick.eot */

/*! ./fonts/slick.svg */

/*! ./fonts/slick.ttf */

/*! ./fonts/slick.woff */

/*! images/controls.png */

/*! images/loading.gif */

/*! jquery */

/*! jquery-colorbox */

/*! jquery-colorbox/example2/colorbox.css */

/*! jquery-easing */

/*! jquery-migrate */

/*! slick-carousel */

/*! slick-carousel/slick/slick-theme.css */

/*! slick-carousel/slick/slick.css */

/*!************************!*\
!*** ./data/eccube.js ***!
\************************/

/*!********************************************!*\
!*** ./node_modules/jquery/dist/jquery.js ***!
\********************************************/

/*!****************************************************!*\
!*** ./node_modules/jquery/dist/jquery-exposed.js ***!
\****************************************************/

/*!****************************************************!*\
!*** ./node_modules/slick-carousel/slick/slick.js ***!
\****************************************************/

/*!*****************************************************!*\
!*** ./node_modules/css-loader/dist/runtime/api.js ***!
\*****************************************************/

/*!*****************************************************!*\
!*** ./node_modules/slick-carousel/slick/slick.css ***!
\*****************************************************/

/*!********************************************************!*\
!*** ./node_modules/css-loader/dist/runtime/getUrl.js ***!
\********************************************************/

/*!*********************************************************!*\
!*** ./node_modules/jquery-colorbox/jquery.colorbox.js ***!
\*********************************************************/

/*!***********************************************************!*\
!*** ./node_modules/slick-carousel/slick/ajax-loader.gif ***!
\***********************************************************/

/*!***********************************************************!*\
!*** ./node_modules/slick-carousel/slick/fonts/slick.eot ***!
\***********************************************************/

/*!***********************************************************!*\
!*** ./node_modules/slick-carousel/slick/fonts/slick.svg ***!
\***********************************************************/

/*!***********************************************************!*\
!*** ./node_modules/slick-carousel/slick/fonts/slick.ttf ***!
\***********************************************************/

/*!***********************************************************!*\
!*** ./node_modules/slick-carousel/slick/slick-theme.css ***!
\***********************************************************/

/*!************************************************************!*\
!*** ./node_modules/css-loader/dist/runtime/sourceMaps.js ***!
\************************************************************/

/*!************************************************************!*\
!*** ./node_modules/jquery-colorbox/example2/colorbox.css ***!
\************************************************************/

/*!************************************************************!*\
!*** ./node_modules/jquery-migrate/dist/jquery-migrate.js ***!
\************************************************************/

/*!************************************************************!*\
!*** ./node_modules/slick-carousel/slick/fonts/slick.woff ***!
\************************************************************/

/*!***************************************************************!*\
!*** ./node_modules/style-loader/dist/runtime/styleDomAPI.js ***!
\***************************************************************/

/*!******************************************************************!*\
!*** ./node_modules/expose-loader/dist/runtime/getGlobalThis.js ***!
\******************************************************************/

/*!******************************************************************!*\
!*** ./node_modules/jquery-colorbox/example2/images/loading.gif ***!
\******************************************************************/

/*!******************************************************************!*\
!*** ./node_modules/jquery-easing/dist/jquery.easing.1.3.umd.js ***!
\******************************************************************/

/*!*******************************************************************!*\
!*** ./node_modules/jquery-colorbox/example2/images/controls.png ***!
\*******************************************************************/

/*!********************************************************************!*\
!*** ./node_modules/style-loader/dist/runtime/insertBySelector.js ***!
\********************************************************************/

/*!*********************************************************************!*\
!*** ./node_modules/style-loader/dist/runtime/styleTagTransform.js ***!
\*********************************************************************/

/*!**********************************************************************!*\
!*** ./node_modules/style-loader/dist/runtime/insertStyleElement.js ***!
\**********************************************************************/

/*!****************************************************************************!*\
!*** ./node_modules/style-loader/dist/runtime/injectStylesIntoStyleTag.js ***!
\****************************************************************************/

/*!**********************************************************************************!*\
!*** ./node_modules/style-loader/dist/runtime/setAttributesWithoutAttributes.js ***!
\**********************************************************************************/

/*!*******************************************************************************************!*\
!*** ./node_modules/css-loader/dist/cjs.js!./node_modules/slick-carousel/slick/slick.css ***!
\*******************************************************************************************/

/*!*************************************************************************************************!*\
!*** ./node_modules/css-loader/dist/cjs.js!./node_modules/slick-carousel/slick/slick-theme.css ***!
\*************************************************************************************************/

/*!**************************************************************************************************!*\
!*** ./node_modules/css-loader/dist/cjs.js!./node_modules/jquery-colorbox/example2/colorbox.css ***!
\**************************************************************************************************/
2 changes: 1 addition & 1 deletion html/js/eccube.js.map
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
"jquery-easing": "^0.0.1",
"jquery-migrate": "^3.5.2",
"slick-carousel": "^1.8.1",
"style-loader": "^3.3.4",
"style-loader": "^4.0.0",
"url-loader": "^4.1.1",
"webpack": "^5.95.0"
},
"devDependencies": {
"@babel/core": "^7.25.8",
"@babel/preset-env": "^7.26.0",
"@faker-js/faker": "^8.4.1",
"@faker-js/faker": "^9.2.0",
"@playwright/test": "^1.48.2",
"@types/date-fns": "^2.6.0",
"@types/date-fns": "^2.6.3",
"@types/faker": "^6.6.11",
"@types/tar": "^6.1.13",
"@typescript-eslint/eslint-plugin": "^5.62.0",
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,10 +964,10 @@
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==

"@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==
"@faker-js/faker@^9.2.0":
version "9.2.0"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-9.2.0.tgz#269ee3a5d2442e88e10d984e106028422bcb9551"
integrity sha512-ulqQu4KMr1/sTFIYvqSdegHT8NIkt66tFAkugGnHA+1WAfEn6hMzNR+svjXGFRVLnapxvej67Z/LwchFrnLBUg==

"@humanwhocodes/config-array@^0.13.0":
version "0.13.0"
Expand Down Expand Up @@ -1085,10 +1085,10 @@
resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==

"@types/date-fns@^2.6.0":
version "2.6.0"
resolved "https://registry.yarnpkg.com/@types/date-fns/-/date-fns-2.6.0.tgz#b062ca46562002909be0c63a6467ed173136acc1"
integrity sha512-9DSw2ZRzV0Tmpa6PHHJbMcZn79HHus+BBBohcOaDzkK/G3zMjDUDYjJIWBFLbkh+1+/IOS0A59BpQfdr37hASg==
"@types/date-fns@^2.6.3":
version "2.6.3"
resolved "https://registry.yarnpkg.com/@types/date-fns/-/date-fns-2.6.3.tgz#70c8a9563fb8cd353eaae14265b365b6bbd46a20"
integrity sha512-Ke1lw2Ni1t/wMUoLtKFmSNCLozcTBd6vmMqFP4hRzXn6qzkNt97bPAX0x5Y/c15DP43kKvwW1ycStD5+43jVQA==
dependencies:
date-fns "*"

Expand Down Expand Up @@ -1808,9 +1808,9 @@ [email protected]:
integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==

cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
version "7.0.6"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
dependencies:
path-key "^3.1.0"
shebang-command "^2.0.0"
Expand Down Expand Up @@ -3896,10 +3896,10 @@ strip-json-comments@^3.1.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==

style-loader@^3.3.4:
version "3.3.4"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7"
integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==
style-loader@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-4.0.0.tgz#0ea96e468f43c69600011e0589cb05c44f3b17a5"
integrity sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==

supports-color@^5.3.0:
version "5.5.0"
Expand Down

0 comments on commit 52c0d0e

Please sign in to comment.