diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js
index e3ab00ad50..6ca89c0b31 100644
--- a/packages/@vue/cli-service/lib/config/base.js
+++ b/packages/@vue/cli-service/lib/config/base.js
@@ -84,6 +84,14 @@ module.exports = (api, options) => {
             limit: inlineLimit,
             name: getAssetPath(options, `img/[name].[hash:8].[ext]`)
           })
+    
+    // GraphQL Loader ------------------
+    webpackConfig.module
+      .rule('graphql')
+      .test(/\.graphql$/)
+      .use('graphql-tag/loader')
+        .loader('graphql-tag/loader')
+        .end()
 
     // do not base64-inline SVGs.
     // https://github.com/facebookincubator/create-react-app/pull/1180