Merge pull request #2504 from beautifier/staging/release

Pulling staging/release into release

Author: bitwiseman

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
           - python-version: 3.14
             node-version: 26
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Set up Node ${{ matrix.node-version }}
         uses: actions/setup-node@v6
         with:

.github/workflows/milestone-publish.yml

@@ -7,19 +7,25 @@ on:
   milestone:
     types: [closed]
 
-
 jobs:
   publish:
+    environment:
+      name: production
+      deployment: false
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write  # Required for OIDC
+      contents: read
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
           node-version: 26
           registry-url: https://registry.npmjs.org/
+          package-manager-cache: false  # never use caching in release builds
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -58,7 +64,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SSH_AUTH_SOCK: /tmp/ssh_agent.sock
           MILESTONE_VERSION: ${{ github.event.milestone.title }}
-          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
           TWINE_USERNAME: ${{secrets.PYPI_USERNAME}}
           TWINE_PASSWORD: ${{secrets.PYPI_PASSWORD}}
         run: |

.github/workflows/pr-staging.yml

@@ -15,7 +15,7 @@ jobs:
   PR-from-staging:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - name: pull-request gh-pages

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## v2.0.3
+
 ## 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))

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/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/2.0.3/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.3/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.3/beautify-html.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>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.3/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.3/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.3/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/2.0.1/beautify.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/2.0.3/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@2.0.1)
+(README.md: js-beautify@2.0.3)

js/lib/beautifier.js

@@ -1462,7 +1462,7 @@ Beautifier.prototype.handle_operator = function(current_token) {
       // a++ + ++b;
       // a - -b
       space_before = in_array(current_token.text, ['--', '-', '++', '+']) && in_array(this._flags.last_token.text, ['--', '-', '++', '+']);
-      // + and - are not unary when preceeded by -- or ++ operator
+      // + and - are not unary when preceded by -- or ++ operator
       // a-- + b
       // a * +b
       // a - -b