Skip to content

[4.0] Update Tinymce#27520

Merged
rdeutz merged 7 commits intojoomla:4.0-devfrom
brianteeman:saturday13
Feb 5, 2020
Merged

[4.0] Update Tinymce#27520
rdeutz merged 7 commits intojoomla:4.0-devfrom
brianteeman:saturday13

Conversation

@brianteeman
Copy link
Copy Markdown
Contributor

@brianteeman brianteeman commented Jan 14, 2020

TinyMce follows semantic versioning. There is no reason that we should be locked down to an old patch release of 5.0.14 when the current is 5.1.5

Some help fixing the javascript in build\build-modules-js\init.es6.js to write the correct version number in the plugin xml would be appreciated

TinyMce follows semantic versioning. There is no reason that we should be locked down to an old patch release of 5.0.14 when the current is 5.1.5

Some help fixing the javascript in build\build-modules-js\init.es6.js to write the correct version number in the plugin xml would be appreciated
@joomla-cms-bot joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.0-dev labels Jan 14, 2020
@jwaisner
Copy link
Copy Markdown
Member

I have tested this item ✅ successfully on b620847

Tested all functions of Tinymce on backend and frontend. Everything works as intended.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/27520.

@brianteeman
Copy link
Copy Markdown
Contributor Author

Thanks. I will test and merge in the morning.

@brianteeman
Copy link
Copy Markdown
Contributor Author

@SharkyKZ I applied your pr and ran npm i
but the version in the xml is still
<version>^5.1.0</version>
did i miss something?

@SharkyKZ
Copy link
Copy Markdown
Contributor

It's because regex for replacing version expects a valid version in XML. As a quick fix you can manually change the version just in the XML to something valid (e.g. back to 5.0.14) and then run npm install again.

@SharkyKZ
Copy link
Copy Markdown
Contributor

SharkyKZ commented Jan 16, 2020

Although I don't see the need for such specific regex. We could simplify it. See brianteeman#91.

@brianteeman
Copy link
Copy Markdown
Contributor Author

Thanks @SharkyKZ the regex works perfectly now.

@jwaisner
Copy link
Copy Markdown
Member

@brianteeman During testing everything works as expected, just need to confirm that the version presented in the extension manager will still be 5.0.14 or should that show 5.1.5?


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/27520.

@SharkyKZ
Copy link
Copy Markdown
Contributor

It will probably show 5.0.14. You can use Refresh Cache button to update data from manifest.

@brianteeman You still need to commit XML changes to correct version.

@jwaisner
Copy link
Copy Markdown
Member

Refreshing the Cache worked. I noticed the version shows as "^5.1.0". Is that supposed to have the "^" in the version number? Changing <version>^5.1.0</version> to <version>5.1.0</version> corrects this. I dont fully understand the versioning in Tinymce, so this may be normal.

@jwaisner
Copy link
Copy Markdown
Member

I have tested this item ✅ successfully on ed91398


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/27520.

@brianteeman
Copy link
Copy Markdown
Contributor Author

Can someone please check and merge this as it addresses a security vulnerability

@SharkyKZ
Copy link
Copy Markdown
Contributor

You still need to run npm install to update the XML with correct version.

@brianteeman
Copy link
Copy Markdown
Contributor Author

@SharkyKZ doh - done now

@brianteeman
Copy link
Copy Markdown
Contributor Author

Can someone please check and merge this as it addresses a security vulnerability

@rdeutz rdeutz merged commit e82a29f into joomla:4.0-dev Feb 5, 2020
@rdeutz rdeutz added this to the Joomla 4.0 milestone Feb 5, 2020
@brianteeman
Copy link
Copy Markdown
Contributor Author

Thanks

@brianteeman brianteeman deleted the saturday13 branch February 5, 2020 17:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

NPM Resource Changed This Pull Request can't be tested by Patchtester

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants