Skip to content

Commit

Permalink
Merge pull request #1921 from beautify-web/staging/release
Browse files Browse the repository at this point in the history
Pulling staging/release into release
  • Loading branch information
bitwiseman authored Apr 16, 2021
2 parents 1150d0a + 03f3cdc commit 0cbb13a
Show file tree
Hide file tree
Showing 23 changed files with 95 additions and 50,830 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ target
dist/
build/
js/lib/
generated/
.idea/
.vscode/
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
# Changelog
## v1.13.12

### Description


### Closed Issues
* IE11 compatibility failure v>1.13.5 ([#1918](https://github.com/beautify-web/js-beautify/issues/1918))


## v1.13.11

### Description
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ js/lib/*.js: $(BUILD_DIR)/node $(BUILD_DIR)/generate $(wildcard js/src/*) $(wild


# python package generation
python/dist/*: $(BUILD_DIR)/python $(wildcard python/**/*.py) python/jsbeautifier/* python/cssbeautifier/*
python/dist/*: $(BUILD_DIR)/python $(BUILD_DIR)/generate $(wildcard python/**/*.py) python/jsbeautifier/* python/cssbeautifier/*
@echo Building python package...
@rm -f python/dist/*
@cd python && \
Expand Down Expand Up @@ -129,7 +129,7 @@ $(BUILD_DIR)/node: package.json package-lock.json | $(BUILD_DIR)
$(NPM) --version
@touch $(BUILD_DIR)/node

$(BUILD_DIR)/python: python/setup-js.py python/setup-css.py | $(BUILD_DIR) $(BUILD_DIR)/virtualenv
$(BUILD_DIR)/python: $(BUILD_DIR)/generate python/setup-js.py python/setup-css.py | $(BUILD_DIR) $(BUILD_DIR)/virtualenv
@$(PYTHON) --version
# Order matters here! Install css then js to make sure the local dist version of js is used
@cp ./python/setup-css.py ./python/setup.py
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ 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.13.11/beautify.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.11/beautify-css.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.11/beautify-html.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.12/beautify.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.12/beautify-css.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.12/beautify-html.js"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.11/beautify.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.11/beautify-css.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.11/beautify-html.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.12/beautify.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.12/beautify-css.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.13.12/beautify-html.min.js"></script>

<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.11/js/lib/beautify.js"></script>
<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.11/js/lib/beautify-css.js"></script>
<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.11/js/lib/beautify-html.js"></script>
<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.12/js/lib/beautify.js"></script>
<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.12/js/lib/beautify-css.js"></script>
<script src="https://cdn.rawgit.com/beautify-web/js-beautify/v1.13.12/js/lib/beautify-html.js"></script>
```

Older versions are available by changing the version number.
Expand Down Expand Up @@ -404,4 +404,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.13.11)
(README.md: js-beautify@1.13.12)
48 changes: 24 additions & 24 deletions js/lib/beautifier.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/lib/beautifier.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/lib/beautifier.min.js.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions js/lib/beautify-css.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@

/* GENERATED_BUILD_OUTPUT */
var legacy_beautify_css;
/******/ (() => { // webpackBootstrap
/******/ (function() { // webpackBootstrap
/******/ "use strict";
/******/ var __webpack_modules__ = ([
/* 0 */,
/* 1 */,
/* 2 */
/***/ ((module) => {
/***/ (function(module) {

/*jshint node:true */
/*
Expand Down Expand Up @@ -500,7 +500,7 @@ module.exports.Output = Output;
/* 4 */,
/* 5 */,
/* 6 */
/***/ ((module) => {
/***/ (function(module) {

/*jshint node:true */
/*
Expand Down Expand Up @@ -700,7 +700,7 @@ module.exports.mergeOpts = _mergeOpts;
/***/ }),
/* 7 */,
/* 8 */
/***/ ((module) => {
/***/ (function(module) {

/*jshint node:true */
/*
Expand Down Expand Up @@ -902,7 +902,7 @@ module.exports.InputScanner = InputScanner;
/* 11 */,
/* 12 */,
/* 13 */
/***/ ((module) => {
/***/ (function(module) {

/*jshint node:true */
/*
Expand Down Expand Up @@ -971,7 +971,7 @@ module.exports.Directives = Directives;
/***/ }),
/* 14 */,
/* 15 */
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
/***/ (function(module, __unused_webpack_exports, __webpack_require__) {

/*jshint node:true */
/*
Expand Down Expand Up @@ -1019,7 +1019,7 @@ module.exports.defaultOptions = function() {

/***/ }),
/* 16 */
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
/***/ (function(module, __unused_webpack_exports, __webpack_require__) {

/*jshint node:true */
/*
Expand Down Expand Up @@ -1505,7 +1505,7 @@ module.exports.Beautifier = Beautifier;

/***/ }),
/* 17 */
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
/***/ (function(module, __unused_webpack_exports, __webpack_require__) {

/*jshint node:true */
/*
Expand Down
Loading

0 comments on commit 0cbb13a

Please sign in to comment.