@mpxjs/webpack-plugin 2.7.54 → 2.7.56

package/lib/json-compiler/index.js

@@ -274,7 +274,7 @@ module.exports = function (content) {
                 })
                 // 对于通过.mpx文件声明的独立分包，默认将其自身的script block视为init module
                 if (queryObj.independent === true) queryObj.independent = result
-                getJSONContent(parts.json || {}, this, (err, content) => {
+                getJSONContent(parts.json || {}, result, this, (err, content) => {
                   callback(err, result, content)
                 })
               } else {

package/lib/loader.js

@@ -91,7 +91,7 @@ module.exports = function (content) {
 
   async.waterfall([
     (callback) => {
-      getJSONContent(parts.json || {}, loaderContext, (err, content) => {
+      getJSONContent(parts.json || {}, null, loaderContext, (err, content) => {
         if (err) return callback(err)
         if (parts.json) parts.json.content = content
         callback()

package/lib/native-loader.js

@@ -117,7 +117,7 @@ module.exports = function (content) {
       getJSONContent({
         src: typeResourceMap.json,
         useJSONJS
-      }, this, callback)
+      }, null, this, callback)
     }, (content, callback) => {
       let json
       try {

package/lib/resolver/FixDescriptionInfoPlugin.js

@@ -4,6 +4,7 @@ module.exports = class FixDescriptionInfoPlugin {
   apply (resolver) {
     resolver.hooks.result.tap('FixDescriptionInfoPlugin', (request) => {
       const { path: resourcePath } = request
+      if (!resourcePath) return
       const segments = resourcePath.split(path.sep)
       let rootIndex = -1
       for (let i = segments.length - 1; i >= 0; i--) {

package/lib/utils/get-json-content.js

@@ -3,14 +3,18 @@ const evalJSONJS = require('./eval-json-js')
 const resolve = require('./resolve')
 const async = require('async')
 const { JSON_JS_EXT } = require('./const')
+const path = require('path')
 
-module.exports = function getJSONContent (json, loaderContext, callback) {
+module.exports = function getJSONContent (json, filename, loaderContext, callback) {
   if (!loaderContext._compiler) return callback(null, '{}')
   const fs = loaderContext._compiler.inputFileSystem
+  filename = filename || loaderContext.resourcePath
+  const context = path.dirname(filename)
+
   async.waterfall([
     (callback) => {
       if (json.src) {
-        resolve(loaderContext.context, json.src, loaderContext, (err, result) => {
+        resolve(context, json.src, loaderContext, (err, result) => {
           if (err) return callback(err)
           const { rawResourcePath: resourcePath } = parseRequest(result)
           fs.readFile(resourcePath, (err, content) => {
@@ -27,7 +31,7 @@ module.exports = function getJSONContent (json, loaderContext, callback) {
         callback(null, {
           content: json.content,
           useJSONJS: json.useJSONJS,
-          filename: loaderContext.resourcePath
+          filename
         })
       }
     },

package/lib/web/processJSON.js

@@ -139,7 +139,7 @@ module.exports = function (json, {
                 mode,
                 env
               })
-              getJSONContent(parts.json || {}, loaderContext, (err, content) => {
+              getJSONContent(parts.json || {}, result, loaderContext, (err, content) => {
                 callback(err, result, content)
               })
             } else {

package/lib/wxss/runtime/sourceMaps.js

@@ -7,6 +7,7 @@ module.exports = (item) => {
   }
 
   if (typeof btoa === 'function') {
+    // eslint-disable-next-line no-undef
     const base64 = btoa(
       unescape(encodeURIComponent(JSON.stringify(cssMapping)))
     )

package/lib/wxss/utils.js

@@ -1055,7 +1055,6 @@ function getModuleCode (
       // 符合css后缀名的文件经过mpx处理后会带上相应的后缀防止使用 WebPack 的默认解析规则，此时 require/import 相应路径时，导出的不是一段 css 代码了，事实上是一个文件路径。
       const printedParam = printParams(media, dedupe, supports, layer)
       const otherParams = printedParam.length > 0 ? printedParam : ''
-      
       beforeCode += `___CSS_LOADER_EXPORT___.push([module.id, '@import "' + ${item.importName} + '";', ${JSON.stringify(otherParams)} ]);\n`
     }
   }
@@ -1231,14 +1230,11 @@ async function resolveRequests (resolve, context, possibleRequests) {
     })
 }
 
-
 function isURLRequestable (url, options = {}) {
-
   // 先用 mpx 内部维护方法判断
-  if( !isUrlRequest(url, options.root, options.externals) ) {
+  if (!isUrlRequest(url, options.root, options.externals)) {
     return { requestable: false, needResolve: false }
   }
-
   // Protocol-relative URLs
   if (/^\/\//.test(url)) {
     return { requestable: false, needResolve: false }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.54",
+  "version": "2.7.56",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "cf74ccfac7ec2b12a856b003a5ccbcad89b6144e"
+  "gitHead": "ec0c4c8e63558622a0bd4cf4cf1ca5aafaae1499"
 }