Merge remote-tracking branch 'origin/staging/main' into staging/release

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.14.6
+* Globs no longer work on Windows in 1.14.5 ([#2093](https://github.com/beautify-web/js-beautify/issues/2093))
+
 ## v1.14.5
 * Dependency updates and UI tweaks ([#2088](https://github.com/beautify-web/js-beautify/pull/2088))
 * Bump terser from 5.12.1 to 5.14.2 ([#2084](https://github.com/beautify-web/js-beautify/pull/2084))

Makefile

@@ -1,4 +1,4 @@
-PROJECT_ROOT=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+PROJECT_ROOT=$(subst \,/,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
 BUILD_DIR=$(PROJECT_ROOT)build
 SCRIPT_DIR=$(PROJECT_ROOT)tools
 SHELL=/bin/bash

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.14.5/beautify.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.5/beautify-css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.5/beautify-html.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.6/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.6/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.6/beautify-html.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.5/beautify.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.5/beautify-css.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.5/beautify-html.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.6/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.6/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.14.6/beautify-html.min.js"></script>
 ```
 
 Older versions are available by changing the version number.
@@ -397,4 +397,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: [email protected].5)
+(README.md: [email protected].6)

js/src/cli.js

@@ -63,6 +63,19 @@ nopt.typeDefs.brace_style = {
         return true;
     }
 };
+nopt.typeDefs.glob = {
+    type: "glob",
+    validate: function(data, key, val) {
+        if (typeof val === 'string' && glob.hasMagic(val)) {
+            // Preserve value if it contains glob magic
+            data[key] = val;
+            return true;
+        } else {
+            // Otherwise validate it as regular path
+            return nopt.typeDefs.path.validate(data, key, val);
+        }
+    }
+};
 var path = require('path'),
     editorconfig = require('editorconfig'),
     knownOpts = {
@@ -112,7 +125,7 @@ var path = require('path'),
         // CLI
         "version": Boolean,
         "help": Boolean,
-        "files": [path, Array],
+        "files": ["glob", Array],
         "outfile": path,
         "replace": Boolean,
         "quiet": Boolean,

package.json

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

python/cssbeautifier/__version__.py

@@ -1 +1 @@
-__version__ = "1.14.5"
+__version__ = "1.14.6"

python/jsbeautifier/__version__.py

@@ -1 +1 @@
-__version__ = "1.14.5"
+__version__ = "1.14.6"