@mpxjs/webpack-plugin 2.7.55 → 2.7.57

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/platform/template/wx/component-config/map.js

@@ -3,7 +3,7 @@ const TAG_NAME = 'map'
 module.exports = function ({ print }) {
   const aliPropLog = print({ platform: 'ali', tag: TAG_NAME, isError: false })
   const aliEventLogError = print({ platform: 'ali', tag: TAG_NAME, isError: true, type: 'event' })
-  const aliPropValueWarningLog = print({ platform: 'ali', tag: TAG_NAME, isError: true, type: 'value-attr-uniform' })
+  const aliPropValueWarningLog = print({ platform: 'ali', tag: TAG_NAME, isError: false, type: 'value-attr-uniform' })
   const baiduPropLog = print({ platform: 'baidu', tag: TAG_NAME, isError: false })
   const baiduEventLogError = print({ platform: 'baidu', tag: TAG_NAME, isError: true, type: 'event' })
   const jdPropLog = print({ platform: 'jd', tag: TAG_NAME, isError: false })

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.55",
+  "version": "2.7.57",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "988b3f83c36ba5280ee7d050fc8b610ae4f3ad86"
+  "gitHead": "d880e6a7cbce97d3b8cce3468619683d7c062837"
 }