@mpxjs/webpack-plugin 2.7.15 → 2.7.16

package/lib/index.js

@@ -33,6 +33,7 @@ const DynamicEntryDependency = require('./dependencies/DynamicEntryDependency')
 const FlagPluginDependency = require('./dependencies/FlagPluginDependency')
 const RemoveEntryDependency = require('./dependencies/RemoveEntryDependency')
 const SplitChunksPlugin = require('webpack/lib/optimize/SplitChunksPlugin')
+const PartialCompilePlugin = require('./partial-compile/index')
 const fixRelative = require('./utils/fix-relative')
 const parseRequest = require('./utils/parse-request')
 const { matchCondition } = require('./utils/match-condition')
@@ -159,6 +160,7 @@ class MpxWebpackPlugin {
       cssLangs: ['css', 'less', 'stylus', 'scss', 'sass']
     }, options.nativeConfig)
     options.webConfig = options.webConfig || {}
+    options.partialCompile = options.mode !== 'web' && options.partialCompile
     this.options = options
     // Hack for buildDependencies
     const rawResolveBuildDependencies = FileSystemInfo.prototype.resolveBuildDependencies
@@ -366,6 +368,10 @@ class MpxWebpackPlugin {
 
     let mpx
 
+    if (this.options.partialCompile) {
+      new PartialCompilePlugin(this.options.partialCompile).apply(compiler)
+    }
+
     const getPackageCacheGroup = packageName => {
       if (packageName === 'main') {
         return {

package/lib/json-compiler/helper.js

@@ -97,6 +97,8 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
     if (resolveMode === 'native') {
       page = urlToRequest(page)
     }
+    // 增加 page 标识
+    page = addQuery(page, { isPage: true })
     resolve(context, page, loaderContext, (err, resource) => {
       if (err) return callback(err)
       const { resourcePath, queryObj: { isFirst } } = parseRequest(resource)

package/lib/json-compiler/index.js

@@ -571,10 +571,14 @@ module.exports = function (content) {
       delete json.subPackages
       json.pages = localPages
       for (let root in subPackagesCfg) {
-        if (!json.subPackages) {
-          json.subPackages = []
+        const subPackageCfg = subPackagesCfg[root]
+        // 分包不存在 pages，输出 subPackages 字段会报错
+        if (subPackageCfg.pages.length) {
+          if (!json.subPackages) {
+            json.subPackages = []
+          }
+          json.subPackages.push(subPackageCfg)
         }
-        json.subPackages.push(subPackagesCfg[root])
       }
       const processOutput = (output) => {
         output = processDynamicEntry(output)

package/lib/partial-compile/index.js

@@ -0,0 +1,35 @@
+const { matchCondition } = require('../utils/match-condition')
+const { parseQuery } = require('loader-utils')
+
+class MpxPartialCompilePlugin {
+  constructor (condition) {
+    this.condition = condition
+  }
+
+  isResolvingPage (obj) {
+    // valid query should start with '?'
+    const query = obj.query || '?'
+    return parseQuery(query).isPage
+  }
+
+  apply (compiler) {
+    compiler.resolverFactory.hooks.resolver.intercept({
+      factory: (type, hook) => {
+        hook.tap('MpxPartialCompilePlugin', (resolver) => {
+          resolver.hooks.result.tapAsync({
+            name: 'MpxPartialCompilePlugin',
+            stage: -100
+          }, (obj, resolverContext, callback) => {
+            if (this.isResolvingPage(obj) && !matchCondition(obj.path, this.condition)) {
+              obj.path = false
+            }
+            callback(null, obj)
+          })
+        })
+        return hook
+      }
+    })
+  }
+}
+
+module.exports = MpxPartialCompilePlugin

package/lib/template-compiler/compiler.js

@@ -1822,7 +1822,8 @@ function processAliAddComponentRootView (el, options) {
     { condition: /^(on|catch)TouchCancel$/, action: 'clone' },
     { condition: /^(on|catch)LongTap$/, action: 'clone' },
     { condition: /^data-/, action: 'clone' },
-    { condition: 'style', action: 'move' }
+    { condition: /^style$/, action: 'move' },
+    { condition: /^slot$/, action: 'move' }
   ]
   const processAppendAttrsRules = [
     { name: 'class', value: `${MPX_ROOT_VIEW} host-${options.moduleId}` }
@@ -1835,13 +1836,8 @@ function processAliAddComponentRootView (el, options) {
   }
 
   function processMove (attr) {
-    let movedAttr = getAndRemoveAttr(el, attr.name)
-    if (movedAttr.has) {
-      newElAttrs.push({
-        name: attr,
-        value: movedAttr.val
-      })
-    }
+    getAndRemoveAttr(el, attr.name)
+    newElAttrs.push(attr)
   }
 
   function processAppendRules (el) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.7.15",
+  "version": "2.7.16",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "bf6b0d9938fecb4faafa2557c2c2caad1ea98535"
+  "gitHead": "7a2b5ae385cbd035172ec11bc0bfba84eff10243"
 }