forked from adobe/brackets
-
Notifications
You must be signed in to change notification settings - Fork 279
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[WIP] Prettier plugin for eslint #703
Open
dsych
wants to merge
11
commits into
mozilla:master
Choose a base branch
from
dsych:prettier-plugin
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
3a25fa6
prettier plugin for eslint
dsych bb27ae3
updated dependency for grunt-eslint
dsych b98b331
before githooks
dsych 09205b2
test
dsych 16dd133
test
dsych 6c4c2b9
test1
dsych 6f53505
configuring git hooks
dsych e3728b4
Merge branch 'master' into prettier-plugin
dsych 39d637d
Update package.json
dsych ed8f4ec
Adding grunt-githooks dependency
dsych 94c41cb
Merge branch 'master' into prettier-plugin
dsych File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,73 +1,76 @@ | ||
{ | ||
"name": "bramble", | ||
"version": "1.9.0-0", | ||
"apiVersion": "1.9.0", | ||
"homepage": "https://mozillathimblelivepreview.net/bramble/staging/dist/hosted.html", | ||
"issues": { | ||
"url": "http://github.com/mozilla/brackets/issues" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/mozilla/brackets.git", | ||
"branch": "", | ||
"SHA": "" | ||
}, | ||
"dependencies": { | ||
"anymatch": "1.3.0", | ||
"aws-sdk": "^2.19.0", | ||
"chokidar": "1.6.0", | ||
"glob": "7.0.6", | ||
"grunt": "0.4.5", | ||
"grunt-cleanempty": "1.0.3", | ||
"grunt-cli": "0.1.9", | ||
"grunt-contrib-clean": "0.4.1", | ||
"grunt-contrib-compress": "^1.4.1", | ||
"grunt-contrib-concat": "0.3.0", | ||
"grunt-contrib-copy": "0.4.1", | ||
"grunt-contrib-cssmin": "0.6.0", | ||
"grunt-contrib-htmlmin": "0.1.3", | ||
"grunt-contrib-jasmine": "0.4.2", | ||
"grunt-contrib-less": "1.4.0", | ||
"grunt-contrib-requirejs": "0.4.1", | ||
"grunt-contrib-uglify": "^2.3.0", | ||
"grunt-contrib-watch": "0.4.3", | ||
"grunt-eslint": "18.1.0", | ||
"grunt-exec": "^1.0.1", | ||
"grunt-jasmine-node": "0.1.0", | ||
"grunt-lib-phantomjs": "0.3.0", | ||
"grunt-targethtml": "0.2.6", | ||
"grunt-template-jasmine-requirejs": "0.1.0", | ||
"grunt-usemin": "0.1.11", | ||
"jasmine-node": "1.11.0", | ||
"less-plugin-autoprefix": "^1.5.1", | ||
"load-grunt-tasks": "3.5.0", | ||
"lodash": "4.15.0", | ||
"phantomjs": "1.9.18", | ||
"q": "1.4.1", | ||
"semver": "^4.1.0", | ||
"xmldoc": "^0.1.2" | ||
}, | ||
"devDependencies": { | ||
"bluebird": "^3.4.7", | ||
"gunzip-maybe": "^1.3.1", | ||
"http-server": "^0.9.0", | ||
"mkdirp": "0.5.1", | ||
"nunjucks": "^2.4.3", | ||
"properties-parser": "0.3.1", | ||
"request": "^2.69.0", | ||
"requirejs": "^2.3.3", | ||
"sw-precache": "^5.0.0", | ||
"tar-fs": "^1.15.1" | ||
}, | ||
"scripts": { | ||
"localize": "node scripts/properties2js", | ||
"postinstall": "grunt install", | ||
"build": "grunt build-browser", | ||
"preproduction": "grunt build-browser-compressed && grunt unlocalize", | ||
"production": "npm start", | ||
"unlocalize": "grunt unlocalize", | ||
"test": "grunt test && grunt build-browser-compressed", | ||
"start": "http-server -p 8000 --cors" | ||
}, | ||
"license": "MIT" | ||
"name": "bramble", | ||
"version": "1.9.0-0", | ||
"apiVersion": "1.9.0", | ||
"homepage": "https://mozillathimblelivepreview.net/bramble/staging/dist/hosted.html", | ||
"issues": { | ||
"url": "http://github.com/mozilla/brackets/issues" | ||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "https://github.com/mozilla/brackets.git", | ||
"branch": "", | ||
"SHA": "" | ||
}, | ||
"dependencies": { | ||
"anymatch": "1.3.0", | ||
"aws-sdk": "^2.19.0", | ||
"chokidar": "1.6.0", | ||
"glob": "7.0.6", | ||
"grunt": "0.4.5", | ||
"grunt-cleanempty": "1.0.3", | ||
"grunt-cli": "0.1.9", | ||
"grunt-contrib-clean": "0.4.1", | ||
"grunt-contrib-compress": "^1.4.1", | ||
"grunt-contrib-concat": "0.3.0", | ||
"grunt-contrib-copy": "0.4.1", | ||
"grunt-contrib-cssmin": "0.6.0", | ||
"grunt-contrib-htmlmin": "0.1.3", | ||
"grunt-contrib-jasmine": "0.4.2", | ||
"grunt-contrib-less": "1.4.0", | ||
"grunt-contrib-requirejs": "0.4.1", | ||
"grunt-contrib-uglify": "^2.3.0", | ||
"grunt-contrib-watch": "0.4.3", | ||
"grunt-eslint": "19.0.0", | ||
"grunt-exec": "^1.0.1", | ||
"grunt-jasmine-node": "0.1.0", | ||
"grunt-lib-phantomjs": "0.3.0", | ||
"grunt-targethtml": "0.2.6", | ||
"grunt-template-jasmine-requirejs": "0.1.0", | ||
"grunt-usemin": "0.1.11", | ||
"jasmine-node": "1.11.0", | ||
"less-plugin-autoprefix": "^1.5.1", | ||
"load-grunt-tasks": "3.5.0", | ||
"lodash": "4.15.0", | ||
"phantomjs": "1.9.18", | ||
"q": "1.4.1", | ||
"semver": "^4.1.0", | ||
"xmldoc": "^0.1.2" | ||
}, | ||
"devDependencies": { | ||
"bluebird": "^3.4.7", | ||
"eslint-config-prettier": "^1.6.0", | ||
"eslint-plugin-prettier": "^2.0.1", | ||
"gunzip-maybe": "^1.3.1", | ||
"http-server": "^0.9.0", | ||
"mkdirp": "0.5.1", | ||
"nunjucks": "^2.4.3", | ||
"prettier": "^0.22.0", | ||
"properties-parser": "0.3.1", | ||
"request": "^2.69.0", | ||
"requirejs": "^2.3.3", | ||
"sw-precache": "^5.0.0", | ||
"tar-fs": "^1.15.1" | ||
}, | ||
"scripts": { | ||
"localize": "node scripts/properties2js", | ||
"postinstall": "grunt install", | ||
"build": "grunt build-browser", | ||
"preproduction": "grunt build-browser-compressed && grunt unlocalize", | ||
"production": "npm start", | ||
"unlocalize": "grunt unlocalize", | ||
"test": "grunt test && grunt build-browser-compressed", | ||
"start": "http-server -p 8000 --cors" | ||
}, | ||
"license": "MIT" | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file should be 4-space indented.