simplify deps by dynamically normalizing path

yyx990803 · yyx990803 · commit 9f00d51b83f1 · 2016-06-12T13:10:13.000-04:00
diff --git a/lib/loader.js b/lib/loader.js
@@ -3,6 +3,7 @@ var assign = require('object-assign')
 var parse = require('./parser')
 var hash = require('hash-sum')
 var path = require('path')
+var normalizeDepPath = require('./normalize-dep')
 
 var defaultLang = {
   template: 'html',
@@ -12,7 +13,9 @@ var defaultLang = {
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 var selectorPath = 'vue-loader/lib/selector'
-var templateLoader = 'vue-loader/lib/template-loader'
+var templateLoaderPath = 'vue-loader/lib/template-loader'
+var styleLoaderPath = normalizeDepPath('vue-style-loader')
+var hotReloadAPIPath = normalizeDepPath('vue-hot-reload-api')
 
 module.exports = function (content) {
   this.cacheable()
@@ -24,25 +27,18 @@ module.exports = function (content) {
   var moduleId = '_v-' + hash(filePath)
   var styleRewriter = 'vue-loader/lib/style-rewriter?id=' + moduleId
 
-  var defaultLoaders = {
-    html: 'vue-loader/lib/template-compiler?id=' + moduleId,
-    css: 'vue-style-loader!css-loader',
-    js: 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
-  }
-
-  // respect user babel options
-  if (this.options.babel) {
-    defaultLoaders.js = 'babel-loader'
-  }
-
-  // enable css source map if needed
-  if (
+  var needCssSourceMap =
     this.sourceMap &&
     !this.minimize &&
-    options.cssSourceMap !== false &&
-    process.env.NODE_ENV !== 'production'
-  ) {
-    defaultLoaders.css = 'vue-style-loader!css-loader?sourceMap'
+    process.env.NODE_ENV !== 'production' &&
+    options.cssSourceMap !== false
+
+  var defaultLoaders = {
+    html: 'vue-loader/lib/template-compiler?id=' + moduleId,
+    css: styleLoaderPath + '!css-loader' + (needCssSourceMap ? '?sourceMap' : ''),
+    js: this.options.babel
+      ? 'babel-loader' // respect user options
+      : 'babel-loader?presets[]=es2015&plugins[]=transform-runtime&comments=false'
   }
 
   // check if there are custom loaders specified via
@@ -102,7 +98,7 @@ module.exports = function (content) {
       // unknown lang, infer the loader to be used
       switch (type) {
         case 'template':
-          return defaultLoaders.html + '!' + templateLoader + '?raw&engine=' + lang + '!'
+          return defaultLoaders.html + '!' + templateLoaderPath + '?raw&engine=' + lang + '!'
         case 'styles':
           return defaultLoaders.css + '!' + rewriter + lang + '!'
         case 'script':
@@ -198,7 +194,7 @@ module.exports = function (content) {
     ) {
       output +=
         '\nif (module.hot) {(function () {' +
-        '  var hotAPI = require("vue-hot-reload-api")\n' +
+        '  var hotAPI = require("' + hotReloadAPIPath + '")\n' +
         '  hotAPI.install(require("vue"), false)\n' +
         '  if (!hotAPI.compatible) return\n' +
         '  module.hot.accept()\n' +
diff --git a/lib/normalize-dep.js b/lib/normalize-dep.js
@@ -0,0 +1,12 @@
+var fs = require('fs')
+var path = require('path')
+
+module.exports = function normalizeDepPath (dep) {
+  if (fs.existsSync(path.resolve(__dirname, '../node_modules', dep))) {
+    // npm 2 or npm linked
+    return 'vue-loader/node_modules/' + dep
+  } else {
+    // npm 3
+    return dep
+  }
+}
diff --git a/lib/template-compiler.js b/lib/template-compiler.js
@@ -1,5 +1,7 @@
 var compiler = require('vue-template-compiler')
 var loaderUtils = require('loader-utils')
+var normalizeDepPath = require('./normalize-dep')
+var hotReloadAPIPath = normalizeDepPath('vue-hot-reload-api')
 
 // vue compiler module for using file-loader img src
 var options = {
@@ -49,7 +51,7 @@ module.exports = function (html) {
       '\nif (module.hot) {\n' +
       '  module.hot.accept()\n' +
       '  if (module.hot.data) {\n' +
-      '     require("vue-hot-reload-api").rerender("' + moduleId + '", module.exports)\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + moduleId + '", module.exports)\n' +
       '  }\n' +
       '}'
   }
diff --git a/package.json b/package.json
@@ -37,12 +37,9 @@
     "object-assign": "^4.0.0",
     "postcss": "^5.0.10",
     "postcss-selector-parser": "^1.1.2",
-    "vue-template-compiler": "^0.1.0"
-  },
-  "peerDependencies": {
-    "css-loader": "*",
+    "vue-hot-reload-api": "^2.0.0",
     "vue-style-loader": "^1.0.0",
-    "vue-hot-reload-api": "^1.2.0"
+    "vue-template-compiler": "^2.0.0-alpha.1"
   },
   "devDependencies": {
     "babel-core": "^6.8.0",
@@ -70,9 +67,6 @@
     "stylus": "^0.54.5",
     "stylus-loader": "^2.0.0",
     "sugarss": "^0.1.3",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-style-loader": "^1.0.0",
     "webpack": "^1.12.2"
   }
 }
