Skip to content

Commit 30cfdba

Browse files
author
Mike Taylor
authored
Merge pull request #1468 from /issues/1434
Fixes #1434 - adding Prettier
2 parents 43f88c0 + 94fd435 commit 30cfdba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3486
-2335
lines changed

‎.eslintrc

+8-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
"env": {
33
"browser": true
44
},
5-
"extends": "eslint:recommended",
5+
"extends": [
6+
"eslint:recommended",
7+
"prettier"
8+
],
9+
"plugins" : [
10+
"prettier"
11+
],
612
"globals": {
713
"jQuery": true,
814
"$": true,
@@ -26,22 +32,11 @@
2632
"WindowHelpers": true
2733
},
2834
"rules": {
29-
"comma-dangle": 0,
30-
"curly": [2, "all"],
3135
"eqeqeq": [2, "smart"],
32-
"indent": [2, 2, { "SwitchCase": 1 }],
33-
"keyword-spacing": 2,
34-
"linebreak-style": [2, "unix"],
3536
"new-cap": 2,
3637
"no-cond-assign": 0,
37-
"no-spaced-func": 2,
3838
"no-use-before-define": 2,
3939
"one-var": [2, "never"],
40-
"quotes": [2, "double"],
41-
"semi": [2, "always"],
42-
"space-before-blocks": 2,
43-
"space-before-function-paren": [2, "never"],
44-
"space-infix-ops": 2,
45-
"space-unary-ops": 2
40+
"prettier/prettier": "error"
4641
}
4742
}

‎Gruntfile.js

+12-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
99
cssPath: "webcompat/static/css",
1010
imgPath: "webcompat/static/img",
1111
banner: "/*! <%= pkg.title %>\n" +
12-
" * Copyright (c) <%= grunt.template.today(\"yyyy\") %> <%= pkg.author.name %>\n" +
12+
' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>\n' +
1313
" *\n" +
1414
" * This code is licensed under the MPL 2.0 License, except where\n" +
1515
" * otherwise stated. See http://mozilla.org/MPL/2.0/. */\n"
@@ -23,11 +23,20 @@ module.exports = function(grunt) {
2323

2424
// Default task.
2525
grunt.registerTask("default", [
26-
"checkDependencies", "concat", "uglify","postcss", "cssmin"
26+
"checkDependencies",
27+
"concat",
28+
"uglify",
29+
"postcss",
30+
"cssmin"
2731
]);
2832

2933
// Task used before doing a deploy (same as default, but does image optimization)
3034
grunt.registerTask("deploy", [
31-
"checkDependencies", "concat", "uglify","postcss", "cssmin", "imagemin"
35+
"checkDependencies",
36+
"concat",
37+
"uglify",
38+
"postcss",
39+
"cssmin",
40+
"imagemin"
3241
]);
3342
};

‎grunt-tasks/cmq.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function(grunt) {
99
},
1010
your_target: {
1111
files: {
12-
"<%= cssPath %>" : ["<%= cssPath %>/webcompat.dev.css"]
12+
"<%= cssPath %>": ["<%= cssPath %>/webcompat.dev.css"]
1313
}
1414
}
1515
});

‎grunt-tasks/concat.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = function(grunt) {
4242
"<%= jsPath %>/lib/models/issue.js",
4343
"<%= jsPath %>/lib/models/comment.js",
4444
"<%= jsPath %>/lib/comments.js",
45-
"<%= jsPath %>/lib/issues.js",
45+
"<%= jsPath %>/lib/issues.js"
4646
],
4747
dest: "<%= jsPath %>/issues.js"
4848
},

‎grunt-tasks/cssnext.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@ module.exports = function(grunt) {
99
processors: [
1010
require("postcss-import")(),
1111
require("postcss-cssnext")({
12-
browsers: ["ff >= 20", "ie >= 10", "safari >= 7", "opera >= 12", "chrome >=30"],
12+
browsers: [
13+
"ff >= 20",
14+
"ie >= 10",
15+
"safari >= 7",
16+
"opera >= 12",
17+
"chrome >=30"
18+
]
1319
}),
1420
require("postcss-browser-reporter")(),
15-
require("postcss-reporter")(),
21+
require("postcss-reporter")()
1622
]
1723
},
1824
dist: {

‎grunt-tasks/imagemin.js

+16-12
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,27 @@ module.exports = function(grunt) {
88
options: {
99
optimizationLevel: 7
1010
},
11-
files: [{
12-
expand: true,
13-
cwd: "<%= imgPath %>/",
14-
src: ["*.png"],
15-
dest: "<%= imgPath %>/"
16-
}]
11+
files: [
12+
{
13+
expand: true,
14+
cwd: "<%= imgPath %>/",
15+
src: ["*.png"],
16+
dest: "<%= imgPath %>/"
17+
}
18+
]
1719
},
1820
jpg: {
1921
options: {
2022
progressive: true
2123
},
22-
files: [{
23-
expand: true,
24-
cwd: "<%= imgPath %>/",
25-
src: ["*.jpg"],
26-
dest: "<%= imgPath %>/"
27-
}]
24+
files: [
25+
{
26+
expand: true,
27+
cwd: "<%= imgPath %>/",
28+
src: ["*.jpg"],
29+
dest: "<%= imgPath %>/"
30+
}
31+
]
2832
}
2933
});
3034
};

‎grunt-tasks/watch.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
module.exports = function(grunt) {
66
grunt.config("watch", {
7-
css:{
7+
css: {
88
files: "<%= cssPath %>/development/**/*.css",
99
tasks: ["postcss"]
1010
},
11-
script:{
11+
script: {
1212
files: "<%= jshint.beforeconcat %>",
1313
tasks: ["jshint:beforeconcat"]
1414
}

‎package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
"cssrecipes-reset": "^0.5.0",
2121
"cssrecipes-utils": "^0.6.2",
2222
"eslint": "^3.4.0",
23+
"eslint-config-prettier": "^1.5.0",
24+
"eslint-plugin-prettier": "^2.0.1",
2325
"grunt": "~0.4.5",
2426
"grunt-check-dependencies": "~0.9.0",
2527
"grunt-cli": "^1.2.0",
@@ -37,6 +39,7 @@
3739
"postcss-import": "^8.0.2",
3840
"postcss-reporter": "^3.0.0",
3941
"postcss-url": "^5.1.1",
42+
"prettier": "^0.22.0",
4043
"suitcss-utils-align": "^0.2.0",
4144
"suitcss-utils-display": "^0.4.0"
4245
},
@@ -46,9 +49,9 @@
4649
"build": "grunt",
4750
"lint": "eslint ./Gruntfile.js ./tests ./grunt-tasks ./webcompat/static/js/lib",
4851
"fix": "eslint --fix ./Gruntfile.js ./tests ./grunt-tasks ./webcompat/static/js/lib",
49-
"imagemin":"grunt imagemin",
52+
"imagemin": "grunt imagemin",
5053
"module": "git submodule init && git submodule update",
51-
"prestart":"npm run build",
54+
"prestart": "npm run build",
5255
"start": "source env/bin/activate || . env/bin/activate && python run.py",
5356
"virtualenv": "pip install virtualenv && virtualenv env && source env/bin/activate || . env/bin/activate && npm run pip",
5457
"pip": "pip install -r config/requirements.txt",

‎tests/functional-all.js

+24-21
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,27 @@ node_modules/.bin/intern-runner config=tests/intern \
1111
pw="github_password"
1212
*/
1313

14-
define([
15-
"./functional/reporting-non-auth.js",
16-
"./functional/comments-non-auth.js",
17-
"./functional/contributors-non-auth.js",
18-
"./functional/comments-auth.js",
19-
"./functional/history-navigation-non-auth.js",
20-
"./functional/image-uploads-non-auth.js",
21-
"./functional/index-non-auth.js",
22-
"./functional/issue-list-non-auth.js",
23-
"./functional/issues-non-auth.js",
24-
"./functional/new-issue-non-auth.js",
25-
"./functional/search-non-auth.js",
26-
"./functional/search-auth.js",
27-
"./functional/issues-auth.js",
28-
"./functional/labels-auth.js",
29-
"./functional/reporting-auth.js",
30-
"./functional/user-activity-auth.js",
31-
"./functional/user-activity-non-auth.js",
32-
], function() {
33-
"use strict";
34-
});
14+
define(
15+
[
16+
"./functional/reporting-non-auth.js",
17+
"./functional/comments-non-auth.js",
18+
"./functional/contributors-non-auth.js",
19+
"./functional/comments-auth.js",
20+
"./functional/history-navigation-non-auth.js",
21+
"./functional/image-uploads-non-auth.js",
22+
"./functional/index-non-auth.js",
23+
"./functional/issue-list-non-auth.js",
24+
"./functional/issues-non-auth.js",
25+
"./functional/new-issue-non-auth.js",
26+
"./functional/search-non-auth.js",
27+
"./functional/search-auth.js",
28+
"./functional/issues-auth.js",
29+
"./functional/labels-auth.js",
30+
"./functional/reporting-auth.js",
31+
"./functional/user-activity-auth.js",
32+
"./functional/user-activity-non-auth.js"
33+
],
34+
function() {
35+
"use strict";
36+
}
37+
);

‎tests/functional-nonauth.js

+17-14
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,20 @@ node_modules/.bin/intern-runner config=tests/intern \
1010
functionalSuites=tests/functional-nonauth
1111
*/
1212

13-
define([
14-
"./functional/reporting-non-auth.js",
15-
"./functional/comments-non-auth.js",
16-
"./functional/contributors-non-auth.js",
17-
"./functional/history-navigation-non-auth.js",
18-
"./functional/image-uploads-non-auth.js",
19-
"./functional/index-non-auth.js",
20-
"./functional/issue-list-non-auth.js",
21-
"./functional/issues-non-auth.js",
22-
"./functional/new-issue-non-auth.js",
23-
"./functional/search-non-auth.js"
24-
], function() {
25-
"use strict";
26-
});
13+
define(
14+
[
15+
"./functional/reporting-non-auth.js",
16+
"./functional/comments-non-auth.js",
17+
"./functional/contributors-non-auth.js",
18+
"./functional/history-navigation-non-auth.js",
19+
"./functional/image-uploads-non-auth.js",
20+
"./functional/index-non-auth.js",
21+
"./functional/issue-list-non-auth.js",
22+
"./functional/issues-non-auth.js",
23+
"./functional/new-issue-non-auth.js",
24+
"./functional/search-non-auth.js"
25+
],
26+
function() {
27+
"use strict";
28+
}
29+
);

0 commit comments

Comments
 (0)