Skip to content

Commit 15a78a0

Browse files
Merge pull request #9322 from magento-gl/Hammer-Platform-Health-2.4.8-beta2-28Oct24
[Hammer][2.4.8-beta2] Platform Health Scope
2 parents 5a2037c + a3df34e commit 15a78a0

File tree

85 files changed

+744
-23853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+744
-23853
lines changed

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@
343343
"components/jquery": "1.11.0",
344344
"components/jqueryui": "1.10.4",
345345
"twbs/bootstrap": "3.1.0",
346-
"tinymce/tinymce": "7.3.0",
347346
"magento/module-csp": "*",
348347
"magento/module-aws-s3": "*",
349348
"magento/module-remote-storage": "*",
@@ -365,8 +364,7 @@
365364
],
366365
"twbs/bootstrap": [
367366
"lib/web/jquery/jquery.tabs.js"
368-
],
369-
"tinymce/tinymce": "lib/web/tiny_mce_5"
367+
]
370368
}
371369
},
372370
"autoload": {

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromClone/composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@
160160
"components/jquery": "1.11.0",
161161
"blueimp/jquery-file-upload": "5.6.14",
162162
"components/jqueryui": "1.10.4",
163-
"twbs/bootstrap": "3.1.0",
164-
"tinymce/tinymce": "7.3.0"
163+
"twbs/bootstrap": "3.1.0"
165164
},
166165
"extra": {
167166
"component_paths": {
@@ -180,8 +179,7 @@
180179
],
181180
"twbs/bootstrap": [
182181
"lib/web/jquery/jquery.tabs.js"
183-
],
184-
"tinymce/tinymce": "lib/web/tiny_mce"
182+
]
185183
}
186184
},
187185
"config": {

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock

Lines changed: 1 addition & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock

Lines changed: 1 addition & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ lib/web/magnifier/magnify.js
1515
lib/web/varien/js.js
1616
lib/web/jquery/jquery.validate.js
1717
lib/web/prototype/**/*.js
18+
lib/web/jquery/jstree/jquery.jstree.js
1819

1920
// MINIFIED FILES
2021
app/code/**/*.min.js
2122
lib/web/legacy-build.min.js
2223
lib/web/tiny_mce_7/**/*.js
2324
lib/web/tiny_mce_7/***/*.js
25+
lib/web/jquery/uppy/dist/uppy.min.js
2426

2527
// TEST
2628
vendor/magento/magento-coding-standard/Magento2/Tests/Eslint/*

lib/internal/Magento/Framework/App/Test/Unit/_files/test.composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
"lusitanian/oauth": "~0.3 <=0.7.0"
2222
},
2323
"replace": {
24-
"magento/module-marketplace": "100.0.2",
25-
"tinymce/tinymce": "7.3.0"
24+
"magento/module-marketplace": "100.0.2"
2625
},
2726
"extra": {
2827
"component_paths": {
@@ -37,8 +36,7 @@
3736
],
3837
"twbs/bootstrap": [
3938
"lib/web/jquery/jquery.tabs.js"
40-
],
41-
"tinymce/tinymce": "lib/web/tiny_mce"
39+
]
4240
}
4341
},
4442
"config": {

0 commit comments

Comments
 (0)