Bug 1776642 - part 1: Bump jsmin to 3.0.0 to fix incompatibility with…

… setuptools>=58 r=jcristau tikitu/jsmin#33 Differential Revision: https://phabricator.services.mozilla.com/D150968
Floorp-Projects · Aug 24, 2022 · 683d5f4 · 683d5f4
1 parent 277465c
commit 683d5f4
Show file tree

Hide file tree

Showing 11 changed files with 760 additions and 239 deletions.
diff --git a/third_party/python/jsmin/CHANGELOG.txt b/third_party/python/jsmin/CHANGELOG.txt
@@ -1,11 +1,79 @@
 Changelog
 =========
 
+v3.0.0 (2021-09-08) Ben Bradshaw
+--------------------------------
+
+- Breaking Change: Removed support for Python 2
+
+- Removed usage of use_2to3 in setup.py
+
+v2.2.2 (2017-05-01) Tikitu de Jager
+-----------------------------------
+
+- Add license headers to code files (fixes i#17)
+
+- Remove mercurial files (fixes #20)
+
+v2.2.1 (2016-03-06) Tikitu de Jager
+-----------------------------------
+
+- Fix #14: Infinite loop on `return x / 1;`
+
+v2.2.0 (2015-12-19) Tikitu de Jager
+-----------------------------------
+
+- Merge #13: Preserve "loud comments" starting with `/*!`
+
+  These are commonly used for copyright notices, and are preserved by various
+  other minifiers (e.g. YUI Compressor).
+
+v2.1.6 (2015-10-14) Tikitu de Jager
+-----------------------------------
+
+- Fix #12: Newline following a regex literal should not be elided.
+
+v2.1.5 (2015-10-11) Tikitu de Jager
+-----------------------------------
+
+- Fix #9: Premature end of statement caused by multi-line comment not
+  adding newline.
+
+- Fix #10: Removing multiline comment separating tokens must leave a space.
+
+- Refactor comment handling for maintainability.
+
+v2.1.4 (2015-08-23) Tikitu de Jager
+-----------------------------------
+
+- Fix #6: regex literal matching comment was not correctly matched.
+
+- Refactor regex literal handling for robustness.
+
+v2.1.3 (2015-08-09) Tikitu de Jager
+-----------------------------------
+
+- Reset issue numbering: issues live in github from now on.
+
+- Fix #1: regex literal was not recognised when occurring directly after `{`.
+
+v2.1.2 (2015-07-12) Tikitu de Jager
+-----------------------------------
+
+- Issue numbers here and below refer to the bitbucket repository.
+
+- Fix #17: bug when JS starts with comment then literal regex.
+
+v2.1.1 (2015-02-14) Tikitu de Jager
+-----------------------------------
+
+- Fix #16: bug returning a literal regex containing escaped forward-slashes.
+
 v2.1.0 (2014-12-24) Tikitu de Jager
 -----------------------------------
 
-    * First changelog entries; see README.rst for prior contributors.
+- First changelog entries; see README.rst for prior contributors.
 
-    * Expose quote_chars parameter to provide just enough unofficial Harmony
-    support to be useful.
+- Expose quote_chars parameter to provide just enough unofficial Harmony
+  support to be useful.
 
diff --git a/third_party/python/jsmin/PKG-INFO b/third_party/python/jsmin/PKG-INFO
@@ -1,11 +1,12 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.2
 Name: jsmin
-Version: 2.1.0
+Version: 3.0.0
 Summary: JavaScript minifier.
-PLEASE UPDATE TO VERSION >= 2.0.6. Older versions have a serious bug related to comments.
-Home-page: https://bitbucket.org/dcs/jsmin/
-Author: Tikitu de Jager
-Author-email: tikitu+jsmin@logophile.org
+Home-page: https://github.com/tikitu/jsmin/
+Author: Dave St.Germain
+Author-email: dave@st.germa.in
+Maintainer: Tikitu de Jager
+Maintainer-email: tikitu+jsmin@logophile.org
 License: MIT License
 Description: =====
         jsmin
@@ -26,9 +27,14 @@ Description: =====
 
           python -m jsmin myfile.js
 
-        As yet, ``jsmin`` makes no attempt to be compatible with
+        NB: ``jsmin`` makes no attempt to be compatible with
         `ECMAScript 6 / ES.next / Harmony <http://wiki.ecmascript.org/doku.php?id=harmony:specification_drafts>`_.
-        If you're using it on Harmony code, though, you might find the ``quote_chars``
+        The current maintainer does not intend to add ES6-compatibility. If you would
+        like to take over maintenance and update ``jsmin`` for ES6, please contact
+        `Tikitu de Jager <mailto:tikitu+jsmin@logophile.org>`_. Pull requests are also
+        welcome, of course, but my time to review them is somewhat limited these days.
+
+        If you're using ``jsmin`` on ES6 code, though, you might find the ``quote_chars``
         parameter useful:
 
         .. code:: python
@@ -42,42 +48,48 @@ Description: =====
         ===============
 
         * install the package `from pypi <https://pypi.python.org/pypi/jsmin/>`_
-        * get the latest release `from the stable branch on bitbucket <https://bitbucket.org/dcs/jsmin/branch/stable>`_
-        * get the development version `from the default branch on bitbucket <https://bitbucket.org/dcs/jsmin/branch/default>`_
+        * get the latest release `from latest-release on github <https://github.com/tikitu/jsmin/tree/latest-release/jsmin>`_
+        * get the development version `from master on github <https://github.com/tikitu/jsmin/>`_
+
+
+        Python 2 support removed
+        ========================
+
+        Python 2 support was removed in version 3.0.0. If you need to support Python 2, please use version 2.2.2 with setuptools<58.
 
         Contributing
         ============
 
-        `Issues <https://bitbucket.org/dcs/jsmin/issues>`_ and `Pull requests <https://bitbucket.org/dcs/jsmin/pull-requests>`_
-        will be gratefully received on Bitbucket. Pull requests on github are great too, but the issue tracker lives on
-        bitbucket.
+        `Issues <https://github.com/tikitu/jsmin/issues>`_ and `Pull requests <https://github.com/tikitu/jsmin/pulls>`_
+        will be gratefully received on Github. The project used to be hosted
+        `on bitbucket <https://bitbucket.org/dcs/jsmin/>`_ and old issues can still be
+        found there.
 
-        If possible, please make separate pull requests for tests and for code: tests will be committed on the stable branch
-        (which tracks the latest released version) while code will go to default by, erm, default.
+        If possible, please make separate pull requests for tests and for code: tests will be added to the `latest-release` branch while code will go to `master`.
 
-        Unless you request otherwise, your Bitbucket identity will be added to the contributor's list below; if you prefer a
+        Unless you request otherwise, your Github identity will be added to the contributor's list below; if you prefer a
         different name feel free to add it in your pull request instead. (If you prefer not to be mentioned you'll have to let
         the maintainer know somehow.)
 
         Build/test status
         =================
 
-        Both default and stable branches are tested with Travis: https://travis-ci.org/tikitu/jsmin
+        Both branches are tested with Travis: https://travis-ci.org/tikitu/jsmin
 
-        Stable (latest released version plus any new tests) is tested against CPython 2.6, 2.7, 3.2, and 3.3.
+        The `latest-release` branch (the version on PyPI plus any new tests) is tested against CPython 3.
         Currently:
 
-        .. image:: https://travis-ci.org/tikitu/jsmin.png?branch=ghstable
+        .. image:: https://travis-ci.org/tikitu/jsmin.png?branch=latest-release
 
-        If stable is failing that means there's a new test that fails on *the latest released version on pypi*, with no fix yet
+        If that branch is failing that means there's a new test that fails on *the latest released version on pypi*, with no fix yet
         released.
 
-        Default (development version, might be ahead of latest released version) is tested against CPython 2.6, 2.7, 3.2, and
-        3.3. Currently:
+        The `master` branch (development version, might be ahead of latest released version) is tested against CPython 3.
+        Currently:
 
         .. image:: https://travis-ci.org/tikitu/jsmin.png?branch=master
 
-        If default is failing don't use it, but as long as stable is passing the pypi release should be ok.
+        If `master` is failing don't use it, but as long as `latest-release` is passing the pypi release should be ok.
 
         Contributors (chronological commit order)
         =========================================
@@ -87,17 +99,89 @@ Description: =====
         * `Tikitu de Jager <mailto:tikitu+jsmin@logophile.org>`_ (current maintainer)
         * https://bitbucket.org/rennat
         * `Nick Alexander <https://bitbucket.org/ncalexan>`_
+        * `Gennady Kovshenin <https://github.com/soulseekah>`_
+        * `Matt Molyneaux <https://github.com/moggers87>`_
+        * `Albert Wang <https://github.com/albertyw>`_
+        * `Ben Bradshaw <https://github.com/serenecloud>`_
 
         Changelog
         =========
 
+        v3.0.0 (2021-09-08) Ben Bradshaw
+        --------------------------------
+
+        - Breaking Change: Removed support for Python 2
+
+        - Removed usage of use_2to3 in setup.py
+
+        v2.2.2 (2017-05-01) Tikitu de Jager
+        -----------------------------------
+
+        - Add license headers to code files (fixes i#17)
+
+        - Remove mercurial files (fixes #20)
+
+        v2.2.1 (2016-03-06) Tikitu de Jager
+        -----------------------------------
+
+        - Fix #14: Infinite loop on `return x / 1;`
+
+        v2.2.0 (2015-12-19) Tikitu de Jager
+        -----------------------------------
+
+        - Merge #13: Preserve "loud comments" starting with `/*!`
+
+          These are commonly used for copyright notices, and are preserved by various
+          other minifiers (e.g. YUI Compressor).
+
+        v2.1.6 (2015-10-14) Tikitu de Jager
+        -----------------------------------
+
+        - Fix #12: Newline following a regex literal should not be elided.
+
+        v2.1.5 (2015-10-11) Tikitu de Jager
+        -----------------------------------
+
+        - Fix #9: Premature end of statement caused by multi-line comment not
+          adding newline.
+
+        - Fix #10: Removing multiline comment separating tokens must leave a space.
+
+        - Refactor comment handling for maintainability.
+
+        v2.1.4 (2015-08-23) Tikitu de Jager
+        -----------------------------------
+
+        - Fix #6: regex literal matching comment was not correctly matched.
+
+        - Refactor regex literal handling for robustness.
+
+        v2.1.3 (2015-08-09) Tikitu de Jager
+        -----------------------------------
+
+        - Reset issue numbering: issues live in github from now on.
+
+        - Fix #1: regex literal was not recognised when occurring directly after `{`.
+
+        v2.1.2 (2015-07-12) Tikitu de Jager
+        -----------------------------------
+
+        - Issue numbers here and below refer to the bitbucket repository.
+
+        - Fix #17: bug when JS starts with comment then literal regex.
+
+        v2.1.1 (2015-02-14) Tikitu de Jager
+        -----------------------------------
+
+        - Fix #16: bug returning a literal regex containing escaped forward-slashes.
+
         v2.1.0 (2014-12-24) Tikitu de Jager
         -----------------------------------
 
-            * First changelog entries; see README.rst for prior contributors.
+        - First changelog entries; see README.rst for prior contributors.
 
-            * Expose quote_chars parameter to provide just enough unofficial Harmony
-            support to be useful.
+        - Expose quote_chars parameter to provide just enough unofficial Harmony
+          support to be useful.
 
 
 Platform: UNKNOWN
@@ -106,12 +190,7 @@ Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Classifier: Topic :: Software Development :: Pre-processors
 Classifier: Topic :: Text Processing :: Filters
diff --git a/third_party/python/jsmin/README.rst b/third_party/python/jsmin/README.rst
@@ -17,9 +17,14 @@ You can run it as a commandline tool also::
 
   python -m jsmin myfile.js
 
-As yet, ``jsmin`` makes no attempt to be compatible with
+NB: ``jsmin`` makes no attempt to be compatible with
 `ECMAScript 6 / ES.next / Harmony <http://wiki.ecmascript.org/doku.php?id=harmony:specification_drafts>`_.
-If you're using it on Harmony code, though, you might find the ``quote_chars``
+The current maintainer does not intend to add ES6-compatibility. If you would
+like to take over maintenance and update ``jsmin`` for ES6, please contact
+`Tikitu de Jager <mailto:tikitu+jsmin@logophile.org>`_. Pull requests are also
+welcome, of course, but my time to review them is somewhat limited these days.
+
+If you're using ``jsmin`` on ES6 code, though, you might find the ``quote_chars``
 parameter useful:
 
 .. code:: python
@@ -33,42 +38,48 @@ Where to get it
 ===============
 
 * install the package `from pypi <https://pypi.python.org/pypi/jsmin/>`_
-* get the latest release `from the stable branch on bitbucket <https://bitbucket.org/dcs/jsmin/branch/stable>`_
-* get the development version `from the default branch on bitbucket <https://bitbucket.org/dcs/jsmin/branch/default>`_
+* get the latest release `from latest-release on github <https://github.com/tikitu/jsmin/tree/latest-release/jsmin>`_
+* get the development version `from master on github <https://github.com/tikitu/jsmin/>`_
+
+
+Python 2 support removed
+========================
+
+Python 2 support was removed in version 3.0.0. If you need to support Python 2, please use version 2.2.2 with setuptools<58.
 
 Contributing
 ============
 
-`Issues <https://bitbucket.org/dcs/jsmin/issues>`_ and `Pull requests <https://bitbucket.org/dcs/jsmin/pull-requests>`_
-will be gratefully received on Bitbucket. Pull requests on github are great too, but the issue tracker lives on
-bitbucket.
+`Issues <https://github.com/tikitu/jsmin/issues>`_ and `Pull requests <https://github.com/tikitu/jsmin/pulls>`_
+will be gratefully received on Github. The project used to be hosted
+`on bitbucket <https://bitbucket.org/dcs/jsmin/>`_ and old issues can still be
+found there.
 
-If possible, please make separate pull requests for tests and for code: tests will be committed on the stable branch
-(which tracks the latest released version) while code will go to default by, erm, default.
+If possible, please make separate pull requests for tests and for code: tests will be added to the `latest-release` branch while code will go to `master`.
 
-Unless you request otherwise, your Bitbucket identity will be added to the contributor's list below; if you prefer a
+Unless you request otherwise, your Github identity will be added to the contributor's list below; if you prefer a
 different name feel free to add it in your pull request instead. (If you prefer not to be mentioned you'll have to let
 the maintainer know somehow.)
 
 Build/test status
 =================
 
-Both default and stable branches are tested with Travis: https://travis-ci.org/tikitu/jsmin
+Both branches are tested with Travis: https://travis-ci.org/tikitu/jsmin
 
-Stable (latest released version plus any new tests) is tested against CPython 2.6, 2.7, 3.2, and 3.3.
+The `latest-release` branch (the version on PyPI plus any new tests) is tested against CPython 3.
 Currently:
 
-.. image:: https://travis-ci.org/tikitu/jsmin.png?branch=ghstable
+.. image:: https://travis-ci.org/tikitu/jsmin.png?branch=latest-release
 
-If stable is failing that means there's a new test that fails on *the latest released version on pypi*, with no fix yet
+If that branch is failing that means there's a new test that fails on *the latest released version on pypi*, with no fix yet
 released.
 
-Default (development version, might be ahead of latest released version) is tested against CPython 2.6, 2.7, 3.2, and
-3.3. Currently:
+The `master` branch (development version, might be ahead of latest released version) is tested against CPython 3.
+Currently:
 
 .. image:: https://travis-ci.org/tikitu/jsmin.png?branch=master
 
-If default is failing don't use it, but as long as stable is passing the pypi release should be ok.
+If `master` is failing don't use it, but as long as `latest-release` is passing the pypi release should be ok.
 
 Contributors (chronological commit order)
 =========================================
@@ -78,3 +89,7 @@ Contributors (chronological commit order)
 * `Tikitu de Jager <mailto:tikitu+jsmin@logophile.org>`_ (current maintainer)
 * https://bitbucket.org/rennat
 * `Nick Alexander <https://bitbucket.org/ncalexan>`_
+* `Gennady Kovshenin <https://github.com/soulseekah>`_
+* `Matt Molyneaux <https://github.com/moggers87>`_
+* `Albert Wang <https://github.com/albertyw>`_
+* `Ben Bradshaw <https://github.com/serenecloud>`_