Merge branch 'master' into master

This commit is contained in:
Junjie Peng 2018-03-05 09:44:36 +08:00 committed by GitHub
commit 0360f81ea3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1856 additions and 1226 deletions

View File

@ -80,8 +80,6 @@ before_install:
- Rscript --version - Rscript --version
# PHP # PHP
- composer install - composer install
# CoffeeScript
- npm install coffee-formatter
# OCaml # OCaml
# - opam init --auto-setup # - opam init --auto-setup
# Init environment variables for opam # Init environment variables for opam

View File

@ -1,5 +1,8 @@
# Next # Next
- Fix "Reindent" option for sqlformat. - Update Prettier to 1.11.1. (#2060)
- Fix package.json repository field (#2062)
- Fix "Reindent" option for sqlformat. (#2064)
- ...
# v0.32.0 (2018-03-02) # v0.32.0 (2018-03-02)
- See [#2026](https://github.com/Glavin001/atom-beautify/issues/2026) Add Vue support to ESLint Fixer beautifier. Should be used with [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue). - See [#2026](https://github.com/Glavin001/atom-beautify/issues/2026) Add Vue support to ESLint Fixer beautifier. Should be used with [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue).

3067
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -4,10 +4,7 @@
"version": "0.32.0", "version": "0.32.0",
"private": true, "private": true,
"description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom", "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, Coldfusion, SQL, and more in Atom",
"repository": { "repository": "github:Glavin001/atom-beautify",
"type": "git",
"url": "git@github.com:Glavin001/atom-beautify.git"
},
"bugs": { "bugs": {
"url": "https://github.com/Glavin001/atom-beautify/issues" "url": "https://github.com/Glavin001/atom-beautify/issues"
}, },
@ -203,7 +200,7 @@
"node-cljfmt": "0.5.3", "node-cljfmt": "0.5.3",
"node-dir": "0.1.17", "node-dir": "0.1.17",
"open": "0.0.5", "open": "0.0.5",
"prettier": "^1.10.2", "prettier": "^1.11.1",
"prettydiff2": "^2.2.7", "prettydiff2": "^2.2.7",
"pug-beautify": "^0.1.1", "pug-beautify": "^0.1.1",
"remark": "6.0.1", "remark": "6.0.1",
@ -459,6 +456,7 @@
"prepare": "npm run docs", "prepare": "npm run docs",
"lint": "coffeelint src/ spec/", "lint": "coffeelint src/ spec/",
"code-docs": "codo && open docs/code/index.html", "code-docs": "codo && open docs/code/index.html",
"pretest": "npm run lint",
"test": "atom --test spec" "test": "atom --test spec"
}, },
"config": { "config": {