feat: update eslint

ruanyf · Jan 7, 2017 · f5f7251 · f5f7251
1 parent 25a094e
commit f5f7251
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 75 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -5,8 +5,12 @@
     "browser": true,
     "node": true
   },
-  "ecmaFeatures": {
-    "jsx": true
+  "parserOptions": {
+     "ecmaVersion": 6,
+     "sourceType": "module",
+     "ecmaFeatures": {
+       "jsx": true
+     }
   },
   "globals": {
     "window": true,

diff --git a/.gitignore b/.gitignore
@@ -30,12 +30,11 @@ coverage
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
+
+## building output directory
 build
 
 # OSX

diff --git a/webpack.config.js b/webpack.config.js
@@ -17,7 +17,7 @@ module.exports = {
     path.resolve(__dirname, 'app/main.jsx')
   ],
   output: {
-    path: `${__dirname}/build`,
+    path: path.resolve(__dirname, 'build'),
     publicPath: '/',
     filename: './bundle.js'
   },

diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -10,7 +10,7 @@ module.exports = {
     path.resolve(__dirname, 'app/main.jsx')
   ],
   output: {
-    path: `${__dirname}/build`,
+    path: path.resolve(__dirname, 'build'),
     publicPath: '/',
     filename: './bundle.js'
   },