@mpxjs/webpack-plugin 2.8.38 → 2.8.40-beta.0

package/lib/dependencies/ResolveDependency.js

@@ -35,6 +35,15 @@ class ResolveDependency extends NullDependency {
     return pagesMap[resourcePath] || currentComponentsMap[resourcePath] || mainComponentsMap[resourcePath] || currentStaticResourcesMap[resourcePath] || mainStaticResourcesMap[resourcePath] || ''
   }
 
+  isPartialCompileFilteredPage (resource) {
+    const { compilation } = this
+    if (!compilation) return ''
+    const mpx = compilation.__mpx__
+    const { partialCompileFilteredPagesMap } = mpx
+    const { resourcePath } = parseRequest(resource)
+    return partialCompileFilteredPagesMap[resourcePath]
+  }
+
   // resolved可能会动态变更，需用此更新hash
   updateHash (hash, context) {
     this.resolved = this.getResolved()
@@ -42,7 +51,9 @@ class ResolveDependency extends NullDependency {
     if (this.resolved) {
       hash.update(this.resolved)
     } else {
-      compilation.errors.push(new Error(`Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
+      if (!this.isPartialCompileFilteredPage(resource)) {
+        compilation.errors.push(new Error(`Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
+      }
     }
     super.updateHash(hash, context)
   }

package/lib/index.js

@@ -38,7 +38,6 @@ const FlagPluginDependency = require('./dependencies/FlagPluginDependency')
 const RemoveEntryDependency = require('./dependencies/RemoveEntryDependency')
 const RecordVueContentDependency = require('./dependencies/RecordVueContentDependency')
 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')
@@ -55,6 +54,7 @@ const jsonThemeCompilerPath = normalize.lib('json-compiler/theme')
 const jsonPluginCompilerPath = normalize.lib('json-compiler/plugin')
 const extractorPath = normalize.lib('extractor')
 const async = require('async')
+const { parseQuery } = require('loader-utils')
 const stringifyLoadersAndResource = require('./utils/stringify-loaders-resource')
 const emitFile = require('./utils/emit-file')
 const { MPX_PROCESSED_FLAG, MPX_DISABLE_EXTRACTOR_CACHE } = require('./utils/const')
@@ -381,7 +381,29 @@ class MpxWebpackPlugin {
     let mpx
 
     if (this.options.partialCompile) {
-      new PartialCompilePlugin(this.options.partialCompile).apply(compiler)
+      function isResolvingPage (obj) {
+        // valid query should start with '?'
+        const query = obj.query || '?'
+        return parseQuery(query).isPage
+      }
+      // new PartialCompilePlugin(this.options.partialCompile).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 (isResolvingPage(obj) && !matchCondition(obj.path, this.options.partialCompile)) {
+                if (mpx) mpx.partialCompileFilteredPagesMap[obj.path] = true
+                obj.path = false
+              }
+              callback(null, obj)
+            })
+          })
+          return hook
+        }
+      })
     }
 
     const getPackageCacheGroup = packageName => {
@@ -595,6 +617,7 @@ class MpxWebpackPlugin {
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
           enableRequireAsync: this.options.mode === 'wx' || (this.options.mode === 'ali' && this.options.enableAliRequireAsync),
+          partialCompileFilteredPagesMap: {},
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
               return hash(path.relative(this.options.projectRoot, resourcePath))

package/lib/json-compiler/default-page.mpx

@@ -0,0 +1,3 @@
+<template>
+  <view>局部构建兜底页面</view>
+</template>

package/lib/json-compiler/helper.js

@@ -6,6 +6,7 @@ const parseRequest = require('../utils/parse-request')
 const addQuery = require('../utils/add-query')
 const loaderUtils = require('loader-utils')
 const resolve = require('../utils/resolve')
+const { RESOLVE_IGNORED_ERR } = require('../utils/const')
 
 module.exports = function createJSONHelper ({ loaderContext, emitWarning, customGetDynamicEntry }) {
   const mpx = loaderContext.getMpx()
@@ -101,7 +102,15 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
     // 增加 page 标识
     page = addQuery(page, { isPage: true })
     resolve(context, page, loaderContext, (err, resource) => {
-      if (err) return callback(err)
+      if (err) {
+        if (err === RESOLVE_IGNORED_ERR && tarRoot) {
+          const defaultPage = require.resolve('./default-page.mpx') + `?resourcePath=${context}/${tarRoot}/pages/index.mpx`
+          resource = defaultPage
+          aliasPath = ''
+        } else {
+          return callback(err)
+        }
+      }
       const { resourcePath, queryObj: { isFirst } } = parseRequest(resource)
       const ext = path.extname(resourcePath)
       let outputPath

package/lib/json-compiler/index.js

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

package/lib/wxss/runtime/api.js

@@ -2,6 +2,7 @@
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
 */
+/* eslint no-var: off */
 module.exports = function (cssWithMappingToString) {
   var list = []
 
@@ -51,7 +52,7 @@ module.exports = function (cssWithMappingToString) {
     var alreadyImportedModules = {}
 
     if (dedupe) {
-      for (let k = 0; k < this.length; k++) {
+      for (var k = 0; k < this.length; k++) {
         var id = this[k][0]
 
         if (id != null) {
@@ -60,8 +61,8 @@ module.exports = function (cssWithMappingToString) {
       }
     }
 
-    for (var k = 0; k < modules.length; k++) {
-      var item = [].concat(modules[k])
+    for (var k1 = 0; k1 < modules.length; k1++) {
+      var item = [].concat(modules[k1])
 
       if (dedupe && alreadyImportedModules[item[0]]) {
         continue

package/lib/wxss/runtime/sourceMaps.js

@@ -1,3 +1,4 @@
+/* eslint no-var: off */
 module.exports = function (item) {
   var content = item[1]
   var cssMapping = item[3]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.38",
+  "version": "2.8.40-beta.0",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -82,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "af1a776c06ec53a5005e3b3a0f444de80ff2cd2b"
+  "gitHead": "03d5373a8526f23e00f05917aaf84f6fbb7ef98f"
 }

package/lib/partial-compile/index.js

@@ -1,35 +0,0 @@
-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