Merge pull request #45 from netlify/fix-lint

bcomnes · web-flow · commit b0bb0e9285d0 · 2017-09-07T10:17:57.000-07:00
Fix lint/format
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,19 +1,12 @@
 {
   "parser": "babel-eslint",
   "extends": "eslint:recommended",
-  "plugins": ["react"],
+  "plugins": ["react", "prettier"],
   "env": {
     "browser": true,
     "node": true,
-    "mocha": true,
     "es6": true
   },
-  "parserOptions": {
-    "ecmaFeatures": {
-      "modules": true,
-      "jsx": true
-    }
-  },
   "settings": {
     "react": {
       "pragma": "h"
@@ -22,63 +15,18 @@
   "extends": [
     "plugin:import/errors",
     "plugin:import/warnings",
-    "eslint:recommended"
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "prettier"
   ],
   "globals": {
     "sleep": 1
   },
   "rules": {
-    "react/jsx-no-bind": [2, { "ignoreRefs": true }],
-    "react/jsx-no-duplicate-props": 2,
-    "react/jsx-closing-bracket-location": [2, "after-props"],
-    "react/self-closing-comp": 2,
-    "react/prefer-es6-class": 2,
-    "react/no-string-refs": 2,
-    "react/require-render-return": 2,
-    "react/no-find-dom-node": 2,
-    "react/no-is-mounted": 2,
-    "react/jsx-no-comment-textnodes": 2,
-    "react/jsx-curly-spacing": 2,
-    "react/jsx-no-undef": 2,
-    "react/jsx-uses-react": 2,
-    "react/jsx-uses-vars": 2,
-    "no-empty": 0,
-    "no-console": 0,
-    "no-empty-pattern": 0,
-    "no-cond-assign": 1,
-    "semi": 2,
-    "camelcase": 0,
-    "comma-style": 2,
-    "comma-dangle": [2, "never"],
-    "indent": [2, 2, { "SwitchCase": 1 }],
-    "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
-    "no-trailing-spaces": [2, { "skipBlankLines": true }],
-    "max-nested-callbacks": [2, 3],
-    "no-eval": 2,
-    "no-implied-eval": 2,
-    "no-new-func": 2,
-    "guard-for-in": 0,
-    "eqeqeq": 1,
-    "no-else-return": 2,
-    "no-redeclare": 2,
-    "no-dupe-keys": 2,
-    "radix": 2,
-    "strict": [2, "never"],
-    "no-shadow": 0,
-    "no-delete-var": 2,
-    "no-undef-init": 2,
-    "no-shadow-restricted-names": 2,
-    "handle-callback-err": 0,
-    "no-lonely-if": 2,
-    "keyword-spacing": 2,
-    "constructor-super": 2,
-    "no-this-before-super": 2,
-    "no-dupe-class-members": 2,
-    "no-const-assign": 2,
-    "prefer-spread": 2,
-    "no-useless-concat": 2,
-    "no-var": 2,
-    "object-shorthand": 2,
-    "prefer-arrow-callback": 0
+    "prettier/prettier": "error",
+    "react/prop-types": 0,
+    "react/no-unknown-property": 0,
+    "react/no-unescaped-entities": 0,
+    "no-console": ["warn", { "allow": ["warn", "error"] }]
   }
 }
diff --git a/package.json b/package.json
@@ -4,20 +4,23 @@
   "description": "Netlify Identity widget for easy integration",
   "releaseVersion": "v1",
   "scripts": {
-    "dev":
-      "cross-env NODE_ENV=development webpack-dev-server --inline --hot --progress",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server --inline --hot --progress",
     "start": "serve build -s -c 1",
     "prestart": "npm run build",
     "build": "cross-env NODE_ENV=production webpack --progress",
     "prebuild": "mkdirp build",
     "test": "npm run -s lint",
     "lint": "eslint src test",
     "release": "node ./script/release.js",
-    "format": "prettier-eslint --write 'src/**/*.js'",
-    "format-preview": "prettier-eslint --list-different 'src/**/*.js'"
+    "format": "prettier --write 'src/**/*.js'",
+    "format-preview": "prettier --list-different 'src/**/*.js'"
   },
   "main": "./releases/v1/netlify-identity",
-  "keywords": ["netlify", "identity", "authentication"],
+  "keywords": [
+    "netlify",
+    "identity",
+    "authentication"
+  ],
   "license": "MIT",
   "author": "Matt Biilmann <matt@netlify.com>",
   "devDependencies": {
@@ -34,16 +37,16 @@
     "cross-env": "^5.0.1",
     "css-loader": "^0.28.0",
     "eslint": "^4.1.0",
+    "eslint-config-prettier": "^2.4.0",
     "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-prettier": "^2.2.0",
     "eslint-plugin-react": "^7.0.0",
     "file-loader": "^0.11.1",
     "html-webpack-plugin": "^2.28.0",
     "json-loader": "^0.5.4",
     "mkdirp": "^0.5.1",
     "postcss-loader": "^2.0.3",
     "prettier": "^1.6.1",
-    "prettier-eslint": "^7.1.0",
-    "prettier-eslint-cli": "^4.3.0",
     "raw-loader": "^0.5.1",
     "source-map-loader": "^0.2.1",
     "url-loader": "^0.5.8",
diff --git a/src/components/app.js b/src/components/app.js
@@ -98,7 +98,8 @@ class App extends Component {
         <LogoutForm
           user={store.user}
           saving={store.saving}
-          onLogout={this.handleLogout}/>
+          onLogout={this.handleLogout}
+        />
       );
     }
     if (store.modal.page === "signup" && store.settings.disable_signup) {
@@ -110,7 +111,8 @@ class App extends Component {
         page={pages[store.modal.page] || {}}
         message={store.message}
         saving={store.saving}
-        onSubmit={this.handleUser}/>
+        onSubmit={this.handleUser}
+      />
     );
   }
 
@@ -156,18 +158,20 @@ class App extends Component {
           loading={store.gotrue && !store.settings}
           isOpen={store.modal.isOpen}
           onPage={this.handlePage}
-          onClose={this.handleClose}>
+          onClose={this.handleClose}
+        >
           {this.renderBody()}
           {this.renderProviders()}
           {!store.user &&
           page.link &&
           store.gotrue && (
-              <button
-                onclick={pageLinkHandler}
-                className="btnLink forgotPasswordLink">
-                {page.link_text}
-              </button>
-            )}
+            <button
+              onclick={pageLinkHandler}
+              className="btnLink forgotPasswordLink"
+            >
+              {page.link_text}
+            </button>
+          )}
         </Modal>
       </div>
     );
diff --git a/src/components/controls.js b/src/components/controls.js
@@ -31,7 +31,8 @@ class Controls extends Component {
         <a
           className="netlify-identity-button"
           href="#"
-          onClick={this.handleButton}>
+          onClick={this.handleButton}
+        >
           {this.props.text || (user ? "Log out" : "Log in")}
         </a>
       );
@@ -50,7 +51,8 @@ class Controls extends Component {
             <a
               className="netlify-identity-logout"
               href="#"
-              onClick={this.handleLogout}>
+              onClick={this.handleLogout}
+            >
               Log out
             </a>
           </li>
@@ -64,15 +66,17 @@ class Controls extends Component {
           <a
             className="netlify-identity-signup"
             href="#"
-            onClick={this.handleSignup}>
+            onClick={this.handleSignup}
+          >
             Sign up
           </a>
         </li>
         <li className="netlify-identity-item">
           <a
             className="netlify-identity-login"
             href="#"
-            onClick={this.handleLogin}>
+            onClick={this.handleLogin}
+          >
             Log in
           </a>
         </li>
diff --git a/src/components/forms/logout.js b/src/components/forms/logout.js
@@ -12,7 +12,8 @@ export default class LogoutForm extends Component {
     return (
       <form
         onSubmit={this.handleLogout}
-        className={`form ${saving ? "disabled" : ""}`}>
+        className={`form ${saving ? "disabled" : ""}`}
+      >
         <p className="infoText">
           Logged in as <br />
           <span className="infoTextEmail">
diff --git a/src/components/forms/providers.js b/src/components/forms/providers.js
@@ -12,7 +12,8 @@ class Provider extends Component {
     return (
       <button
         onClick={this.handleLogin}
-        className={`provider${provider} btn btnProvider`}>
+        className={`provider${provider} btn btnProvider`}
+      >
         Continue with {provider}
       </button>
     );
diff --git a/src/components/forms/siteurl.js b/src/components/forms/siteurl.js
@@ -36,7 +36,8 @@ export default class SiteURLForm extends Component {
               placeholder="URL of your Netlify site"
               autocapitalize="off"
               required
-              oninput={this.handleInput}/>
+              oninput={this.handleInput}
+            />
             <div className="inputFieldIcon inputFieldUrl" />
           </label>
         </div>
diff --git a/src/components/forms/user.js b/src/components/forms/user.js
@@ -24,7 +24,8 @@ export default class UserForm extends Component {
     return (
       <form
         onsubmit={this.handleLogin}
-        className={`form ${saving ? "disabled" : ""}`}>
+        className={`form ${saving ? "disabled" : ""}`}
+      >
         {message && <Message type={message} />}
         {page.name && (
           <div className="formGroup">
@@ -38,7 +39,8 @@ export default class UserForm extends Component {
                 placeholder="Name"
                 autocapitalize="off"
                 required
-                oninput={this.handleInput}/>
+                oninput={this.handleInput}
+              />
               <div className="inputFieldIcon inputFieldEmail" />
             </label>
           </div>
@@ -55,7 +57,8 @@ export default class UserForm extends Component {
                 placeholder="Email"
                 autocapitalize="off"
                 required
-                oninput={this.handleInput}/>
+                oninput={this.handleInput}
+              />
               <div className="inputFieldIcon inputFieldEmail" />
             </label>
           </div>
@@ -71,15 +74,17 @@ export default class UserForm extends Component {
                 value={password}
                 placeholder="Password"
                 required
-                oninput={this.handleInput}/>
+                oninput={this.handleInput}
+              />
               <div className="inputFieldIcon inputFieldPassword" />
             </label>
           </div>
         )}
         <Button
           saving={saving}
           text={page.button}
-          saving_text={page.button_saving}/>
+          saving_text={page.button_saving}
+        />
       </form>
     );
   }
diff --git a/src/components/modal/index.js b/src/components/modal/index.js
@@ -40,10 +40,12 @@ export default class Modal extends Component {
         className="modalContainer"
         role="dialog"
         aria-hidden={`${hidden}`}
-        onClick={this.handleClose}>
+        onClick={this.handleClose}
+      >
         <div
           className={`modalDialog${loading ? " visuallyHidden" : ""}`}
-          onClick={this.blockEvent}>
+          onClick={this.blockEvent}
+        >
           <div className="modalContent">
             <button onclick={this.handleClose} className="btn btnClose">
               <span className="visuallyHidden">Close</span>
@@ -53,14 +55,16 @@ export default class Modal extends Component {
                 {showSignup && (
                   <button
                     className={`btn btnHeader ${page.signup ? "active" : ""}`}
-                    onclick={this.linkHandler("signup")}>
+                    onclick={this.linkHandler("signup")}
+                  >
                     Sign up
                   </button>
                 )}
                 {!devSettings && (
                   <button
                     className={`btn btnHeader ${page.login ? "active" : ""}`}
-                    onclick={this.linkHandler("login")}>
+                    onclick={this.linkHandler("login")}
+                  >
                     Log in
                   </button>
                 )}
@@ -88,7 +92,8 @@ export default class Modal extends Component {
         </div>
         <a
           href="https://www.netlify.com"
-          className={`callOut${loading ? " visuallyHidden" : ""}`}>
+          className={`callOut${loading ? " visuallyHidden" : ""}`}
+        >
           <span className="netlifyLogo" />
           Coded by Netlify
         </a>
