rm useless files & fix loader match

didi · Sep 15, 2023 · 88716d3 · 88716d3
1 parent cd1f38b
commit 88716d3
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 516 deletions.
diff --git a/packages/webpack-plugin/lib/index.js b/packages/webpack-plugin/lib/index.js
@@ -1453,8 +1453,8 @@ try {
       })
 
       const typeLoaderProcessInfo = {
-        styles: ['css-loader', wxssLoaderPath, styleCompilerPath],
-        template: ['html-loader', wxmlLoaderPath, templateCompilerPath]
+        styles: ['node_modules/css-loader', wxssLoaderPath, styleCompilerPath],
+        template: ['node_modules/html-loader', wxmlLoaderPath, templateCompilerPath]
       }
 
       // 应用过rules后，注入mpx相关资源编译loader
@@ -1517,15 +1517,15 @@ try {
         if (mpx.mode === 'web') {
           const mpxStyleOptions = queryObj.mpxStyleOptions
           const firstLoader = loaders[0] ? toPosix(loaders[0].loader) : ''
-          const isPitcherRequest = firstLoader.includes('vue-loader/lib/loaders/pitcher')
+          const isPitcherRequest = firstLoader.includes('node_modules/vue-loader/lib/loaders/pitcher')
           let cssLoaderIndex = -1
           let vueStyleLoaderIndex = -1
           let mpxStyleLoaderIndex = -1
           loaders.forEach((loader, index) => {
             const currentLoader = toPosix(loader.loader)
-            if (currentLoader.includes('css-loader') && cssLoaderIndex === -1) {
+            if (currentLoader.includes('node_modules/css-loader') && cssLoaderIndex === -1) {
               cssLoaderIndex = index
-            } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader') && vueStyleLoaderIndex === -1) {
+            } else if (currentLoader.includes('node_modules/vue-loader/lib/loaders/stylePostLoader') && vueStyleLoaderIndex === -1) {
               vueStyleLoaderIndex = index
             } else if (currentLoader.includes(styleCompilerPath) && mpxStyleLoaderIndex === -1) {
               mpxStyleLoaderIndex = index

diff --git a/packages/webpack-plugin/lib/utils/ts-loader-watch-run-loader-filter.js b/packages/webpack-plugin/lib/utils/ts-loader-watch-run-loader-filter.js
@@ -1,7 +1,7 @@
 module.exports = (loaders, loaderIndex) => {
   for (let i = loaderIndex; i >= 0; i--) {
     const currentLoader = loaders[i]
-    if (currentLoader.path.endsWith('ts-loader/dist/stringify-loader.js')) {
+    if (currentLoader.path.endsWith('node_modules/ts-loader/dist/stringify-loader.js')) {
       return i
     }
   }

diff --git a/packages/webpack-plugin/lib/wxss/compile-exports.js b/packages/webpack-plugin/lib/wxss/compile-exports.js
diff --git a/packages/webpack-plugin/lib/wxss/createResolver.js b/packages/webpack-plugin/lib/wxss/createResolver.js
diff --git a/packages/webpack-plugin/lib/wxss/css-base.js b/packages/webpack-plugin/lib/wxss/css-base.js
diff --git a/packages/webpack-plugin/lib/wxss/getLocalIdent.js b/packages/webpack-plugin/lib/wxss/getLocalIdent.js
diff --git a/packages/webpack-plugin/lib/wxss/localsLoader.js b/packages/webpack-plugin/lib/wxss/localsLoader.js