Version 2.2.0 to 4.0.0 [braking change] #56

szakitibi · 2023-06-20T14:58:02Z

Fixes #46

wesleybl · 2023-06-20T15:49:23Z

src/collective/js/jqueryui/js/jquery.ui.core.min.js

@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2015-09-20


I think the code can be kept inside the js folder

I know it is a taste thing, but I do not like the mixed .js an .py files.

Oh I'm sorry. I wasn't clear here. I'm talking precisely about the folder that contains .js files. Basically what I'm suggesting here is to rename the jquery-ui-1.13.2.custom folder to js.

wesleybl · 2023-06-20T15:53:52Z

src/collective/js/jqueryui/jquery-ui-1.13.2.custom/jquery-ui.min.js

@@ -0,0 +1,6 @@
+/*! jQuery UI - v1.13.2 - 2023-02-09
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js


Did you add all the plugins? Wouldn't it be better to only add the plugins that defaulted to True in:

collective.js.jqueryui/src/collective/js/jqueryui/profiles/base/registry.xml

Line 2 in cfa92e5

<records interface="collective.js.jqueryui.controlpanel.IJQueryUIPlugins">

Do you need all plugins?

Yes. All is there. How it is by default on https://jqueryui.com/download/
Since the registry based configuration is removed I went with the simplest solution.
Updated selection as suggested - see commit 1ff1cd8 and

collective.js.jqueryui/src/collective/js/jqueryui/jquery-ui-1.13.2.custom/jquery-ui.min.js

Line 3 in 1ff1cd8

* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/mouse.js, widgets/progressbar.js, widgets/slider.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js

I selected the plugins that were default in collective.js.jqueryui and the difference in size was small in relation to all plugins. So I changed my mind and I think it's not worth removing plugins. It would have to be documented which ones to select and would make things more difficult. Sorry for the inconvenience.

wesleybl · 2023-06-20T15:57:53Z

README.rst


-WARNINGS
-========
+Can not be upgraded from 2.2.0 directly! It is a major braking release!


I think it should be possible to do the update. An upgrade step should be created.

wesleybl · 2023-06-20T16:00:09Z

README.rst


-Plone < 4


Do not remove version information needed by older Plone.

It is not simply removed, it is updated - see https://github.com/szakitibi/collective.js.jqueryui/blob/98cd6f28dc7b34f888ffc6b6f54e1535fddefd8e/README.rst#plone--5

Even removing support for older versions of Plone, we should not remove the information of which version of collective.js.jqueryui is compatible with these versions. Note that today the product is no longer compatible with Plone < 4, but the information is still in the README. This makes it easy if some old Plone user arrives at the repository and wants to use the product on their site.

wesleybl · 2023-06-20T18:17:14Z

setup.py

@@ -16,7 +16,7 @@

 setup(
    name="collective.js.jqueryui",
-    version="2.2.1.dev0",
+    version="4.0.0 (unreleased)",


Why not 3.0.0?

To point it out better, that it is a huge jump and a braking change. So much has been removed, that I think it is basically a new product, just to register the bundle.

I don't think that makes sense. Even if we were moving from 2.99 to 3.0.0, that would also indicate a breaking release. I think we can use 3.0.0.

wesleybl · 2023-06-20T18:18:47Z

setup.py

        "Framework :: Plone :: 5.0",
        "Framework :: Plone :: 5.1",
        "Framework :: Plone :: 5.2",
        "Programming Language :: Python",
-        "Programming Language :: Python :: 2.7",


This product doesn't have much in python. I think compatibility with python 2 could be maintained, at least to have a compatible version that fixes the security problem.

wesleybl · 2023-06-20T18:23:41Z

src/collective/js/jqueryui/resources.py

@@ -1,19 +1,14 @@
-# -*- coding: utf-8 -*-


I think it doesn't make sense to have a resource view anymore, since we can't select the plugins anymore.

wesleybl · 2023-06-20T18:46:05Z

src/collective/js/jqueryui/example/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-


I think the example could be maintained. It's a way to test the product.

wesleybl · 2023-06-20T19:02:36Z

What exactly was done in this commit:

7c2cc3e

?

see - https://github.com/collective/collective.js.jqueryui/blob/cfa92e5c22eb5df86f8f482eef368e0c4179eba8/src/collective/js/jqueryui/profiles/base/registry.xml#L2

Fixes the error raised when it tries to register as AMD anonymous module.

szakitibi · 2023-06-21T06:31:36Z

What exactly was done in this commit:

7c2cc3e

?

See commit 98cd6f2, and the reasoning here

collective.js.jqueryui/docs/UPGRADE.txt

Lines 36 to 57 in 98cd6f2

    
           make it work 
        
           ------------ 
        
           The result of the unpacked jQuery UI zip with Plone 5.2.4 (5212) patterns require.js raises an error: 
        
           ``` 
        
           Uncaught Error: Mismatched anonymous define() module: function(V){"use strict";V.ui=V.ui||{};V.ui.version="1.13.2"; ...   require.js:168 
        
               at makeError (require.js:168:17) 
        
               at intakeDefines (require.js:1254:36) 
        
               at Object.localRequire [as require] (require.js:1446:21) 
        
               at requirejs (require.js:1797:24) 
        
               at patterns-compiled.js:15444:1 
        
           ``` 
        
           Solution was to manually remove from `jquery-ui-1.13.2.custom/jquery-ui.min.js` the ADM part (`"function"==typeof define&&define.amd?define(["jquery"],t):`) right at the start of the javascript code: 
        
           `!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(V){ ...` 
        
           so we end up with: 
        
           `!function(t){"use strict";t(jQuery)}(function(V){ ...`

wesleybl · 2023-06-21T13:46:17Z

See commit 98cd6f2, and the reasoning here

hmm, I remember this problem. It would be good to change the UPGRADE.txt to .rst or .md to highlight the code that needs to be changed.

Tibor Szakmany added 9 commits June 20, 2023 10:51

jQueryUI version 1.13.2

74dc3e7

fix patterns require.js error

7c2cc3e

drop Python2

35fae38

remove old example

890b23b

fix resource paths

71f1547

fix i18n datepicker error

abd6cd1

add css resoure

b3fafe4

update versions, docs, setup, metadata

b04d0b3

2.2.0 > 4.0.0 braking upgrade notes

258b7ee

szakitibi mentioned this pull request Jun 20, 2023

Security: Upgrade to jQuery UI 1.13.0 #46

Open

wesleybl requested changes Jun 20, 2023

View reviewed changes

Tibor Szakmany added 2 commits June 21, 2023 07:59

select plugins from IJQueryUIPlugins

1ff1cd8

see - https://github.com/collective/collective.js.jqueryui/blob/cfa92e5c22eb5df86f8f482eef368e0c4179eba8/src/collective/js/jqueryui/profiles/base/registry.xml#L2

fix require.js error

98cd6f2

Fixes the error raised when it tries to register as AMD anonymous module.

rename js folder

dad7593

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Version 2.2.0 to 4.0.0 [braking change] #56

Version 2.2.0 to 4.0.0 [braking change] #56

szakitibi commented Jun 20, 2023

wesleybl Jun 20, 2023

szakitibi Jun 21, 2023

wesleybl Jun 21, 2023

wesleybl Jun 20, 2023

szakitibi Jun 21, 2023

wesleybl Jun 21, 2023

wesleybl Jun 20, 2023

wesleybl Jun 20, 2023

szakitibi Jun 21, 2023

wesleybl Jun 21, 2023

wesleybl Jun 20, 2023

szakitibi Jun 21, 2023

wesleybl Jun 21, 2023

wesleybl Jun 20, 2023

wesleybl Jun 20, 2023

wesleybl Jun 20, 2023

wesleybl commented Jun 20, 2023

szakitibi commented Jun 21, 2023

wesleybl commented Jun 21, 2023

Version 2.2.0 to 4.0.0 [braking change] #56

Are you sure you want to change the base?

Version 2.2.0 to 4.0.0 [braking change] #56

Conversation

szakitibi commented Jun 20, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wesleybl commented Jun 20, 2023

szakitibi commented Jun 21, 2023

wesleybl commented Jun 21, 2023