@mpxjs/webpack-plugin 2.7.18 → 2.7.24

package/lib/dependencies/DynamicEntryDependency.js

@@ -114,8 +114,8 @@ class DynamicEntryDependency extends NullDependency {
   updateHash (hash, context) {
     const { resultPath, relativePath } = this
     if (resultPath) hash.update(resultPath)
-    // relativePath为MPX_CURRENT_CHUNK时，插入随机数hash使当前module的codeGeneration cache失效，以执行dep.apply动态获取当前module所属的chunk路径
-    if (relativePath === MPX_CURRENT_CHUNK) hash.update('' + Math.random())
+    // relativePath为MPX_CURRENT_CHUNK时，插入随机hash使当前module的codeGeneration cache失效，从而执行dep.apply动态获取当前module所属的chunk路径
+    if (relativePath === MPX_CURRENT_CHUNK) hash.update('' + (+new Date()) + Math.random())
     super.updateHash(hash, context)
   }
 

package/lib/index.js

@@ -22,6 +22,7 @@ const ExternalsPlugin = require('webpack/lib/ExternalsPlugin')
 const AddModePlugin = require('./resolver/AddModePlugin')
 const AddEnvPlugin = require('./resolver/AddEnvPlugin')
 const PackageEntryPlugin = require('./resolver/PackageEntryPlugin')
+const FixDescriptionInfoPlugin = require('./resolver/FixDescriptionInfoPlugin')
 // const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency')
 // const HarmonyImportSideEffectDependency = require('webpack/lib/dependencies/HarmonyImportSideEffectDependency')
 // const RequireHeaderDependency = require('webpack/lib/dependencies/RequireHeaderDependency')
@@ -302,6 +303,7 @@ class MpxWebpackPlugin {
       compiler.options.resolve.plugins.push(addEnvPlugin)
     }
     compiler.options.resolve.plugins.push(packageEntryPlugin)
+    compiler.options.resolve.plugins.push(new FixDescriptionInfoPlugin())
 
     let splitChunksPlugin
     let splitChunksOptions
@@ -789,14 +791,25 @@ class MpxWebpackPlugin {
             }
           }
         } else if (independent) {
-          // ContextModule/RawModule和ExternalModule等只在独立分包的情况下添加分包标记，其余默认不添加
-          const postfix = `|independent=${independent}|${currentPackageRoot}`
-          const rawIdentifier = module.identifier
-          if (rawIdentifier) {
-            module.identifier = () => {
-              return rawIdentifier.call(module) + postfix
+          // ContextModule/RawModule/ExternalModule等只在独立分包的情况下添加分包标记，其余默认不添加
+          const hackModuleIdentifier = (module) => {
+            const postfix = `|independent=${independent}|${currentPackageRoot}`
+            const rawIdentifier = module.identifier
+            if (rawIdentifier && !rawIdentifier.__mpxHacked) {
+              module.identifier = () => {
+                return rawIdentifier.call(module) + postfix
+              }
+              module.identifier.__mpxHacked = true
             }
           }
+          hackModuleIdentifier(module)
+          const rawCallback = callback
+          callback = (err, module) => {
+            // 因为文件缓存的存在，前面hack identifier的行为对于从文件缓存中创建得到的module并不生效，因此需要在回调中进行二次hack处理
+            if (err) return rawCallback(err)
+            hackModuleIdentifier(module)
+            rawCallback(null, module)
+          }
         }
         return rawAddModule.call(compilation, module, callback)
       }
@@ -951,6 +964,9 @@ class MpxWebpackPlugin {
                 parser.state.current.addDependency(dep)
               }
               return true
+            } else {
+              compilation.errors.push(new Error(`The require async JS [${request}] need to declare subpackage name by root`))
+              return true
             }
           }
         }

package/lib/json-compiler/helper.js

@@ -12,7 +12,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
   const resolveMode = mpx.resolveMode
   const externals = mpx.externals
   const root = mpx.projectRoot
-  const publicPath = loaderContext._compilation.outputOptions.publicPath || ''
+  const publicPath = loaderContext._compilation?.outputOptions.publicPath || ''
   const pathHash = mpx.pathHash
   const getOutputPath = mpx.getOutputPath
   const mode = mpx.mode

package/lib/json-compiler/index.js

@@ -96,6 +96,7 @@ module.exports = function (content) {
             } else {
               fs.readFile(file, (err, content) => {
                 if (err) return callback(err)
+                if (!this._compilation) return callback()
                 let targetPath = path.relative(context, file)
                 this._compilation.assets[targetPath] = {
                   size: function size () {
@@ -350,7 +351,7 @@ module.exports = function (content) {
     }
 
     const recordIndependent = (root, request) => {
-      this._module.addPresentationalDependency(new RecordIndependentDependency(root, request))
+      this._module && this._module.addPresentationalDependency(new RecordIndependentDependency(root, request))
     }
 
     const processIndependent = (otherConfig, context, tarRoot, callback) => {

package/lib/platform/template/wx/index.js

@@ -181,9 +181,36 @@ module.exports = function getSpec ({ warn, error }) {
           }
         }
       },
+      {
+        // style样式绑定
+        test: /^(style|wx:style)$/,
+        web ({ value }, { el }) {
+          if (el.isStyleParsed) {
+            return false
+          }
+          let styleBinding = []
+          el.isStyleParsed = true
+          el.attrsList.map((item, index) => {
+            const parsed = parseMustache(item.value)
+            if (item.name === 'style') {
+              if (parsed.hasBinding || parsed.result.indexOf('rpx') > -1) {
+                styleBinding.push(parseMustache(item.value).result)
+              } else {
+                styleBinding.push(JSON.stringify(item.value))
+              }
+            } else if (item.name === 'wx:style') {
+              styleBinding.push(parseMustache(item.value).result)
+            }
+          })
+          return {
+            name: ':style',
+            value: `[${styleBinding}] | transRpxStyle`
+          }
+        }
+      },
       {
         // 样式类名绑定
-        test: /^wx:(class|style)$/,
+        test: /^wx:class$/,
         web ({ name, value }) {
           const dir = this.test.exec(name)[1]
           const parsed = parseMustache(value)

package/lib/resolver/FixDescriptionInfoPlugin.js

@@ -0,0 +1,28 @@
+const path = require('path')
+
+module.exports = class FixDescriptionInfoPlugin {
+  apply (resolver) {
+    resolver.hooks.result.tap('FixDescriptionInfoPlugin', (request) => {
+      const { path: resourcePath } = request
+      const segments = resourcePath.split(path.sep)
+      let rootIndex = -1
+      for (let i = segments.length - 1; i >= 0; i--) {
+        const segment = segments[i]
+        if (segment === 'node_modules') {
+          rootIndex = segments[i + 1].startsWith('@') ? i + 2 : i + 1
+          break
+        }
+      }
+      if (rootIndex !== -1) {
+        const descriptionFileRoot = segments.slice(0, rootIndex + 1).join(path.sep)
+        const descriptionFilePath = path.join(descriptionFileRoot, 'package.json')
+        if (descriptionFilePath !== request.descriptionFilePath) {
+          Object.assign(request, {
+            descriptionFileRoot,
+            descriptionFilePath
+          })
+        }
+      }
+    })
+  }
+}

package/lib/resolver/PackageEntryPlugin.js

@@ -16,7 +16,7 @@ module.exports = class PackageEntryPlugin {
    */
   apply (resolver) {
     const target = resolver.ensureHook(this.target)
-    resolver.getHook(this.source).tapAsync('PackagePlugin', (request, resolveContext, callback) => {
+    resolver.getHook(this.source).tapAsync('PackageEntryPlugin', (request, resolveContext, callback) => {
       if (request.miniprogram) return callback()
       let { path: resourcePath, descriptionFileData, descriptionFileRoot } = request
       if (request.miniprogram || !descriptionFileData) return callback()

package/lib/runtime/optionProcessor.js

@@ -85,6 +85,51 @@ export default function processOption (
       }
     })
 
+    Vue.filter('transRpxStyle', style => {
+      const defaultTransRpxFn = function (match, $1) {
+        const rpx2vwRatio = +(100 / 750).toFixed(8)
+        return '' + ($1 * rpx2vwRatio) + 'vw'
+      }
+      const transRpxFn = global.__mpxTransRpxFn || defaultTransRpxFn
+      const parsedStyleObj = {}
+      const rpxRegExpG = /\b(\d+(\.\d+)?)rpx\b/g
+      const parseStyleText = (cssText) => {
+        const listDelimiter = /;(?![^(]*\))/g
+        const propertyDelimiter = /:(.+)/
+        if (typeof cssText === 'string') {
+          cssText.split(listDelimiter).forEach((item) => {
+            if (item) {
+              var tmp = item.split(propertyDelimiter)
+              tmp.length > 1 && (parsedStyleObj[tmp[0].trim()] = tmp[1].trim())
+            }
+          })
+        } else if (typeof cssText === 'object') {
+          if (Array.isArray(cssText)) {
+            cssText.forEach(cssItem => {
+              parseStyleText(cssItem)
+            })
+          } else {
+            Object.assign(parsedStyleObj, cssText)
+          }
+        }
+      }
+      const transRpxStyleFn = (val) => {
+        if (typeof val === 'string' && val.indexOf('rpx') > 0) {
+          return val.replace(rpxRegExpG, transRpxFn).replace(/"/g, '')
+        }
+        return val
+      }
+      if (style) {
+        style.forEach(item => {
+          parseStyleText(item)
+          for (let key in parsedStyleObj) {
+            parsedStyleObj[key] = transRpxStyleFn(parsedStyleObj[key])
+          }
+        })
+      }
+      return parsedStyleObj
+    })
+
     const routes = []
 
     for (const pagePath in pagesMap) {

package/lib/template-compiler/compiler.js

@@ -1901,20 +1901,20 @@ function getVirtualHostRoot (options, meta) {
 }
 
 function processShow (el, options, root) {
+  // 开启 virtualhost 全部走 props 传递处理
+  // 未开启 virtualhost 直接绑定 display:none 到节点上
   let show = getAndRemoveAttr(el, config[mode].directive.show).val
   if (mode === 'swan') show = wrapMustache(show)
-  let processFlag = el.parent === root
-  // 当ali且未开启virtualHost时，mpxShow打到根节点上
-  if (mode === 'ali' && !options.hasVirtualHost) processFlag = el === root
-  if (options.isComponent && processFlag && isRealNode(el)) {
-    if (show !== undefined) {
-      show = `{{${parseMustache(show).result}&&mpxShow}}`
-    } else {
-      show = '{{mpxShow}}'
+
+  if (options.hasVirtualHost) {
+    if (options.isComponent && el.parent === root && isRealNode(el)) {
+      if (show !== undefined) {
+        show = `{{${parseMustache(show).result}&&mpxShow}}`
+      } else {
+        show = '{{mpxShow}}'
+      }
     }
-  }
-  if (show !== undefined) {
-    if (isComponentNode(el, options)) {
+    if (isComponentNode(el, options) && show !== undefined) {
       if (show === '') {
         show = '{{false}}'
       }
@@ -1923,6 +1923,14 @@ function processShow (el, options, root) {
         value: show
       }])
     } else {
+      processShowStyle()
+    }
+  } else {
+    processShowStyle()
+  }
+
+  function processShowStyle () {
+    if (show !== undefined) {
       const showExp = parseMustache(show).result
       let oldStyle = getAndRemoveAttr(el, 'style').val
       oldStyle = oldStyle ? oldStyle + ';' : ''

package/lib/utils/eval-json-js.js

@@ -1,6 +1,7 @@
 const path = require('path')
 
 module.exports = function evalJSONJS (source, filename, loaderContext) {
+  if (!loaderContext._compiler) return {}
   const fs = loaderContext._compiler.inputFileSystem
   const defs = loaderContext.getMpx().defs
   const defKeys = Object.keys(defs)

package/lib/utils/get-entry-name.js

@@ -1,8 +1,8 @@
 module.exports = function (loaderContext) {
-  const compilation = loaderContext._compilation
-  const moduleGraph = compilation.moduleGraph
+  if (!loaderContext._compilation) return ''
+  const moduleGraph = loaderContext._compilation.moduleGraph
   let entryName = ''
-  for (const [name, { dependencies }] of compilation.entries) {
+  for (const [name, { dependencies }] of loaderContext._compilation.entries) {
     const entryModule = moduleGraph.getModule(dependencies[0])
     if (entryModule.resource === loaderContext.resource) {
       entryName = name

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

@@ -5,7 +5,6 @@ const async = require('async')
 const { JSON_JS_EXT } = require('./const')
 
 module.exports = function getJSONContent (json, loaderContext, callback) {
-  // error process
   if (!loaderContext._compiler) return callback(null, '{}')
   const fs = loaderContext._compiler.inputFileSystem
   async.waterfall([

package/lib/web/processJSON.js

@@ -219,8 +219,7 @@ module.exports = function (json, {
           }
 
           pagesMap[resourcePath] = outputPath
-          loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'page', outputPath))
-
+          loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'page', outputPath))
           localPagesMap[outputPath] = {
             resource: addQuery(resource, { isPage: true }),
             async: tarRoot || queryObj.async,
@@ -269,8 +268,7 @@ module.exports = function (json, {
           }
           const { resourcePath, queryObj } = parseRequest(resource)
           componentsMap[resourcePath] = outputPath
-          loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'component', outputPath))
-
+          loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'component', outputPath))
           localComponentsMap[name] = {
             resource: addQuery(resource, {
               isComponent: true,

package/lib/web/processScript.js

@@ -129,8 +129,8 @@ module.exports = function (script, {
   global.__networkTimeout = ${JSON.stringify(jsonConfig.networkTimeout)}
   global.__mpxGenericsMap = {}
   global.__style = ${JSON.stringify(jsonConfig.style || 'v1')}
-  global.__mpxPageConfig = ${JSON.stringify(jsonConfig.window)}\n`
-
+  global.__mpxPageConfig = ${JSON.stringify(jsonConfig.window)}
+  global.__mpxTransRpxFn = ${mpx.webConfig.transRpxFn}\n`
         if (i18n) {
           const i18nObj = Object.assign({}, i18n)
           content += `  import VueI18n from 'vue-i18n'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.18",
+  "version": "2.7.24",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "5cca51d77d97143319c895dab301ef9a789ce40f"
+  "gitHead": "1764785d4da33a7ea9004edc7ea18596262c7969"
 }