diff --git a/CHANGELOG.md b/CHANGELOG.md index 696a9a148..928b0226d 100644 --- a/CHANGELOG.md +++ b/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)) diff --git a/Makefile b/Makefile index 8da4cf46f..1ddfb5482 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index c9951fc97..bb6910626 100644 --- a/README.md +++ b/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 - - - + + + - - - + + + ``` 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: js-beautify@1.14.5) +(README.md: js-beautify@1.14.6) diff --git a/js/src/cli.js b/js/src/cli.js index 070f423e8..40b456893 100755 --- a/js/src/cli.js +++ b/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, diff --git a/package-lock.json b/package-lock.json index 5099f3c28..5a9cc225d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "js-beautify", - "version": "1.14.5", + "version": "1.14.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "js-beautify", - "version": "1.14.5", + "version": "1.14.6", "license": "MIT", "dependencies": { "config-chain": "^1.1.13", diff --git a/package.json b/package.json index 07a45d597..39fed0618 100644 --- a/package.json +++ b/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": { diff --git a/python/cssbeautifier/__version__.py b/python/cssbeautifier/__version__.py index dd8fc4166..ee738f982 100644 --- a/python/cssbeautifier/__version__.py +++ b/python/cssbeautifier/__version__.py @@ -1 +1 @@ -__version__ = "1.14.5" +__version__ = "1.14.6" diff --git a/python/jsbeautifier/__version__.py b/python/jsbeautifier/__version__.py index dd8fc4166..ee738f982 100644 --- a/python/jsbeautifier/__version__.py +++ b/python/jsbeautifier/__version__.py @@ -1 +1 @@ -__version__ = "1.14.5" +__version__ = "1.14.6"