Merge pull request #14 from Graham42/update_lint_config

More prettier things.

.eslintrc

@@ -112,7 +112,6 @@
     "no-plusplus": 0
   },
   "plugins": [
-    "prettier",
     "react"
   ],
   "extends": ["plugin:react/recommended"]

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 node_modules
 bower_components
+dist/
 npm-debug.log

.prettierignore

@@ -0,0 +1,6 @@
+node_modules/
+bower_components/
+dist/
+package-lock.json
+# npm install will reformat package.json which can conflict with prettier
+package.json

app/styles/index.less

@@ -56,10 +56,8 @@ footer {
   .form-control:focus {
     border-color: #e0e0e0;
     outline: 0;
-    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-      0 0 8px rgba(102, 175, 233, 0.6);
-    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
-      0 0 8px rgba(224, 224, 224, 0.6);
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(224, 224, 224, 0.6);
   }
 
   .btn,
@@ -231,8 +229,7 @@ li.modeNavItem.active a {
 }
 
 .transition {
-  transition: max-height 0.4s ease, height 0.4s ease, margin 0.4s ease,
-    opacity 0.75s ease;
+  transition: max-height 0.4s ease, height 0.4s ease, margin 0.4s ease, opacity 0.75s ease;
   opacity: 1;
   overflow: hidden;
 }

karma.conf.js

@@ -20,18 +20,18 @@ module.exports = function(config) {
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
       // add webpack as preprocessor
-      "scripts/spec/*.js": ["webpack", "sourcemap"]
+      "scripts/spec/*.js": ["webpack", "sourcemap"],
     },
 
     webpack: {
       devtool: "inline-source-map",
-      module: webpackConfig.module
+      module: webpackConfig.module,
     },
 
     webpackMiddleware: {
       // webpack-dev-middleware configuration
       // i. e.
-      noInfo: true
+      noInfo: true,
     },
 
     // test results reporter to use
@@ -58,6 +58,6 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false
+    singleRun: false,
   });
 };

package.json

@@ -40,7 +40,6 @@
     "babel-preset-stage-0": "^6.3.13",
     "css-loader": "^0.23.1",
     "eslint": "^3.14.1",
-    "eslint-plugin-prettier": "^2.3.1",
     "eslint-plugin-react": "^7.4.0",
     "font-awesome-webpack": "0.0.4",
     "jasmine-core": "^2.4.1",
@@ -66,10 +65,9 @@
   },
   "scripts": {
     "start": "node server.js",
-    "build":
-      "BABEL_ENV=production ./node_modules/.bin/webpack --config webpack.config.production.js && node pre-render.js",
-    "lint": "./node_modules/.bin/eslint .",
-    "test": "node_modules/karma/bin/karma start --single-run --browsers PhantomJS",
-    "pretty": "node_modules/.bin/prettier --write --config .prettierrc \"app/scripts/**/*.js\""
+    "build": "BABEL_ENV=production webpack --config webpack.config.production.js && node pre-render.js",
+    "lint": "eslint . && prettier --list-different '**/*.{js,jsx,ts,css,less,scss,json}'",
+    "test": "karma start --single-run --browsers PhantomJS",
+    "pretty": "prettier --write '**/*.{js,jsx,ts,css,less,scss,json}'"
   }
 }

server.js

@@ -8,7 +8,7 @@ new WebpackDevServer(webpack(config), {
   publicPath: config.output.publicPath,
   contentBase: "./app/",
   hot: true,
-  historyApiFallback: true
+  historyApiFallback: true,
 }).listen(port, "localhost", function(err) {
   if (err) {
     console.log(err);

webpack.config.js

@@ -47,17 +47,21 @@ var port = 1234;
 
 module.exports = {
   port: port,
-  entry: ["webpack-dev-server/client?http://localhost:" + port, "webpack/hot/dev-server", "./app/scripts/index.js"],
+  entry: [
+    "webpack-dev-server/client?http://localhost:" + port,
+    "webpack/hot/dev-server",
+    "./app/scripts/index.js",
+  ],
   output: {
     path: path.resolve(__dirname, "build"),
     filename: "bundle.js",
-    publicPath: "/"
+    publicPath: "/",
   },
   resolve: {
-    extensions: ["", ".js"]
+    extensions: ["", ".js"],
   },
   resolveLoader: {
-    root: path.join(__dirname, "node_modules")
+    root: path.join(__dirname, "node_modules"),
   },
   devtool: "inline-source-map",
   plugins: [new webpack.HotModuleReplacementPlugin(), new webpack.NoErrorsPlugin()],
@@ -66,21 +70,21 @@ module.exports = {
       {
         test: /\.jsx?$/,
         loaders: ["babel"],
-        include: path.join(__dirname, "app", "scripts")
+        include: path.join(__dirname, "app", "scripts"),
       },
       {
         test: /\.less$/,
-        loader: "style!css!less"
+        loader: "style!css!less",
       },
       {
         test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "url-loader?limit=10000&minetype=application/font-woff"
+        loader: "url-loader?limit=10000&minetype=application/font-woff",
       },
       {
         test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "file-loader"
+        loader: "file-loader",
       },
-      { test: /\.html/, loader: "file?name=[name].[ext]" }
-    ]
-  }
+      { test: /\.html/, loader: "file?name=[name].[ext]" },
+    ],
+  },
 };

webpack.config.production.js

@@ -47,45 +47,45 @@ module.exports = {
   output: {
     path: path.join(__dirname, "dist/Piano-Trainer"),
     filename: "bundle.js",
-    publicPath: "./"
+    publicPath: "./",
   },
   resolve: {
-    extensions: ["", ".js"]
+    extensions: ["", ".js"],
   },
   resolveLoader: {
-    root: path.join(__dirname, "node_modules")
+    root: path.join(__dirname, "node_modules"),
   },
   devtool: "source-map",
   plugins: [
     new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.DefinePlugin({
       "process.env": {
-        NODE_ENV: JSON.stringify("production")
-      }
+        NODE_ENV: JSON.stringify("production"),
+      },
     }),
     new webpack.optimize.UglifyJsPlugin({
       compress: {
-        warnings: false
-      }
-    })
+        warnings: false,
+      },
+    }),
   ],
   module: {
     loaders: [
       {
         test: /\.jsx?$/,
         loaders: ["babel"],
-        include: path.join(__dirname, "app", "scripts")
+        include: path.join(__dirname, "app", "scripts"),
       },
       {
         test: /\.less$/,
-        loader: "style!css!less"
+        loader: "style!css!less",
       },
       {
         test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/,
-        loader: "url-loader?limit=10000&minetype=application/font-woff"
+        loader: "url-loader?limit=10000&minetype=application/font-woff",
       },
       { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader" },
-      { test: /\.html/, loader: "file?name=[name].[ext]" }
-    ]
-  }
+      { test: /\.html/, loader: "file?name=[name].[ext]" },
+    ],
+  },
 };