From 808b2d9bfc127c1cc6a8cef6ce82364d41bba6d0 Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Thu, 28 Dec 2017 13:13:27 +0800
Subject: [PATCH 1/5] judge `isVue` from loader options alose

---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index ac9629ae..5955c4e9 100644
--- a/index.js
+++ b/index.js
@@ -20,10 +20,10 @@ module.exports.pitch = function (remainingRequest) {
   var request = loaderUtils.stringifyRequest(this, '!!' + remainingRequest)
   var id = JSON.stringify(hash(request))
 
-  // direct css import from js --> direct (how does this work when inside an async chunk? ...just don't do it)
+  // direct css import from js --> direct for non vue file and manually call `styles.__inject__(ssrContext)` in component lifecycle
   // css import from vue file --> component lifecycle linked
   // style embedded in vue file --> component lifecycle linked
-  var isVue = /"vue":true/.test(remainingRequest)
+  var isVue = /"vue":true/.test(remainingRequest) || loaderUtils.getOptions(this).vue
 
   var shared = [
     '// style-loader: Adds some css to the DOM by adding a <style> tag',

From cca015eb7a77e949c5b998ae7f0af11841d1cc1b Mon Sep 17 00:00:00 2001
From: Jiaren Liu <jrliu@alauda.io>
Date: Wed, 3 Jan 2018 10:48:53 +0800
Subject: [PATCH 2/5] generate id via request + resourcePath

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 5955c4e9..7a676043 100644
--- a/index.js
+++ b/index.js
@@ -18,7 +18,7 @@ module.exports.pitch = function (remainingRequest) {
   var addStylesServerPath = loaderUtils.stringifyRequest(this, '!' + path.join(__dirname, 'lib/addStylesServer.js'))
 
   var request = loaderUtils.stringifyRequest(this, '!!' + remainingRequest)
-  var id = JSON.stringify(hash(request))
+  var id = JSON.stringify(hash(request) + path.relative(__dirname, this.resourcePath))
 
   // direct css import from js --> direct for non vue file and manually call `styles.__inject__(ssrContext)` in component lifecycle
   // css import from vue file --> component lifecycle linked

From 0cb52366b5ed73866501b1167002f8bae64f46ef Mon Sep 17 00:00:00 2001
From: JounQin <admin@1stg.me>
Date: Sat, 6 Jan 2018 19:35:52 +0800
Subject: [PATCH 3/5] fix issue about null options

---
 index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 7a676043..89f40e24 100644
--- a/index.js
+++ b/index.js
@@ -19,11 +19,12 @@ module.exports.pitch = function (remainingRequest) {
 
   var request = loaderUtils.stringifyRequest(this, '!!' + remainingRequest)
   var id = JSON.stringify(hash(request) + path.relative(__dirname, this.resourcePath))
+  var options = loaderUtils.getOptions(this) || {}
 
   // direct css import from js --> direct for non vue file and manually call `styles.__inject__(ssrContext)` in component lifecycle
   // css import from vue file --> component lifecycle linked
   // style embedded in vue file --> component lifecycle linked
-  var isVue = /"vue":true/.test(remainingRequest) || loaderUtils.getOptions(this).vue
+  var isVue = /"vue":true/.test(remainingRequest) || options.vue
 
   var shared = [
     '// style-loader: Adds some css to the DOM by adding a <style> tag',

From 643aa4da1aec1913285ca2b05353900d4c37350d Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 23 Jan 2018 22:25:57 -0500
Subject: [PATCH 4/5] Update index.js

---
 index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 89f40e24..3f24b000 100644
--- a/index.js
+++ b/index.js
@@ -18,13 +18,13 @@ module.exports.pitch = function (remainingRequest) {
   var addStylesServerPath = loaderUtils.stringifyRequest(this, '!' + path.join(__dirname, 'lib/addStylesServer.js'))
 
   var request = loaderUtils.stringifyRequest(this, '!!' + remainingRequest)
-  var id = JSON.stringify(hash(request) + path.relative(__dirname, this.resourcePath))
+  var id = JSON.stringify(hash(request + this.resourcePath))
   var options = loaderUtils.getOptions(this) || {}
 
   // direct css import from js --> direct for non vue file and manually call `styles.__inject__(ssrContext)` in component lifecycle
   // css import from vue file --> component lifecycle linked
   // style embedded in vue file --> component lifecycle linked
-  var isVue = /"vue":true/.test(remainingRequest) || options.vue
+  var isVue = /"vue":true/.test(remainingRequest) || options.manualInject
 
   var shared = [
     '// style-loader: Adds some css to the DOM by adding a <style> tag',

From a10707abaae674c9335a80272a45cb57b427a82c Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 23 Jan 2018 22:26:40 -0500
Subject: [PATCH 5/5] Update index.js

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 3f24b000..6ff8e6e8 100644
--- a/index.js
+++ b/index.js
@@ -21,7 +21,7 @@ module.exports.pitch = function (remainingRequest) {
   var id = JSON.stringify(hash(request + this.resourcePath))
   var options = loaderUtils.getOptions(this) || {}
 
-  // direct css import from js --> direct for non vue file and manually call `styles.__inject__(ssrContext)` in component lifecycle
+  // direct css import from js --> direct, or manually call `styles.__inject__(ssrContext)` with `manualInject` option
   // css import from vue file --> component lifecycle linked
   // style embedded in vue file --> component lifecycle linked
   var isVue = /"vue":true/.test(remainingRequest) || options.manualInject