Merge pull request #238 from prettier/issue/232-adding-support-for-prettier-2.x

issue/232-adding-support-for-prettier-2.x - Adding support for prettier 2x

6 files changed, 27 insertions, 4 deletions

diff --git a/README.md b/README.md
index 773fa6a..a826088 100644
--- a/README.md
+++ b/README.md
@@ -262,6 +262,11 @@ let g:prettier#config#html_whitespace_sensitivity = 'css'
 " false|true
 " default: 'false'
 let g:prettier#config#require_pragma = 'false'
+
+" Define the flavor of line endings
+" lf|crlf|cr|all
+" defaut: 'lf'
+let g:prettier#config#end_of_line = get(g:, 'prettier#config#end_of_line', 'lf')
 ```
 
 ### REQUIREMENT(S)
diff --git a/autoload/prettier/resolver/config.vim b/autoload/prettier/resolver/config.vim
index b22f11a..9a18444 100644
--- a/autoload/prettier/resolver/config.vim
+++ b/autoload/prettier/resolver/config.vim
@@ -30,8 +30,11 @@ function! prettier#resolver#config#resolve(config, hasSelection, start, end) abo
           \ ' --stdin-filepath="'.simplify(expand('%:p')).'"' .
           \ ' --require-pragma=' .
           \ get(a:config, 'requirePragma', g:prettier#config#require_pragma) .
+          \ ' --end-of-line=' .
+          \ get(a:config, 'endOfLine', g:prettier#config#end_of_line) .
           \ ' --loglevel error '.
           \ ' --stdin '
+
   return l:cmd
 endfunction
 
diff --git a/doc/prettier.txt b/doc/prettier.txt
index e9cf496..be76055 100644
--- a/doc/prettier.txt
+++ b/doc/prettier.txt
@@ -206,8 +206,13 @@ However they can be configured by:
 
   " false|true
   " default: 'false'
-  let g:prettier#config#require_pragma = 'false'
-<
+  " let g:prettier#config#require_pragma = 'false'
+
+  " Define the flavor of line endings
+  " lf|crlf|cr|all
+  " defaut: 'lf' 
+  let g:prettier#config#end_of_line = get(g:, 'prettier#config#end_of_line', 'lf')
+
 ==============================================================================
 REQUIREMENT(S)                                      *vim-prettier-requirements*
 
diff --git a/package.json b/package.json
index 291da90..64b4432 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@prettier/plugin-php": "^0.10.2",
     "@prettier/plugin-ruby": "^0.8.0",
     "@prettier/plugin-xml": "^0.7.2",
-    "prettier": "^1.19.1"
+    "prettier": "^2.0.4"
   },
   "devDependencies": {
     "colors": "^1.3.2",
diff --git a/plugin/prettier.vim b/plugin/prettier.vim
index 944e38d..04ca780 100644
--- a/plugin/prettier.vim
+++ b/plugin/prettier.vim
@@ -120,6 +120,11 @@ let g:prettier#config#jsx_bracket_same_line = get(g:,'prettier#config#jsx_bracke
 " See more: https://prettier.io/docs/en/options.html#arrow-function-parentheses
 let g:prettier#config#arrow_parens = get(g:,'prettier#config#arrow_parens', 'always')
 
+" Define the flavor of line endings
+" lf|crlf|cr|all
+" defaut: 'lf' 
+let g:prettier#config#end_of_line = get(g:, 'prettier#config#end_of_line', 'lf')
+
 " Print trailing commas wherever possible when multi-line.
 " none|es5|all
 " default: 'es5'
diff --git a/yarn.lock b/yarn.lock
index 65dd6e6..140bfd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2658,11 +2658,16 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
-prettier@>=1.10, prettier@^1.16.4, prettier@^1.19.1:
+prettier@>=1.10, prettier@^1.16.4:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
+prettier@^2.0.4:
+  version "2.0.4"
+  resolved "https://packages.atlassian.com/api/npm/npm-remote/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef"
+  integrity sha1-LRuuFz41WZbuNV7Jgwp6HuBUV+8=
+
 pretty-format@^23.6.0:
   version "23.6.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760"