Prettier!

Author: rreusser

lib/index-basic.js

@@ -10,9 +10,6 @@
 
 var Plotly = require('./core');
 
-Plotly.register([
-    require('./bar'),
-    require('./pie')
-]);
+Plotly.register([require('./bar'), require('./pie')]);
 
 module.exports = Plotly;

lib/index-cartesian.js

@@ -11,15 +11,15 @@
 var Plotly = require('./core');
 
 Plotly.register([
-    require('./bar'),
-    require('./box'),
-    require('./heatmap'),
-    require('./histogram'),
-    require('./histogram2d'),
-    require('./histogram2dcontour'),
-    require('./pie'),
-    require('./contour'),
-    require('./scatterternary')
+  require('./bar'),
+  require('./box'),
+  require('./heatmap'),
+  require('./histogram'),
+  require('./histogram2d'),
+  require('./histogram2dcontour'),
+  require('./pie'),
+  require('./contour'),
+  require('./scatterternary'),
 ]);
 
 module.exports = Plotly;

lib/index-finance.js

@@ -11,11 +11,11 @@
 var Plotly = require('./core');
 
 Plotly.register([
-    require('./bar'),
-    require('./histogram'),
-    require('./pie'),
-    require('./ohlc'),
-    require('./candlestick')
+  require('./bar'),
+  require('./histogram'),
+  require('./pie'),
+  require('./ohlc'),
+  require('./candlestick'),
 ]);
 
 module.exports = Plotly;

lib/index-geo.js

@@ -10,9 +10,6 @@
 
 var Plotly = require('./core');
 
-Plotly.register([
-    require('./scattergeo'),
-    require('./choropleth')
-]);
+Plotly.register([require('./scattergeo'), require('./choropleth')]);
 
 module.exports = Plotly;

lib/index-gl2d.js

@@ -11,11 +11,11 @@
 var Plotly = require('./core');
 
 Plotly.register([
-    require('./scattergl'),
-    require('./pointcloud'),
-    require('./heatmapgl'),
-    require('./contourgl'),
-    require('./parcoords')
+  require('./scattergl'),
+  require('./pointcloud'),
+  require('./heatmapgl'),
+  require('./contourgl'),
+  require('./parcoords'),
 ]);
 
 module.exports = Plotly;

lib/index-gl3d.js

@@ -11,9 +11,9 @@
 var Plotly = require('./core');
 
 Plotly.register([
-    require('./scatter3d'),
-    require('./surface'),
-    require('./mesh3d')
+  require('./scatter3d'),
+  require('./surface'),
+  require('./mesh3d'),
 ]);
 
 module.exports = Plotly;

lib/index-mapbox.js

@@ -10,8 +10,6 @@
 
 var Plotly = require('./core');
 
-Plotly.register([
-    require('./scattermapbox')
-]);
+Plotly.register([require('./scattermapbox')]);
 
 module.exports = Plotly;

lib/index.js

@@ -12,36 +12,36 @@ var Plotly = require('./core');
 
 // traces
 Plotly.register([
-    require('./bar'),
-    require('./box'),
-    require('./heatmap'),
-    require('./histogram'),
-    require('./histogram2d'),
-    require('./histogram2dcontour'),
-    require('./pie'),
-    require('./contour'),
-    require('./scatterternary'),
-
-    require('./scatter3d'),
-    require('./surface'),
-    require('./mesh3d'),
-
-    require('./scattergeo'),
-    require('./choropleth'),
-
-    require('./scattergl'),
-    require('./pointcloud'),
-    require('./heatmapgl'),
-    require('./parcoords'),
-
-    require('./scattermapbox'),
-
-    require('./carpet'),
-    require('./scattercarpet'),
-    require('./contourcarpet'),
-
-    require('./ohlc'),
-    require('./candlestick')
+  require('./bar'),
+  require('./box'),
+  require('./heatmap'),
+  require('./histogram'),
+  require('./histogram2d'),
+  require('./histogram2dcontour'),
+  require('./pie'),
+  require('./contour'),
+  require('./scatterternary'),
+
+  require('./scatter3d'),
+  require('./surface'),
+  require('./mesh3d'),
+
+  require('./scattergeo'),
+  require('./choropleth'),
+
+  require('./scattergl'),
+  require('./pointcloud'),
+  require('./heatmapgl'),
+  require('./parcoords'),
+
+  require('./scattermapbox'),
+
+  require('./carpet'),
+  require('./scattercarpet'),
+  require('./contourcarpet'),
+
+  require('./ohlc'),
+  require('./candlestick'),
 ]);
 
 // transforms
@@ -54,14 +54,9 @@ Plotly.register([
 // For more info, see:
 // https://github.com/plotly/plotly.js/pull/978#pullrequestreview-2403353
 //
-Plotly.register([
-    require('./filter'),
-    require('./groupby')
-]);
+Plotly.register([require('./filter'), require('./groupby')]);
 
 // components
-Plotly.register([
-    require('./calendars')
-]);
+Plotly.register([require('./calendars')]);
 
 module.exports = Plotly;

package.json

@@ -22,14 +22,15 @@
   ],
   "scripts": {
     "preprocess": "node tasks/preprocess.js",
+    "precommit": "lint-staged",
     "bundle": "node tasks/bundle.js",
     "header": "node tasks/header.js",
     "stats": "node tasks/stats.js",
     "build": "npm run preprocess && npm run bundle && npm run header && npm run stats",
     "cibuild": "npm run preprocess && node tasks/cibundle.js",
     "watch": "node tasks/watch.js",
-    "lint": "eslint --version && eslint .",
-    "lint-fix": "eslint . --fix || true",
+    "lint": "prettier-check --single-quote --trailing-comma es5 \"{src,test,tasks,lib}/**/*.js\"",
+    "lint-fix": "prettier --single-quote --trailing-comma es5 --write \"{src,test,tasks,lib}/**/*.js\"",
     "docker": "node tasks/docker.js",
     "pretest": "node tasks/pretest.js",
     "test-jasmine": "karma start test/jasmine/karma.conf.js",
@@ -111,6 +112,7 @@
     "glob": "^7.0.0",
     "glslify": "^4.0.0",
     "gzip-size": "^3.0.0",
+    "husky": "^0.13.3",
     "image-size": "^0.5.1",
     "jasmine-core": "^2.4.1",
     "karma": "^1.5.0",
@@ -122,18 +124,27 @@
     "karma-jasmine-spec-tags": "^1.0.1",
     "karma-spec-reporter": "0.0.30",
     "karma-verbose-reporter": "0.0.6",
+    "lint-staged": "^3.4.0",
     "madge": "^1.6.0",
     "minimist": "^1.2.0",
     "node-sass": "^4.5.0",
     "npm-link-check": "^1.2.0",
     "open": "0.0.5",
     "prepend-file": "^1.3.1",
+    "prettier": "^1.2.2",
+    "prettier-check": "^1.0.0",
     "prettysize": "0.0.3",
     "read-last-lines": "^1.1.0",
     "requirejs": "^2.3.1",
     "through2": "^2.0.3",
     "uglify-js": "^2.8.12",
     "watchify": "^3.9.0",
     "xml2js": "^0.4.16"
+  },
+  "lint-staged": {
+    "{src,test,tasks,lib}/**/*.js": [
+      "prettier --single-quote --trailing-comma es5 --write \"{src,test,tasks,lib}/**/*.js\"",
+      "git add"
+    ]
   }
 }

src/assets/geo_assets.js

@@ -10,7 +10,6 @@
 
 var saneTopojson = require('sane-topojson');
 
-
 // package version injected by `npm run preprocess`
 exports.version = '1.26.1';