more refactor

Author: yyx990803

lib/loader.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var parse = require('./parser')
-var genId = require('./gen-id')
-var normalize = require('./normalize')
+var genId = require('./utils/gen-id')
+var normalize = require('./utils/normalize')
 var loaderUtils = require('loader-utils')
 var querystring = require('querystring')
 

lib/template-compiler/index.js

@@ -1,5 +1,5 @@
-var normalize = require('../normalize')
 var loaderUtils = require('loader-utils')
+var normalize = require('../utils/normalize')
 var compiler = require('vue-template-compiler')
 var beautify = require('js-beautify').js_beautify
 var transpile = require('vue-template-es2015-compiler')

lib/gen-id.js renamed to lib/utils/gen-id.js

@@ -3,13 +3,13 @@ var fs = require('fs')
 var path = require('path')
 
 exports.lib = function (file) {
-  return path.resolve(__dirname, file)
+  return path.resolve(__dirname, '../', file)
 }
 
 exports.dep = function (dep) {
   if (IS_TEST) {
     return dep
-  } else if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
+  } else if (fs.existsSync(path.resolve(__dirname, '../../node_modules', dep))) {
     // npm 2 or npm linked
     return 'vue-loader/node_modules/' + dep
   } else {