evandroforks · evandrocoan · Dec 10, 2018 · Sep 28, 2018 · Sep 30, 2018 · Sep 30, 2018
diff --git a/.babelrc b/.babelrc
@@ -1,8 +1,15 @@
 {
-  "presets": ["es2015"],
+  "presets": [
+    [
+      "@babel/env",
+      {
+        "useBuiltIns": "usage"
+      }
+    ]
+  ],
   "plugins": [
-    "transform-runtime",
-    "transform-object-rest-spread",
-    "transform-async-to-generator"
+    "@babel/transform-runtime",
+    "@babel/syntax-object-rest-spread",
+    "@babel/transform-async-to-generator"
   ]
 }
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1 @@
+node 0
diff --git a/.eslintrc b/.eslintrc
@@ -1,15 +1,16 @@
 {
   "parser": "babel-eslint",
-
   "extends": [
     "airbnb-base"
   ],
-
   "rules": {
-    "max-len": ["error", {
-      "code": 120,
-      "ignoreUrls": true
-    }],
+    "max-len": [
+      "error",
+      {
+        "code": 150,
+        "ignoreUrls": true
+      }
+    ],
     "no-restricted-syntax": "off",
     "no-console": "off"
   }

diff --git a/.jsbeautifyrc.defaults.json b/.jsbeautifyrc.defaults.json
@@ -9,7 +9,7 @@
 
     "all":
     {
-        // These rules apply to all HTML, CSS, JS and JSON files to be prettified
+        // These rules apply to any supported code that is going to be be prettified,
         // and have the lowest level of precedence (meaning any of the settings in
         // the 'html', 'css', 'js', 'json' and 'custom' categories override these).
 
@@ -45,8 +45,9 @@
 
     "html":
     {
-        // Rules added here apply only to HTML files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to HTML-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence  over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -65,8 +66,9 @@
 
     "css":
     {
-        // Rules added here apply only to CSS files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to CSS-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence  over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -82,8 +84,9 @@
 
     "js":
     {
-        // Rules added here apply only to JS files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to JS-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence  over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -97,7 +100,7 @@
         "comma_first": false,
 
         // Pass E4X xml literals through untouched
-        "e4x": false,
+        "e4x": true,
 
         // If true, then jslint-stricter mode is enforced
         "jslint_happy": false,
@@ -129,8 +132,9 @@
 
     "json":
     {
-        // Rules added here apply only to JSON files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to JSON-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -146,12 +150,15 @@
 
     "custom":
     {
-        // Rules added here apply only to some files matching specific glob strings.
+        // Rules added here apply only to files matching specific glob strings,
+        // but respecting any whitelists or blacklists as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence over any of the settings in the categories above.
+
         // For the following entries, keys are globs and values are objects which
-        // can contain any kind of .jsbeautifyrc setting. They take precedence over
-        // all of the above settings.
+        // can contain any kind of .jsbeautifyrc setting.
 
-        "package?(-lock).json":
+        "@(package?(-lock)|yarn-lock).json":
         {
             "indent_size": 2,
             "brace_style": "collapse"
@@ -163,4 +170,4 @@
             "brace_style": "expand"
         }
     }
-}
+}
diff --git a/HTMLPrettify.sublime-settings b/HTMLPrettify.sublime-settings
@@ -31,35 +31,35 @@
     "save_to_temp_file_before_prettifying": true,
 
     // Settings determining which files are allowed to be prettified.
-    // All the keys below need to be included in your user settings for them to work.
+    // !!! All the keys below need to be included in your user settings for them to work. !!!
     "global_file_rules":
     {
-        // Be sure to include the `html` key in your user settings to be able
-        // to prettify html files.
+        // Be sure to include all of the `html`, `css`, `js` and `json` keys in your user settings
+        // if you want to be able to prettify the default files as well.
         "html":
         {
-            "allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg"],
-            "allowed_file_syntaxes": ["html", "xml"],
+            "allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg", "vue"],
+            "allowed_file_syntaxes": ["html", "xml", "vue"],
             "disallowed_file_patterns": []
         },
-        // Be sure to include the `css` key in your user settings to be able
-        // to prettify css files.
+        // Be sure to include all of the `html`, `css`, `js` and `json` keys in your user settings
+        // if you want to be able to prettify the default files as well.
         "css":
         {
             "allowed_file_extensions": ["css", "scss", "sass", "less"],
             "allowed_file_syntaxes": ["css", "sass", "less"],
             "disallowed_file_patterns": []
         },
-        // Be sure to include the `js` key in your user settings to be able
-        // to prettify js files.
+        // Be sure to include all of the `html`, `css`, `js` and `json` keys in your user settings
+        // if you want to be able to prettify the default files as well.
         "js":
         {
-            "allowed_file_extensions": ["js"],
-            "allowed_file_syntaxes": ["javascript", "ecma"],
+            "allowed_file_extensions": ["js", "jsx"],
+            "allowed_file_syntaxes": ["javascript", "ecma", "react", "babel"],
             "disallowed_file_patterns": []
         },
-        // Be sure to include the `json` key in your user settings to be able
-        // to prettify json files.
+        // Be sure to include all of the `html`, `css`, `js` and `json` keys in your user settings
+        // if you want to be able to prettify the default files as well.
         "json":
         {
             "allowed_file_extensions": [

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
-# HTML, CSS, JavaScript and JSON code formatter for Sublime Text 2 and 3 via node.js
+# HTML, CSS, JavaScript, JSON, React and Vue code formatter for Sublime Text 2 and 3 via node.js
 #### [Sublime Text 3](http://www.sublimetext.com/3)
 #### [JS-beautify](https://github.com/einars/js-beautify)
 #### [Node.js download](http://nodejs.org/#download)
 
 ## About
-This is a Sublime Text 2 and 3 plugin allowing you to format your HTML, CSS, JavaScript and JSON code. It uses a set of nice beautifier scripts made by Einar Lielmanis. The formatters are written in JavaScript, so you'll need something (node.js) to interpret JavaScript code outside the browser.
+This is a Sublime Text 2 and 3 plugin allowing you to format your HTML, CSS, JavaScript, JSON, React and Vue code. It uses a set of nice beautifier scripts made by Einar Lielmanis. The formatters are written in JavaScript, so you'll need something (node.js) to interpret JavaScript code outside the browser.
 
-This will work with either HTML, CSS, JavaScript and JSON files.
+This will work with either HTML, CSS, JavaScript, JSON, React and Vue files.
 
 ## Installation
 First of all, be sure you have [node.js](http://nodejs.org/#download) installed in order to run the beautifier. After you've installed node.js, you will need to setup this plugin.
@@ -47,7 +47,7 @@ Right click in the current buffer and select `HTML/CSS/JS Prettify` -> `Prettify
 
 -- or --
 
-Open a HTML, CSS or JavaScript file, pop out the console in Sublime Text from View -> Show Console, and type `view.run_command("htmlprettify")`.
+Open a HTML, CSS, JavaScript, JSON, React or Vue file, pop out the console in Sublime Text from View -> Show Console, and type `view.run_command("htmlprettify")`.
 
 Writing commands in the console is ugly. Set up your own key combo for this, by going to Preferences -> Key Bindings - User, and adding a command in that array: `{ "keys": ["super+shift+h"], "command": "htmlprettify" }`. You can use any other command you want, thought most of them are already taken.
 
@@ -66,6 +66,12 @@ On Windows, the absolute path to node.exe *must* use forward slashes. Must inclu
 ### Be very careful on Linux!
 Depending on your distribution and default package sources, `apt-get install node` (for example) *will not* install node.js, contrary to all human common sense and popular belief. You want `nodejs` instead. Best thing is to make it yourself from http://nodejs.org/#download.
 
+## Beautify Vue
+To properly beautify Vue files, make sure the file syntax is recongnized by Sublime as either HTML, XML or Vue.
+
+## Beautify JSX
+To properly beautify JSX files, make sure the file syntax is recongnized by Sublime as JavaScript and that `e4x` is `true` in your `.jsbeautifyrc`.
+
 ## Beautify on Save
 To beautify your code when saving the document, set the `format_on_save` setting to `true` in `HTMLPrettify.sublime-settings`:
 
@@ -196,7 +202,7 @@ When one is found, it stops searching, and it uses those options along with the
 
     "all":
     {
-        // These rules apply to all HTML, CSS, JS and JSON files to be prettified
+        // These rules apply to any supported code that is going to be be prettified,
         // and have the lowest level of precedence (meaning any of the settings in
         // the 'html', 'css', 'js', 'json' and 'custom' categories override these).
 
@@ -232,8 +238,9 @@ When one is found, it stops searching, and it uses those options along with the
 
     "html":
     {
-        // Rules added here apply only to HTML files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to HTML-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence  over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -252,8 +259,9 @@ When one is found, it stops searching, and it uses those options along with the
 
     "css":
     {
-        // Rules added here apply only to CSS files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to CSS-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence  over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -269,8 +277,9 @@ When one is found, it stops searching, and it uses those options along with the
 
     "js":
     {
-        // Rules added here apply only to JS files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to JS-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence  over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -316,8 +325,9 @@ When one is found, it stops searching, and it uses those options along with the
 
     "json":
     {
-        // Rules added here apply only to JSON files. They take precedence over all
-        // of the settings in the 'all' category above.
+        // Rules added here apply only to JSON-like files, as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence over all of the settings in the 'all' category above.
 
         // You can add other .jsbeautifyrc rules in this section too.
 
@@ -333,10 +343,13 @@ When one is found, it stops searching, and it uses those options along with the
 
     "custom":
     {
-        // Rules added here apply only to some files matching specific glob strings.
+        // Rules added here apply only to files matching specific glob strings,
+        // but respecting any whitelists or blacklists as determined by the
+        // rules specified for `global_file_rules` in the plugin settings. They
+        // take precedence over any of the settings in the categories above.
+
         // For the following entries, keys are globs and values are objects which
-        // can contain any kind of .jsbeautifyrc setting. They take precedence over
-        // all of the above settings.
+        // can contain any kind of .jsbeautifyrc setting.
 
         "package?(-lock).json":
         {