Skip to content

Commit 0e79abc

Browse files
sreichelfballiano
andauthored
Updated TinyMCE to 6.8 via composer 🚀 (#3658)
* Add MkDocs workflow to publish documentation * Fixed MkDocs workflow * Fixed MkDocs workflow (2) * Updated tinymce to 6.7.3 and plugin to v1.0.0 * Removed code related to mkdocs * Updated composer.lock * Updated composer - disallow vulnerable versions * Added TinyMCE language files * Update composer.json Co-authored-by: Fabrizio Balliano <[email protected]> * updated composer lock * Updated to 6.8.1 --------- Co-authored-by: Fabrizio Balliano <[email protected]>
1 parent 9d096dd commit 0e79abc

File tree

170 files changed

+172
-6971
lines changed

Some content is hidden

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

170 files changed

+172
-6971
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
/app/etc/modules/Cm_RedisSession.xml
2424
/lib/Credis
2525

26+
# TinyMCE library
27+
/js/tinymce
28+
2629
# Add a base setup for running unit Tests with code coverage and send them to SonarCloud
2730
# https://github.com/OpenMage/magento-lts/pull/1836
2831
/dev/testfield

composer.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@
2626
"colinmollenhour/magento-redis-session": "^3.2.0",
2727
"cweagans/composer-patches": "^1.7",
2828
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
29+
"mklkj/tinymce-i18n": "^23.11",
2930
"pelago/emogrifier": "^7.0",
3031
"phpseclib/mcrypt_compat": "^2.0.3",
3132
"phpseclib/phpseclib": "^3.0.14",
3233
"shardj/zf1-future": "1.23.5",
34+
"sreichel/composer-plugin-file-copy": "^1.0",
3335
"symfony/polyfill-php74": "^1.27",
3436
"symfony/polyfill-php80": "^1.27",
35-
"symfony/polyfill-php81": "^1.27"
37+
"symfony/polyfill-php81": "^1.27",
38+
"tinymce/tinymce": "^6.8"
3639
},
3740
"require-dev": {
3841
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
@@ -90,6 +93,13 @@
9093
}
9194
},
9295
"extra": {
96+
"file-copy" : [{
97+
"source": "tinymce/tinymce",
98+
"target": "js/tinymce"
99+
}, {
100+
"source": "mklkj/tinymce-i18n/langs6",
101+
"target": "js/tinymce/langs"
102+
}],
93103
"magento-root-dir": ".",
94104
"magento-deploystrategy": "copy",
95105
"magento-deploystrategy-dev": "symlink",
@@ -115,7 +125,8 @@
115125
"allow-plugins": {
116126
"magento-hackathon/magento-composer-installer": true,
117127
"dealerdirect/phpcodesniffer-composer-installer": true,
118-
"cweagans/composer-patches": true
128+
"cweagans/composer-patches": true,
129+
"sreichel/composer-plugin-file-copy": true
119130
},
120131
"platform": {
121132
"php": "7.4"

composer.lock

Lines changed: 156 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/tinymce/icons/default/icons.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/tinymce/langs/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

js/tinymce/langs/ar.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/tinymce/langs/az.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/tinymce/langs/be.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/tinymce/langs/bg_BG.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

js/tinymce/langs/bn_BD.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)