eslint

yyx990803 · yyx990803 · commit 98ec0b2e2db1 · 2016-06-19T00:13:47.000-04:00
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,4 @@
+{
+  "root": true,
+  "extends": "vue"
+}
diff --git a/index.js b/index.js
@@ -1,12 +1,11 @@
 var through = require('through')
 var compiler = require('./lib/compiler')
 
-compiler.loadConfig({
-  extractCss: true
-})
-
 module.exports = function vueify (file, options) {
-  if (!/.vue$/.test(file)) return through()
+  if (!/.vue$/.test(file)) {
+    return through()
+  }
+
   compiler.applyConfig(options)
   compiler.applyConfig({
     sourceMap: options._flags.debug
@@ -16,15 +15,15 @@ module.exports = function vueify (file, options) {
   var stream = through(write, end)
   stream.vueify = true
 
-  function dependency(file) {
+  function dependency (file) {
     stream.emit('file', file)
   }
 
-  function emitStyle (style) {
-    stream.emit('vueify-style', style)
+  function emitStyle (e) {
+    stream.emit('vueify-style', e)
   }
 
-  function write(buf) {
+  function write (buf) {
     data += buf
   }
 
@@ -33,7 +32,7 @@ module.exports = function vueify (file, options) {
     compiler.on('dependency', dependency)
     compiler.on('style', emitStyle)
 
-    compiler.compile(data, file, function(error, result) {
+    compiler.compile(data, file, function (error, result) {
       compiler.removeListener('dependency', dependency)
       compiler.removeListener('style', emitStyle)
       if (error) {
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -2,7 +2,6 @@ var fs = require('fs')
 var path = require('path')
 var chalk = require('chalk')
 var hash = require('hash-sum')
-var assign = require('object-assign')
 var Emitter = require('events').EventEmitter
 var vueCompiler = require('vue-template-compiler')
 var sourceMap = require('source-map')
@@ -12,9 +11,10 @@ var genId = require('./gen-id')
 var normalize = require('./normalize')
 var compilers = require('./compilers')
 var rewriteStyle = require('./style-rewriter')
+var compileTemplate = require('./template-compiler')
 
 // determine dynamic script paths
-var hotReloadAPIPath = 'vue-hot-reload-api' //normalize.dep('vue-hot-reload-api')
+var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 var insertCSSPath = normalize.lib('insert-css')
 
 var hasBabel = true
@@ -178,10 +178,7 @@ compiler.compile = function (content, filePath, cb) {
     script.split(splitRE).forEach(function (line, index) {
       var ln = index + 1
       var originalLine = inMapConsumer
-        ? inMapConsumer.originalPositionFor({
-            line: ln,
-            column: 0
-          }).line
+        ? inMapConsumer.originalPositionFor({ line: ln, column: 0 }).line
         : ln
       if (originalLine) {
         map.addMapping({
@@ -206,18 +203,7 @@ function processTemplate (part, filePath, parts) {
   var template = getContent(part, filePath)
   return compileAsPromise('template', template, part.lang, filePath)
     .then(function (res) {
-      var compiled = vueCompiler.compile(res)
-      if (compiled.errors.length) {
-        compiled.errors.forEach(function (msg) {
-          console.error('\n' + chalk.red(msg) + '\n')
-        })
-        throw new Error('Vue template compilation failed')
-      } else {
-        parts.template = {
-          render: toFunction(compiled.render),
-          staticRenderFns: '[' + compiled.staticRenderFns.map(toFunction).join(',') + ']'
-        }
-      }
+      parts.template = compileTemplate(res, compiler)
     })
 }
 
@@ -255,10 +241,10 @@ function getContent (part, filePath) {
 
 function loadSrc (src, filePath) {
   var dir = path.dirname(filePath)
-  var filePath = path.resolve(dir, src)
-  compiler.emit('dependency', filePath)
+  var srcPath = path.resolve(dir, src)
+  compiler.emit('dependency', srcPath)
   try {
-    return fs.readFileSync(filePath, 'utf-8')
+    return fs.readFileSync(srcPath, 'utf-8')
   } catch (e) {
     console.error(chalk.red(
       'Failed to load src: "' + src +
@@ -288,7 +274,3 @@ function compileAsPromise (type, source, lang, filePath) {
     return Promise.resolve(source)
   }
 }
-
-function toFunction (code) {
-  return 'function(){' + code + '}'
-}
diff --git a/lib/compilers/sass.js b/lib/compilers/sass.js
@@ -35,7 +35,7 @@ module.exports = function (raw, cb, compiler, filePath) {
       if (err) {
         cb(err)
       } else {
-        res.stats.includedFiles.forEach(function(file){
+        res.stats.includedFiles.forEach(function (file) {
           compiler.emit('dependency', file)
         })
         cb(null, res.css.toString())
diff --git a/lib/ensure-require.js b/lib/ensure-require.js
@@ -1,12 +1,13 @@
 module.exports = function (name, deps) {
   var i, len
   var missing = []
-  if (typeof deps === "string") {
+  if (typeof deps === 'string') {
     deps = [deps]
   }
   for (i = 0, len = deps.length; i < len; i++) {
-    var mis, req = deps[i]
-    if (typeof req === "string") {
+    var mis
+    var req = deps[i]
+    if (typeof req === 'string') {
       mis = req
     } else {
       mis = req[1]
@@ -24,7 +25,7 @@ module.exports = function (name, deps) {
   }
   if (missing.length > 0) {
     var message = 'You are trying to use "' + name + '". '
-    var npmInstall = 'npm install --save-dev ' + missing.join(" ")
+    var npmInstall = 'npm install --save-dev ' + missing.join(' ')
     if (missing.length > 1) {
       var last = missing.pop()
       message += missing.join(', ') + ' and ' + last + ' are '
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
@@ -0,0 +1,21 @@
+var chalk = require('chalk')
+var vueCompiler = require('vue-template-compiler')
+
+module.exports = function compileTemplate (template, compiler) {
+  var compiled = vueCompiler.compile(template)
+  if (compiled.errors.length) {
+    compiled.errors.forEach(function (msg) {
+      console.error('\n' + chalk.red(msg) + '\n')
+    })
+    throw new Error('Vue template compilation failed')
+  } else {
+    return {
+      render: toFunction(compiled.render),
+      staticRenderFns: '[' + compiled.staticRenderFns.map(toFunction).join(',') + ']'
+    }
+  }
+}
+
+function toFunction (code) {
+  return 'function(){' + code + '}'
+}
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "url": "https://github.com/vuejs/vueify/issues"
   },
   "scripts": {
-    "test": "mocha test/test.js --slow=5000 --timeout=10000"
+    "test": "eslint index.js lib && mocha test/test.js --slow=5000 --timeout=10000"
   },
   "homepage": "https://github.com/vuejs/vueify",
   "dependencies": {
@@ -42,6 +42,8 @@
     "browserify": "^13.0.1",
     "chai": "^3.5.0",
     "coffee-script": "^1.10.0",
+    "eslint": "^2.13.0",
+    "eslint-config-vue": "^1.0.3",
     "jade": "^1.11.0",
     "jsdom": "^9.2.1",
     "less": "^2.5.1",
diff --git a/plugins/extract-css.js b/plugins/extract-css.js
@@ -1,13 +1,16 @@
 var fs = require('fs')
 var compiler = require('../lib/compiler')
 
-compiler.applyConfig({
-  extractCSS: true
-})
-
 module.exports = function (b, opts) {
-  var outPath = opts.out || opts.o || 'bundle.css'
+  compiler.applyConfig({
+    extractCSS: true
+  })
+
   var styles = Object.create(null)
+  var outPath = opts.out || opts.o || 'bundle.css'
+  if (typeof outPath === 'function') {
+    outPath = outPath()
+  }
 
   b.on('bundle', function (bs) {
     bs.on('end', function () {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "root": true,
 +  "extends": "vue"
 +}