Merge pull request #945 from didi/fixbug-app-style-src

修复app 中使用 style 标签src 引入css 无filename 问题
didi · Feb 10, 2022 · 92e22db · 92e22db
2 parents 4b78885 + 579319a
commit 92e22db
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/packages/webpack-plugin/lib/extractor.js b/packages/webpack-plugin/lib/extractor.js
@@ -16,7 +16,7 @@ module.exports.pitch = async function (remainingRequest) {
   const type = queryObj.type
   const index = queryObj.index || 0
   const isStatic = queryObj.isStatic
-  const issuerFile = queryObj.issuerFile
+  const issuerResource = queryObj.issuerResource
   const fromImport = queryObj.fromImport
   const needBabel = queryObj.needBabel
 
@@ -82,7 +82,8 @@ module.exports.pitch = async function (remainingRequest) {
       // styles为static就两种情况，一种是.mpx中使用src引用样式，第二种为css-loader中处理@import
       // 为了支持持久化缓存，.mpx中使用src引用样式对issueFile asset产生的副作用迁移到ExtractDependency中处理
       case 'styles':
-        if (issuerFile) {
+        if (issuerResource) {
+          const issuerFile = mpx.getExtractedFile(issuerResource)
           let relativePath = toPosix(path.relative(path.dirname(issuerFile), file))
           relativePath = fixRelative(relativePath, mode)
           if (fromImport) {

diff --git a/packages/webpack-plugin/lib/loader.js b/packages/webpack-plugin/lib/loader.js
@@ -290,7 +290,7 @@ module.exports = function (content) {
             ...style.src ? {
               ...queryObj,
               isStatic: true,
-              issuerFile: mpx.getExtractedFile(addQuery(this.resource, { type: 'styles' }, true))
+              issuerResource: addQuery(this.resource, { type: 'styles' }, true)
             } : null,
             moduleId,
             scoped

diff --git a/packages/webpack-plugin/lib/wxml/loader.js b/packages/webpack-plugin/lib/wxml/loader.js
@@ -99,7 +99,7 @@ module.exports = function (content) {
       case config[mode].wxs.tag:
         // 显式传递issuerResource避免模块缓存以及提供给wxs-loader计算相对路径
         extraOptions = {
-          issuerFile: mpx.getExtractedFile(this.resource),
+          issuerResource: this.resource,
           isStatic: true
         }
         requestString = getRequestString('wxs', { src, mode: localSrcMode }, extraOptions)

diff --git a/packages/webpack-plugin/lib/wxss/loader.js b/packages/webpack-plugin/lib/wxss/loader.js
@@ -73,7 +73,7 @@ module.exports = function (content, map) {
       } else {
         const requestString = getRequestString('styles', { src: imp.url }, {
           isStatic: true,
-          issuerFile: mpx.getExtractedFile(this.resource),
+          issuerResource: this.resource,
           fromImport: true
         }, i)
         return 'exports.push([module.id, ' +