Pulling staging/gh-pages into gh-pages

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Cached node_modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: node_modules
           key: ${{ runner.os }}-node-${{ hashFiles('**/package*.json') }}

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.15.1
+* Turn new angular templating off by default in html ([#2247](https://github.com/beautifier/js-beautify/pull/2247))
+* Perf regression in latest release (1.15.0) ([#2246](https://github.com/beautifier/js-beautify/issues/2246))
+
 ## v1.15.0
 * Fixed #2219 - formatting of new Angular control flow syntax ([#2221](https://github.com/beautifier/js-beautify/pull/2221))
 

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.0/beautify.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-css.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-html.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.1/beautify.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.1/beautify-css.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.1/beautify-html.js"></script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-css.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.0/beautify-html.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.1/beautify.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.1/beautify-css.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.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.0/beautify.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/js-beautify/1.15.1/beautify.min.js"></script>
     <script src="script.js"></script>
   </body>
 </html>
@@ -434,4 +434,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].0)
+(README.md: [email protected].1)

js/lib/beautify-css.js

@@ -572,9 +572,9 @@ function Options(options, merge_child_field) {
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
   // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
-  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty', 'angular'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {

js/lib/beautify-html.js

@@ -641,9 +641,9 @@ function Options(options, merge_child_field) {
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
   // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
-  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty', 'angular'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {
@@ -2707,7 +2707,7 @@ var BaseOptions = (__webpack_require__(6).Options);
 function Options(options) {
   BaseOptions.call(this, options, 'html');
   if (this.templating.length === 1 && this.templating[0] === 'auto') {
-    this.templating = ['django', 'erb', 'handlebars', 'php', 'angular'];
+    this.templating = ['django', 'erb', 'handlebars', 'php'];
   }
 
   this.indent_inner_html = this._get_boolean('indent_inner_html');

js/lib/beautify.js

@@ -2347,9 +2347,9 @@ function Options(options, merge_child_field) {
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
   // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
-  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty', 'angular'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {

js/lib/cli.js

@@ -199,7 +199,7 @@ var path = require('path'),
         // no shorthand for "config"
         // no shorthand for "editorconfig"
         // no shorthand for "indent_empty_lines"
-        // not shorthad for "templating"
+        // no shorthad for "templating"
     });
 
 function verifyExists(fullPath) {
@@ -370,7 +370,8 @@ function usage(err) {
         '                                    [first newline in file, otherwise "\\n]',
         '  -n, --end-with-newline            End output with newline',
         '  --indent-empty-lines              Keep indentation on empty lines',
-        '  --templating                      List of templating languages (auto,none,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in html',
+        '  --templating                      List of templating languages (auto,none,angular,django,erb,handlebars,php,smarty)',
+        '                                    ["auto", auto = none in JavaScript, auto = all except angular in html (and inline javascript/css)]',
         '  --editorconfig                    Use EditorConfig to set up the options'
     ];
 
@@ -409,7 +410,7 @@ function usage(err) {
             msg.push('  -U, --unformatted                 List of tags (defaults to inline) that should not be reformatted');
             msg.push('  -T, --content_unformatted         List of tags (defaults to pre) whose content should not be reformatted');
             msg.push('  -E, --extra_liners                List of tags (defaults to [head,body,/html] that should have an extra newline');
-            msg.push('  --unformatted_content_delimiter    Keep text content together between this string [""]');
+            msg.push('  --unformatted_content_delimiter   Keep text content together between this string [""]');
             break;
         case "css":
             msg.push('  -b, --brace-style                       [collapse|expand] ["collapse"]');

js/src/cli.js

@@ -199,7 +199,7 @@ var path = require('path'),
         // no shorthand for "config"
         // no shorthand for "editorconfig"
         // no shorthand for "indent_empty_lines"
-        // not shorthad for "templating"
+        // no shorthad for "templating"
     });
 
 function verifyExists(fullPath) {
@@ -370,7 +370,8 @@ function usage(err) {
         '                                    [first newline in file, otherwise "\\n]',
         '  -n, --end-with-newline            End output with newline',
         '  --indent-empty-lines              Keep indentation on empty lines',
-        '  --templating                      List of templating languages (auto,none,django,erb,handlebars,php,smarty,angular) ["auto"] auto = none in JavaScript, all in html',
+        '  --templating                      List of templating languages (auto,none,angular,django,erb,handlebars,php,smarty)',
+        '                                    ["auto", auto = none in JavaScript, auto = all except angular in html (and inline javascript/css)]',
         '  --editorconfig                    Use EditorConfig to set up the options'
     ];
 
@@ -409,7 +410,7 @@ function usage(err) {
             msg.push('  -U, --unformatted                 List of tags (defaults to inline) that should not be reformatted');
             msg.push('  -T, --content_unformatted         List of tags (defaults to pre) whose content should not be reformatted');
             msg.push('  -E, --extra_liners                List of tags (defaults to [head,body,/html] that should have an extra newline');
-            msg.push('  --unformatted_content_delimiter    Keep text content together between this string [""]');
+            msg.push('  --unformatted_content_delimiter   Keep text content together between this string [""]');
             break;
         case "css":
             msg.push('  -b, --brace-style                       [collapse|expand] ["collapse"]');

js/src/core/options.js

@@ -68,9 +68,9 @@ function Options(options, merge_child_field) {
   this.indent_empty_lines = this._get_boolean('indent_empty_lines');
 
   // valid templating languages ['django', 'erb', 'handlebars', 'php', 'smarty', 'angular']
-  // For now, 'auto' = all off for javascript, all on for html (and inline javascript).
+  // For now, 'auto' = all off for javascript, all except angular on for html (and inline javascript/css).
   // other values ignored
-  this.templating = this._get_selection_list('templating', ['auto', 'none', 'django', 'erb', 'handlebars', 'php', 'smarty', 'angular'], ['auto']);
+  this.templating = this._get_selection_list('templating', ['auto', 'none', 'angular', 'django', 'erb', 'handlebars', 'php', 'smarty'], ['auto']);
 }
 
 Options.prototype._get_array = function(name, default_value) {

js/src/html/options.js

@@ -33,7 +33,7 @@ var BaseOptions = require('../core/options').Options;
 function Options(options) {
   BaseOptions.call(this, options, 'html');
   if (this.templating.length === 1 && this.templating[0] === 'auto') {
-    this.templating = ['django', 'erb', 'handlebars', 'php', 'angular'];
+    this.templating = ['django', 'erb', 'handlebars', 'php'];
   }
 
   this.indent_inner_html = this._get_boolean('indent_inner_html');

js/test/generated/beautify-html-tests.js

@@ -9654,6 +9654,30 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '        Text\n' +
             '    </div>\n' +
             '}');
+
+        // CSS @media should remain unchanged
+        bth(
+            '<style type="text/css">\n' +
+            '    @media only screen and (min-width:480px) {\n' +
+            '        .mj-column-per-100 {\n' +
+            '            width: 100% !important;\n' +
+            '            max-width: 100%;\n' +
+            '        }\n' +
+            '    }\n' +
+            '</style>',
+            //  -- output --
+            '<style type="text/css">\n' +
+            '@media only screen and (min-width:480px) {\n' +
+            '        .mj-column-per-100\n' +
+            '        {\n' +
+            '        width:\n' +
+            '        100%\n' +
+            '        !important;\n' +
+            '        max-width:\n' +
+            '        100%;\n' +
+            '}\n' +
+            '    }\n' +
+            '</style>');
 
 
         //============================================================
@@ -9731,6 +9755,17 @@ function run_html_tests(test_obj, Urlencoded, js_beautify, html_beautify, css_be
             '    </p>\n' +
             '    }\n' +
             '</div>');
+
+        // CSS @media should remain unchanged
+        bth(
+            '<style type="text/css">\n' +
+            '    @media only screen and (min-width:480px) {\n' +
+            '        .mj-column-per-100 {\n' +
+            '            width: 100% !important;\n' +
+            '            max-width: 100%;\n' +
+            '        }\n' +
+            '    }\n' +
+            '</style>');
 
 
         //============================================================