Merge pull request #9 from enigma-platform/eslint-ignore-node-modules

Various updates
enigma-io · Apr 18, 2016 · a9b6cf0 · a9b6cf0
2 parents 2e99532 + c1b4fff
commit a9b6cf0
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 10 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -86,13 +86,14 @@ module.exports = yeoman.Base.extend({
         mkdirp('dist/assets');
 
         copier([
+            ['_eslintignore', '.eslintignore'],
             ['_eslintrc', '.eslintrc'],
             ['_gitignore', '.gitignore'],
             '_sanitize.styl',
             'CONTRIBUTING.md',
             'example/index.js',
             'example/style.styl',
-            'example/__tests__/unit.js',
+            'example/__tests__/index.js',
             'index.js',
             'jest.setup.js',
             'parallelize.sh',

diff --git a/generators/app/templates/_eslintignore b/generators/app/templates/_eslintignore
@@ -0,0 +1 @@
+node_modules/
diff --git a/generators/app/templates/_gitignore b/generators/app/templates/_gitignore
@@ -1,6 +1,37 @@
-npm-debug.log
-.DS_Store
-node_modules/
-.sass-cache/
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
 
-coverage/
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules
+jspm_packages
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
+# OS X folder metadata
+.DS_Store
diff --git a/...s/app/templates/example/__tests__/unit.js → .../app/templates/example/__tests__/index.js b/...s/app/templates/example/__tests__/unit.js → .../app/templates/example/__tests__/index.js
diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
@@ -8,8 +8,8 @@
     "email": "<%= authorEmail %>"
   },
   "dependencies": {
-    "react": "^0.14.7",
-    "react-dom": "^0.14.7"
+    "react": "^15.0.0",
+    "react-dom": "^15.0.0"
   },
   "devDependencies": {
     "autoprefixer-stylus": "^0.9.2",
@@ -21,8 +21,8 @@
     "babelify": "^7.2.0",
     "browserify": "^13.0.0",
     "budo": "^8.1.0",
+    "eslint": "^2.7.0",
     "eslint-plugin-react": "^4.2.3",
-    "eslintify": "^2.0.0",
     "jest-cli": "^0.9.2",
     "stylus": "^0.54.2",
     "uglify-js": "^2.6.2",
@@ -50,7 +50,7 @@
     "build": "npm run js && npm run css",
     "release": "npm run css:release && npm run html:release && npm run js:release",
     "start": "sh parallelize.sh \"npm run css:watch\" \"npm run js:watch\"",
-    "lint": "browserify index.js -t eslintify -t babelify --colors > /dev/null",
+    "lint": "eslint --quiet *.js **/*.js",
     "test": "jest --verbose",
     "coverage": "jest --coverage"
   }