Fix: update eslint version and add import plugin to eslint configuration file

RyanCCollins · RyanCCollins · commit c11bc046c899 · 2017-02-05T21:28:42.000-05:00
Update grommet version
diff --git a/.eslintignore b/.eslintignore
@@ -1,3 +1,4 @@
 app/build/
 app/dist/
 webpack.config.*.js
+config/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -11,7 +11,7 @@ module.exports = {
   "settings": {
     "import/resolver": {
       "webpack": {
-        "config": "webpack.config.babel.js"
+        "config": "webpack.config.js"
       }
     }
   },
@@ -30,6 +30,7 @@ module.exports = {
     }]
   },
   "plugins": [
+    "import",
     "react",
     "graphql",
     "jsx-a11y"
diff --git a/.flowconfig b/.flowconfig
@@ -1,5 +1,6 @@
 [ignore]
 .*/node_modules/.*
+config/
 
 [include]
 ./app/src/
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,9 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+.env
+.vscode
+/server/public/**/*.js
+/server/public/**/*.css
+/server/public/**/*.map
+/server/public/**/*.json
diff --git a/app/src/components/About/index.js b/app/src/components/About/index.js
@@ -1,13 +1,13 @@
 import React, { PropTypes } from 'react';
-import Box from 'grommet-udacity/components/Box';
-import Paragraph from 'grommet-udacity/components/Paragraph';
-import Article from 'grommet-udacity/components/Article';
-import Heading from 'grommet-udacity/components/Heading';
-import Markdown from 'grommet-udacity/components/Markdown';
-import Section from 'grommet-udacity/components/Section';
-import List from 'grommet-udacity/components/List';
-import ListItem from 'grommet-udacity/components/ListItem';
-import Anchor from 'grommet-udacity/components/Anchor';
+import Box from 'grommet/components/Box';
+import Paragraph from 'grommet/components/Paragraph';
+import Article from 'grommet/components/Article';
+import Heading from 'grommet/components/Heading';
+import Markdown from 'grommet/components/Markdown';
+import Section from 'grommet/components/Section';
+import List from 'grommet/components/List';
+import ListItem from 'grommet/components/ListItem';
+import Anchor from 'grommet/components/Anchor';
 import { Divider } from 'components';
 import readme from './_readme.md';
 
diff --git a/app/src/components/AppFooter/index.js b/app/src/components/AppFooter/index.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import cssModules from 'react-css-modules';
-import Footer from 'grommet-udacity/components/Footer';
-import Box from 'grommet-udacity/components/Box';
-import Heading from 'grommet-udacity/components/Heading';
-import SocialShare from 'grommet-udacity/components/SocialShare';
-import Anchor from 'grommet-udacity/components/Anchor';
+import Footer from 'grommet/components/Footer';
+import Box from 'grommet/components/Box';
+import Heading from 'grommet/components/Heading';
+import SocialShare from 'grommet/components/SocialShare';
+import Anchor from 'grommet/components/Anchor';
 import styles from './index.module.scss';
 
 const AppFooter = () => (
diff --git a/app/src/components/Contributor/index.js b/app/src/components/Contributor/index.js
@@ -1,11 +1,11 @@
 import React, { PropTypes } from 'react';
 import { Avatar } from 'components';
 import cssModules from 'react-css-modules';
-import Heading from 'grommet-udacity/components/Heading';
-import Box from 'grommet-udacity/components/Box';
-import Paragraph from 'grommet-udacity/components/Paragraph';
-import Anchor from 'grommet-udacity/components/Anchor';
-import SocialGithubIcon from 'grommet-udacity/components/icons/base/SocialGithub';
+import Heading from 'grommet/components/Heading';
+import Box from 'grommet/components/Box';
+import Paragraph from 'grommet/components/Paragraph';
+import Anchor from 'grommet/components/Anchor';
+import SocialGithubIcon from 'grommet/components/icons/base/SocialGithub';
 import styles from './index.module.scss';
 
 const Contributor = ({
diff --git a/app/src/components/LoadingIndicator/index.js b/app/src/components/LoadingIndicator/index.js
@@ -1,9 +1,9 @@
 // @flow
 import React from 'react';
 import cssModules from 'react-css-modules';
-import Spinning from 'grommet-udacity/components/icons/Spinning';
-import Box from 'grommet-udacity/components/Box';
-import Heading from 'grommet-udacity/components/Heading';
+import Spinning from 'grommet/components/icons/Spinning';
+import Box from 'grommet/components/Box';
+import Heading from 'grommet/components/Heading';
 import styles from './index.module.scss';
 
 function LoadingIndicator(props: {
diff --git a/app/src/components/Navbar/index.js b/app/src/components/Navbar/index.js
@@ -1,9 +1,9 @@
 // @flow
 import React from 'react';
-import Header from 'grommet-udacity/components/Header';
-import Title from 'grommet-udacity/components/Title';
-import Anchor from 'grommet-udacity/components/Anchor';
-import Search from 'grommet-udacity/components/Search';
+import Header from 'grommet/components/Header';
+import Title from 'grommet/components/Title';
+import Anchor from 'grommet/components/Anchor';
+import Search from 'grommet/components/Search';
 import LogoImage from './logo.png';
 import { StyledMenu, StyledLogo, LogoPlaceholder } from './styles';
 
diff --git a/app/src/components/Navbar/styles.js b/app/src/components/Navbar/styles.js
@@ -1,5 +1,5 @@
 import styled from 'styled-components';
-import Menu from 'grommet-udacity/components/Menu';
+import Menu from 'grommet/components/Menu';
 
 export const StyledMenu = styled(Menu)`
   flex-direction: row !important;
diff --git a/app/src/components/WelcomeModal/index.js b/app/src/components/WelcomeModal/index.js
@@ -1,12 +1,12 @@
 import React, { PropTypes } from 'react';
-import Layer from 'grommet-udacity/components/Layer';
-import Form from 'grommet-udacity/components/Form';
-import FormFields from 'grommet-udacity/components/FormFields';
-import FormField from 'grommet-udacity/components/FormField';
-import Box from 'grommet-udacity/components/Box';
-import Heading from 'grommet-udacity/components/Heading';
-import Button from 'grommet-udacity/components/Button';
-import Footer from 'grommet-udacity/components/Footer';
+import Layer from 'grommet/components/Layer';
+import Form from 'grommet/components/Form';
+import FormFields from 'grommet/components/FormFields';
+import FormField from 'grommet/components/FormField';
+import Box from 'grommet/components/Box';
+import Heading from 'grommet/components/Heading';
+import Button from 'grommet/components/Button';
+import Footer from 'grommet/components/Footer';
 import { Divider } from 'components';
 import error from './utils/error';
 
diff --git a/app/src/containers/AboutContainer/index.js b/app/src/containers/AboutContainer/index.js
@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
-import Box from 'grommet-udacity/components/Box';
-import Section from 'grommet-udacity/components/Section';
-import Headline from 'grommet-udacity/components/Headline';
-import { Divider, About } from 'components'; // eslint-disable-line
+import Box from 'grommet/components/Box';
+import Section from 'grommet/components/Section';
+import Headline from 'grommet/components/Headline';
+import { Divider, About } from 'components';
 import links from './data';
 
 class AboutContainer extends Component { // eslint-disable-line react/prefer-stateless-function
diff --git a/app/src/containers/AppContainer/index.js b/app/src/containers/AppContainer/index.js
@@ -1,7 +1,7 @@
 import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import App from 'grommet-udacity/components/App';
+import App from 'grommet/components/App';
 import { AppContainer as ReactHotLoader } from 'react-hot-loader';
 import { Navbar, AppFooter } from 'components';
 import * as AppContainerActionCreators from './actions';
diff --git a/app/src/containers/LandingContainer/index.js b/app/src/containers/LandingContainer/index.js
@@ -2,14 +2,14 @@ import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import cssModules from 'react-css-modules';
-import Box from 'grommet-udacity/components/Box';
-import Section from 'grommet-udacity/components/Section';
-import Hero from 'grommet-udacity/components/Hero';
-import Headline from 'grommet-udacity/components/Headline';
-import Footer from 'grommet-udacity/components/Footer';
-import Button from 'grommet-udacity/components/Button';
-import Heading from 'grommet-udacity/components/Heading';
-import Columns from 'grommet-udacity/components/Columns';
+import Box from 'grommet/components/Box';
+import Section from 'grommet/components/Section';
+import Hero from 'grommet/components/Hero';
+import Headline from 'grommet/components/Headline';
+import Footer from 'grommet/components/Footer';
+import Button from 'grommet/components/Button';
+import Heading from 'grommet/components/Heading';
+import Columns from 'grommet/components/Columns';
 import {
   LoadingIndicator,
   Divider,
diff --git a/config/flow-typed/npm/grommet-udacity_v0.1.12.js b/config/flow-typed/npm/grommet-udacity_v0.1.12.js
diff --git a/config/flow-typed/npm/grommet_vx.x.x.js b/config/flow-typed/npm/grommet_vx.x.x.js
diff --git a/package.json b/package.json
diff --git a/webpack.config.js b/webpack.config.js
diff --git a/yarn.lock b/yarn.lock
