fix: more global service resolve fixes

yyx990803 · yyx990803 · commit 76dda73ba3d6 · 2018-01-25T21:26:42.000-05:00
diff --git a/packages/@vue/cli-plugin-babel/index.js b/packages/@vue/cli-plugin-babel/index.js
@@ -23,10 +23,12 @@ module.exports = api => {
           options.loaders = options.loaders || {}
           options.loaders.js = [
             {
-              loader: 'cache-loader',
+              loader: require.resolve('cache-loader'),
               options: { cacheDirectory }
             },
-            'babel-loader'
+            {
+              loader: require.resolve('babel-loader')
+            }
           ]
           return options
         })
diff --git a/packages/@vue/cli-service-global/lib/createConfigPlugin.js b/packages/@vue/cli-service-global/lib/createConfigPlugin.js
@@ -24,9 +24,15 @@ module.exports = function createConfigPlugin (context, entry) {
         // package managers their folder structures for global install.
         // so we first resolve the location of vue and then trace to the
         // install location.
+        const modulePath = path.resolve(require.resolve('vue'), '../../../')
+
         config.resolve
           .modules
-            .add(path.resolve(require.resolve('vue'), '../../../'))
+            .add(modulePath)
+
+        config.resolveLoader
+          .modules
+            .add(modulePath)
 
         // set entry
         config
@@ -43,12 +49,7 @@ module.exports = function createConfigPlugin (context, entry) {
           .rule('vue')
             .use('vue-loader')
               .tap(options => {
-                options.loaders = Object.assign({
-                  js: {
-                    loader: 'babel-loader',
-                    options: babelOptions
-                  }
-                }, options.loaders)
+                options.loaders.js[1].options = babelOptions
                 return options
               })
 
