Enable lint outside of src, fix other issues

zpao · zpao · commit 251b30b26865 · 2015-09-22T14:47:14.000-07:00
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+dist/
diff --git a/index.jsx b/index.jsx
@@ -29,11 +29,11 @@ Presentation.contextTypes = {
   router: React.PropTypes.object
 };
 
-Presentation = context(Presentation, {styles: config.theme, print: config.print, flux});
+const PresentationContext = context(Presentation, {styles: config.theme, print: config.print, flux});
 
 React.render(
   <Router history={new HashHistory()}>
-    <Route path="/" component={Presentation} />
-    <Route path="/:slide" component={Presentation} />
+    <Route path="/" component={PresentationContext} />
+    <Route path="/:slide" component={PresentationContext} />
   </Router>
 , document.body);
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "webpack-dev-server",
-    "lint": "eslint --ext .js,.jsx src",
+    "lint": "eslint --ext .js,.jsx .",
     "build": "webpack",
     "deploy": "npm run build && surge -p ./dist"
   },
diff --git a/presentation/deck.jsx b/presentation/deck.jsx
@@ -36,13 +36,13 @@ export default class extends React.Component {
           </Link>
           <Text textSize="1.5em" margin="20px 0px 0px" bold>Hit Your Right Arrow To Begin!</Text>
         </Slide>
-        <Slide transition={['slide']} bgColor="black" notes="You can even put notes on your slide. How awesome is that?">
-          <Image src={images.kat.replace('/','')} margin="0px auto 40px" height="293px"/>
+        <Slide transition={["slide"]} bgColor="black" notes="You can even put notes on your slide. How awesome is that?">
+          <Image src={images.kat.replace("/", "")} margin="0px auto 40px" height="293px"/>
           <Heading size={1} fit textColor="primary" textFont="secondary">
             Wait what?
           </Heading>
         </Slide>
-        <Slide transition={['zoom', 'fade']} bgColor="primary" notes="<ul><li>talk about that</li><li>and that</li></ul>">
+        <Slide transition={["zoom", "fade"]} bgColor="primary" notes="<ul><li>talk about that</li><li>and that</li></ul>">
           <CodePane
             lang="javascript"
             source={require("raw!./deck.example")}
diff --git a/themes/default/html.js b/themes/default/html.js
@@ -1,21 +1,21 @@
-module.exports = function(data) {
+module.exports = function (data) {
   return {
-    '200.html': data.defaultTemplate(),
-    'index.html': [
-      '<!doctype html>',
-        '<html>',
-          '<head>',
-            '<meta charset="utf-8"/>',
-            '<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>',
-            '<link href="http://fonts.googleapis.com/css?family=Lobster+Two:400,700" rel="stylesheet" type="text/css">',
-            '<link href="http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700" rel="stylesheet" type="text/css">',
-            '<link href="' + data.css + '" rel="stylesheet" type="text/css" />',
-          '</head>',
-          '<body>',
-            '<div id="root"></div>',
-            '<script src="' + data.main + '"></script>',
-          '</body>',
-        '</html>'
-    ].join('')
-  }
-}
+    "200.html": data.defaultTemplate(),
+    "index.html": [
+      "<!doctype html>",
+      "<html>",
+      "<head>",
+      "<meta charset=\"utf-8\"/>",
+      "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\"/>",
+      "<link href=\"http://fonts.googleapis.com/css?family=Lobster+Two:400,700\" rel=\"stylesheet\" type=\"text/css\">",
+      "<link href=\"http://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700\" rel=\"stylesheet\" type=\"text/css\">",
+      "<link href=\"" + data.css + "\" rel=\"stylesheet\" type=\"text/css\" />",
+      "</head>",
+      "<body>",
+      "<div id=\"root\"></div>",
+      "<script src=\"" + data.main + "\"></script>",
+      "</body>",
+      "</html>"
+    ].join("")
+  };
+};
diff --git a/themes/default/index.js b/themes/default/index.js
@@ -11,8 +11,8 @@ const fonts = {
 };
 
 module.exports = {
-  colors: colors,
-  fonts: fonts,
+  colors,
+  fonts,
   global: {
     body: {
       background: colors.primary,
@@ -80,15 +80,15 @@ module.exports = {
     bar: {
       container: {
         position: "absolute",
-        height: '10px',
-        width: '100%',
+        height: "10px",
+        width: "100%",
         bottom: 0,
         left: 0,
         transition: "all 1s ease-in-out 0.2s",
         zIndex: 1000
       },
       bar: {
-        height: '100%',
+        height: "100%",
         background: colors.tertiary,
         transition: "all 0.3s ease-out"
       }
diff --git a/themes/default/print.js b/themes/default/print.js
@@ -11,8 +11,8 @@ const fonts = {
 };
 
 module.exports = {
-  colors: colors,
-  fonts: fonts,
+  colors,
+  fonts,
   global: {
     body: {
       background: "white",
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,9 +1,10 @@
-var getConfig = require('hjs-webpack')
-var config = require('./presentation/config');
+/*eslint-disable no-var*/
+var getConfig = require("hjs-webpack");
+var config = require("./presentation/config");
 
 var webpackConfig = getConfig({
-  in: './index.jsx',
-  out: 'dist',
+  in: "./index.jsx",
+  out: "dist",
   clearBeforeBuild: true,
   html: config.html
 });
@@ -12,12 +13,12 @@ webpackConfig.module.loaders[0] = {
   test: /(\.js$)|(\.jsx$)/,
   exclude: /node_modules/,
   loaders: [
-    'babel-loader?stage=1'
+    "babel-loader?stage=1"
   ]
-}
+};
 
-if (process.argv[1].indexOf('webpack-dev-server') !== -1) {
-  webpackConfig.module.loaders[0].loaders.unshift('react-hot')
+if (process.argv[1].indexOf("webpack-dev-server") !== -1) {
+  webpackConfig.module.loaders[0].loaders.unshift("react-hot");
 }
 
-module.exports = webpackConfig;
+module.exports = webpackConfig;
