Skip to content

Commit

Permalink
Updated TinyMCE to 6.8 via composer 🚀 (#3658)
Browse files Browse the repository at this point in the history
* 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 <fabrizio.balliano@gmail.com>

* updated composer lock

* Updated to 6.8.1

---------

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
  • Loading branch information
sreichel and fballiano committed Dec 19, 2023
1 parent 9d096dd commit 0e79abc
Show file tree
Hide file tree
Showing 170 changed files with 172 additions and 6,971 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
/app/etc/modules/Cm_RedisSession.xml
/lib/Credis

# TinyMCE library
/js/tinymce

# Add a base setup for running unit Tests with code coverage and send them to SonarCloud
# https://github.com/OpenMage/magento-lts/pull/1836
/dev/testfield
Expand Down
15 changes: 13 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
"colinmollenhour/magento-redis-session": "^3.2.0",
"cweagans/composer-patches": "^1.7",
"magento-hackathon/magento-composer-installer": "^3.1 || ^2.1 || ^4.0",
"mklkj/tinymce-i18n": "^23.11",
"pelago/emogrifier": "^7.0",
"phpseclib/mcrypt_compat": "^2.0.3",
"phpseclib/phpseclib": "^3.0.14",
"shardj/zf1-future": "1.23.5",
"sreichel/composer-plugin-file-copy": "^1.0",
"symfony/polyfill-php74": "^1.27",
"symfony/polyfill-php80": "^1.27",
"symfony/polyfill-php81": "^1.27"
"symfony/polyfill-php81": "^1.27",
"tinymce/tinymce": "^6.8"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
Expand Down Expand Up @@ -90,6 +93,13 @@
}
},
"extra": {
"file-copy" : [{
"source": "tinymce/tinymce",
"target": "js/tinymce"
}, {
"source": "mklkj/tinymce-i18n/langs6",
"target": "js/tinymce/langs"
}],
"magento-root-dir": ".",
"magento-deploystrategy": "copy",
"magento-deploystrategy-dev": "symlink",
Expand All @@ -115,7 +125,8 @@
"allow-plugins": {
"magento-hackathon/magento-composer-installer": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"cweagans/composer-patches": true
"cweagans/composer-patches": true,
"sreichel/composer-plugin-file-copy": true
},
"platform": {
"php": "7.4"
Expand Down
158 changes: 156 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion js/tinymce/icons/default/icons.min.js

This file was deleted.

3 changes: 0 additions & 3 deletions js/tinymce/langs/README.md

This file was deleted.

1 change: 0 additions & 1 deletion js/tinymce/langs/ar.js

This file was deleted.

1 change: 0 additions & 1 deletion js/tinymce/langs/az.js

This file was deleted.

1 change: 0 additions & 1 deletion js/tinymce/langs/be.js

This file was deleted.

1 change: 0 additions & 1 deletion js/tinymce/langs/bg_BG.js

This file was deleted.

1 change: 0 additions & 1 deletion js/tinymce/langs/bn_BD.js

This file was deleted.

Loading

0 comments on commit 0e79abc

Please sign in to comment.