Merge branch 'master' into feature/coffeescript

Author: taylorzane

.eslintrc

@@ -4,7 +4,7 @@
     "node": true
   },
 
-  "rules": {
+ "rules": {
     "accessor-pairs": 2,
     "array-bracket-spacing": 0,
     "block-scoped-var": 0,
@@ -26,29 +26,21 @@
     "eqeqeq": [2, "allow-null"],
     "func-names": 0,
     "func-style": 0,
-    "generator-star": 0,
     "generator-star-spacing": [2, { "before": true, "after": true }],
-    "global-strict": 0,
     "guard-for-in": 0,
     "handle-callback-err": [2, "^(err|error)$" ],
-    "indent": [2, 2],
+    "indent": [2, 2, { "SwitchCase": 1 }],
     "key-spacing": [2, { "beforeColon": false, "afterColon": true }],
     "linebreak-style": 0,
     "lines-around-comment": 0,
-    "max-depth": 0,
-    "max-len": 0,
     "max-nested-callbacks": 0,
-    "max-params": 0,
-    "max-statements": 0,
     "new-cap": [2, { "newIsCap": true, "capIsNew": false }],
     "new-parens": 2,
     "newline-after-var": 0,
     "no-alert": 0,
     "no-array-constructor": 2,
-    "no-bitwise": 0,
     "no-caller": 2,
     "no-catch-shadow": 0,
-    "no-comma-dangle": 0,
     "no-cond-assign": 2,
     "no-console": 0,
     "no-constant-condition": 0,
@@ -63,7 +55,6 @@
     "no-else-return": 0,
     "no-empty": 0,
     "no-empty-character-class": 2,
-    "no-empty-class": 0,
     "no-empty-label": 2,
     "no-eq-null": 0,
     "no-eval": 2,
@@ -73,7 +64,6 @@
     "no-extra-boolean-cast": 2,
     "no-extra-parens": 0,
     "no-extra-semi": 0,
-    "no-extra-strict": 0,
     "no-fallthrough": 2,
     "no-floating-decimal": 2,
     "no-func-assign": 2,
@@ -106,21 +96,18 @@
     "no-octal-escape": 2,
     "no-param-reassign": 0,
     "no-path-concat": 0,
-    "no-plusplus": 0,
     "no-process-env": 0,
     "no-process-exit": 0,
     "no-proto": 0,
     "no-redeclare": 2,
     "no-regex-spaces": 2,
-    "no-reserved-keys": 0,
     "no-restricted-modules": 0,
     "no-return-assign": 2,
     "no-script-url": 0,
     "no-self-compare": 2,
     "no-sequences": 2,
     "no-shadow": 0,
     "no-shadow-restricted-names": 2,
-    "no-space-before-semi": 0,
     "no-spaced-func": 2,
     "no-sparse-arrays": 2,
     "no-sync": 0,
@@ -155,18 +142,14 @@
     "semi": [2, "never"],
     "semi-spacing": 0,
     "sort-vars": 0,
-    "space-after-function-name": 0,
     "space-after-keywords": [2, "always"],
     "space-before-blocks": [2, "always"],
     "space-before-function-paren": [2, "always"],
-    "space-before-function-parentheses": 0,
-    "space-in-brackets": 0,
     "space-in-parens": [2, "never"],
     "space-infix-ops": 2,
     "space-return-throw-case": 2,
     "space-unary-ops": [2, { "words": true, "nonwords": false }],
     "spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
-    "spaced-line-comment": 0,
     "strict": 0,
     "use-isnan": 2,
     "valid-jsdoc": 0,

lib/loader.js

@@ -94,25 +94,25 @@ module.exports = function (content) {
     } else {
       // unknown lang, assume a loader for it is used
       switch (type) {
-      case 'template':
-        return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
-      case 'style':
-        return 'style!css!' + rewriter + lang + '!'
-      case 'script':
-        return lang + '!'
+        case 'template':
+          return 'vue-html!' + rewriter + 'template-html?raw&engine=' + lang + '!'
+        case 'style':
+          return 'style!css!' + rewriter + lang + '!'
+        case 'script':
+          return lang + '!'
       }
     }
   }
 
   function getRewriter (type, scoped) {
     var meta = '?id=' + moduleId + '&file=' + fileName
     switch (type) {
-    case 'template':
-      return scoped ? (rewriters.template + meta + '!') : ''
-    case 'style':
-      return rewriters.style + meta + (scoped ? '&scoped=true!' : '!')
-    default:
-      return ''
+      case 'template':
+        return scoped ? (rewriters.template + meta + '!') : ''
+      case 'style':
+        return rewriters.style + meta + (scoped ? '&scoped=true!' : '!')
+      default:
+        return ''
     }
   }
 

lib/parser.js

@@ -95,28 +95,20 @@ function commentScript (content, lang) {
   return content
     .split(/\n\r|\n|\r/g)
     .map(function (line) {
+      if (line.trim() === '') {
+        return line
+      }
+
       switch (lang) {
         case 'coffee':
         case 'coffee-jsx':
         case 'coffee-redux':
-          if (line.trim() === '') {
-            return line
-          } else {
-            return '# ' + line
-          }
+          return '# ' + line
         case 'purs':
         case 'ulmus':
-          if (line.trim() === '') {
-            return line
-          } else {
-            return '-- ' + line
-          }
+          return '-- ' + line
         default:
-          if (line.trim() === '') {
-            return line
-          } else {
-            return '// ' + line
-          }
+          return '// ' + line
       }
     })
     .join('\n')