fix: stylePostLoader injection for windows flat node_modules

close #1284
vuejs · May 3, 2018 · a9a4412 · a9a4412
1 parent fb7d695
commit a9a4412
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/loaders/pitcher.js b/lib/loaders/pitcher.js
@@ -13,7 +13,7 @@ module.exports.pitch = function (remainingRequest) {
   const loaders = this.loaders.slice(1) // remove self
 
   // do not inject if user uses null-loader to void the type (#1239)
-  if (loaders.some(l => /(\/|\\)null-loader/.test(l.path))) {
+  if (loaders.some(l => /(\/|\\|@)null-loader/.test(l.path))) {
     return
   }
 
@@ -45,8 +45,8 @@ module.exports.pitch = function (remainingRequest) {
 
   // Inject style-post-loader before css-loader for scoped CSS and trimming
   if (query.type === `style`) {
-    const cssLoaderIndex = loaders.findIndex(l => /(\/|\\)css-loader/.test(l.path))
-    if (cssLoaderIndex) {
+    const cssLoaderIndex = loaders.findIndex(l => /(\/|\\|@)css-loader/.test(l.path))
+    if (cssLoaderIndex > -1) {
       const afterLoaders = loaders.slice(0, cssLoaderIndex + 1)
       const beforeLoaders = loaders.slice(cssLoaderIndex + 1)
       const request = genRequest([