Merge branch 'main' into fix/css-media-query-range-operator-spacing

Author: bitwiseman

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.0.1
+* Removed all usage of six and dropped support for Python 2. ([#2374](https://github.com/beautifier/js-beautify/pull/2374))
+* Move minimum version to Nodejs v22.x ([#2363](https://github.com/beautifier/js-beautify/pull/2363))
+* Bump nopt from 7.2.1 to 8.1.0 ([#2361](https://github.com/beautifier/js-beautify/pull/2361))
+* Fix minor crash for certain oddly formed *.js files ([#2128](https://github.com/beautifier/js-beautify/pull/2128))
+
 ## v1.15.4
 * Downgrade nopt to v7.x to maintain Node.js v14 compatibility ([#2358](https://github.com/beautifier/js-beautify/issues/2358))
 

CONTRIBUTING.md

@@ -137,3 +137,32 @@ To publish a Beta or RC (Release Candidate), add `-beta1` or `-rc1` to the end o
 
 
 
+## Version Numbering Policy
+
+This project follows semantic versioning for API compatibility, with additional guidance for formatting changes.
+
+### What each version number means
+
+* Major (`x.0.0`): API compatibility changes. We reserve major versions for intentional API-incompatible changes.
+* Minor (`x.y.0`): Significant formatting fixes, behavior improvements, or new features/options that may affect output.
+* Patch (`x.y.z`): Small, low-risk fixes that should not cause side effects.
+
+### Output compatibility expectations
+
+Formatting output for the same input may change in minor and patch releases.
+For this project, output compatibility is not equivalent to API compatibility:
+
+* API compatibility is represented by major versions.
+* Formatting correctness and behavior improvements are delivered in minor/patch releases based on scope and risk.
+
+### Rules for introducing formatting behavior changes
+
+* Fixes for strictly incorrect formatting should be enabled by default.
+* New formatting features should be introduced as options and must default to off, so valid input formatting does not change unexpectedly.
+* We avoid unnecessary output churn and treat invalid input handling as best-effort.
+
+### Guidance for consumers
+
+If your workflows are sensitive to output differences, pin exact versions or use conservative ranges.
+Using broad ranges (for example, `^x.y.z`) may pull in output-affecting updates by design.
+

README.md

@@ -58,13 +58,13 @@ JS Beautifier is hosted on two CDN services: [cdnjs](https://cdnjs.com/libraries
 
 To pull the latest version from one of these services include one set of the script tags below in your document:
 ```html
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify-css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify-html.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify-html.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify-css.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify-html.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify-html.min.js"></script>
 ```
 
 Example usage of a JS tag in html:
@@ -76,7 +76,7 @@ Example usage of a JS tag in html:
 
 . . .
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.4/beautify.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.1/beautify.min.js"></script>
     <script src="script.js"></script>
   </body>
 </html>
@@ -446,4 +446,4 @@ Thanks also to Jason Diamond, Patrick Hof, Nochum Sossonko, Andreas Schneider, D
 Vasilevsky, Vital Batmanov, Ron Baldwin, Gabriel Harrison, Chris J. Shull,
 Mathias Bynens, Vittorio Gambaletta and others.
 
-(README.md: js-beautify@1.15.4)
+(README.md: js-beautify@2.0.1)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "js-beautify",
-  "version": "1.15.4",
+  "version": "2.0.1",
   "description": "beautifier.io for node",
   "main": "js/index.js",
   "bin": {

package.json

@@ -1 +1 @@
-__version__ = "1.15.4"
+__version__ = "2.0.1"

python/cssbeautifier/__version__.py

@@ -1 +1 @@
-__version__ = "1.15.4"
+__version__ = "2.0.1"

python/jsbeautifier/__version__.py

@@ -21,11 +21,12 @@ release_python()
     cd python
     # python setup.py register -r pypi
     cp setup-js.py setup.py || exit 1
-    python setup.py sdist bdist_wheel || exit 1
+    $SCRIPT_DIR/python -m pip install setuptools black
+    $SCRIPT_DIR/python setup.py sdist bdist_wheel || exit 1
     cp setup-css.py setup.py || exit 1
-    python setup.py sdist bdist_wheel || exit 1
+    $SCRIPT_DIR/python setup.py sdist bdist_wheel || exit 1
     rm setup.py || exit 1
-    python -m twine upload dist/* || exit 1
+    $SCRIPT_DIR/python -m twine upload dist/* || exit 1
 }
 
 release_node()