fix: loader check for windows

vuejs · Mar 22, 2018 · ab067b0 · ab067b0
1 parent 42141c0
commit ab067b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/loaders/pitch.js b/lib/loaders/pitch.js
@@ -31,7 +31,7 @@ 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.request))
+    const cssLoaderIndex = loaders.findIndex(l => /(\/|\\)css-loader/.test(l.request))
     if (cssLoaderIndex) {
       const afterLoaders = loaders.slice(0, cssLoaderIndex + 1).map(toLoaderString)
       const beforeLoaders = loaders.slice(cssLoaderIndex + 1).map(toLoaderString)

diff --git a/lib/plugin.js b/lib/plugin.js
@@ -27,7 +27,7 @@ module.exports = class VueLoaderPlugin {
     const normalizedVueUse = normalizedVueRule.use.map(cleanUse)
     // get vue-loader options
     const vueLoaderUseIndex = normalizedVueUse.findIndex(u => {
-      return /^vue-loader|\/vue-loader/.test(u.loader)
+      return /^vue-loader|(\/|\\)vue-loader/.test(u.loader)
     })
 
     if (vueLoaderUseIndex < 0) {