Merge branch 'main' into fix/js-object-comment-only-closing-brace

Author: bitwiseman

.github/workflows/main.yml

@@ -17,14 +17,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu, windows, macos ]
-        python-version: ['3.10', 3.11]
+        python-version: [3.11, 3.12, 3.14]
         include:
-          - python-version: '3.10' 
-            node-version: 16
-          - python-version: 3.11
-            node-version: 18
-          - python-version: 3.11
-            node-version: 20
+          - python-version: 3.11 
+            node-version: 22
+          - python-version: 3.12
+            node-version: 24
+          - python-version: 3.14
+            node-version: 26
     steps:
       - uses: actions/checkout@v6
       - name: Set up Node ${{ matrix.node-version }}

.github/workflows/milestone-publish.yml

@@ -18,12 +18,12 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
-          node-version: 18
+          node-version: 26
           registry-url: https://registry.npmjs.org/
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: 3.11
+          python-version: 3.14
       - name: Set git user
         run: |
           git config --global user.email "github-action@users.noreply.github.com"

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.
+

Makefile

@@ -2,7 +2,7 @@ PROJECT_ROOT=$(subst \,/,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
 BUILD_DIR=$(PROJECT_ROOT)build
 SCRIPT_DIR=$(PROJECT_ROOT)tools
 SHELL=/bin/bash
-PYTHON=$(SCRIPT_DIR)/python
+PYTHON=$(SCRIPT_DIR)/python-dev python
 NODE=$(SCRIPT_DIR)/node
 NPM=$(SCRIPT_DIR)/npm
 
@@ -146,7 +146,8 @@ $(BUILD_DIR)/virtualenv: | $(BUILD_DIR)
 	virtualenv build/python-rel
 	$(SCRIPT_DIR)/python-dev python -m pip install --upgrade pip || exit 0
 	$(SCRIPT_DIR)/python-rel python -m pip install --upgrade pip || exit 0
-	$(SCRIPT_DIR)/python-dev3 pip install black
+	$(SCRIPT_DIR)/python-dev pip install setuptools black
+	$(SCRIPT_DIR)/python-rel pip install setuptools
 	@touch $(BUILD_DIR)/virtualenv
 
 

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>
@@ -97,6 +97,7 @@ Unlike the JavaScript version, the Python version can only reformat JavaScript.
 ```bash
 $ pip install cssbeautifier
 ```
+Note: This project no longer supports Python 2.
 
 # Usage
 You can beautify JavaScript using JS Beautifier in your web browser, or on the command-line using Node.js or Python.
@@ -445,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)

index.html

@@ -148,6 +148,19 @@ <h2>Options</h2>
           </div>
         </div>
 
+        <div>
+          <p style="margin:6px 0 0 0">HTML attribute wrapping:</p>
+          <select id="wrap-attributes">
+            <option value="auto">Wrap when line is too long</option>
+            <option value="force">Wrap each attribute</option>
+            <option value="force-aligned">Wrap and align attributes</option>
+            <option value="force-expand-multiline">Always wrap multiline</option>
+            <option value="aligned-multiple">Align multiple attributes</option>
+            <option value="preserve">Preserve wrapping</option>
+            <option value="preserve-aligned">Preserve and align</option>
+          </select>
+        </div>
+
         <div class="options-checkboxes">
           <input class="checkbox" type="checkbox" id="end-with-newline">
           <label for="end-with-newline">End script and style with newline?</label>

js/src/html/beautifier.js

@@ -166,7 +166,7 @@ var get_custom_beautifier_name = function(tag_check, raw_token) {
   // For those without a type attribute use default;
   if (typeAttribute.search('text/css') > -1) {
     result = 'css';
-  } else if (typeAttribute.search(/module|((text|application|dojo)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json|method|aspect))/) > -1) {
+  } else if (typeAttribute.search(/module|importmap|((text|application|dojo)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json|method|aspect))/) > -1) {
     result = 'javascript';
   } else if (typeAttribute.search(/(text|application|dojo)\/(x-)?(html)/) > -1) {
     result = 'html';

js/src/javascript/beautifier.js

@@ -104,15 +104,16 @@ function split_linebreaks(s) {
   //return s.split(/\x0d\x0a|\x0a/);
 
   s = s.replace(acorn.allLineBreaks, '\n');
-  var out = [],
-    idx = s.indexOf("\n");
+  var out = [];
+  var start = 0;
+  var idx = s.indexOf("\n", start);
   while (idx !== -1) {
-    out.push(s.substring(0, idx));
-    s = s.substring(idx + 1);
-    idx = s.indexOf("\n");
+    out.push(s.substring(start, idx));
+    start = idx + 1;
+    idx = s.indexOf("\n", start);
   }
-  if (s.length) {
-    out.push(s);
+  if (start < s.length) {
+    out.push(s.substring(start));
   }
   return out;
 }