@mpxjs/webpack-plugin 2.10.19 → 2.10.21

package/lib/dependencies/ResolveDependency.js

@@ -1,7 +1,7 @@
 const NullDependency = require('webpack/lib/dependencies/NullDependency')
 const parseRequest = require('../utils/parse-request')
 const makeSerializable = require('webpack/lib/util/makeSerializable')
-const { matchCondition } = require('../utils/match-condition')
+const { isPartialCompileExcluded } = require('../utils/partial-compile-rules')
 
 class ResolveDependency extends NullDependency {
   constructor (resource, packageName, issuerResource, range) {
@@ -35,7 +35,7 @@ class ResolveDependency extends NullDependency {
     const mainStaticResourcesMap = staticResourcesMap.main
     const resolveResult = pagesMap[resourcePath] || currentComponentsMap[resourcePath] || mainComponentsMap[resourcePath] || currentStaticResourcesMap[resourcePath] || mainStaticResourcesMap[resourcePath] || ''
     if (!resolveResult) {
-      if (!partialCompileRules || matchCondition(resourcePath, partialCompileRules)) {
+      if (!isPartialCompileExcluded(resourcePath, partialCompileRules, 'page') && !isPartialCompileExcluded(resourcePath, partialCompileRules, 'component')) {
         compilation.errors.push(new Error(`[Mpx json error]:Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
       }
     }

package/lib/index.js

@@ -51,7 +51,9 @@ const fixRelative = require('./utils/fix-relative')
 const parseRequest = require('./utils/parse-request')
 const { transSubpackage } = require('./utils/trans-async-sub-rules')
 const { matchCondition } = require('./utils/match-condition')
+const { getPartialCompileRules } = require('./utils/partial-compile-rules')
 const processDefs = require('./utils/process-defs')
+const { PERF_GROUPS, normalizePerfOptions } = require('./utils/normalize-perf-options')
 const config = require('./config')
 const hash = require('hash-sum')
 const nativeLoaderPath = normalize.lib('native-loader')
@@ -163,13 +165,24 @@ class MpxWebpackPlugin {
     options.transMpxRules = options.transMpxRules || {
       include: () => true
     }
+    // 归一化 perf 配置：{ enable, probes: [...] } → { enable, framework, user, ... }
+    // 分组未知 / typo 在此直接抛错，避免静默失效。
+    const perf = normalizePerfOptions(options.perf)
+    options.perf = perf
     // 通过默认defs配置实现mode及srcMode的注入，简化内部处理逻辑
     options.defs = Object.assign({}, options.defs, {
       __mpx_mode__: options.mode,
       __mpx_src_mode__: options.srcMode,
       __mpx_env__: options.env,
-      __mpx_dynamic_runtime__: options.dynamicRuntime
+      __mpx_dynamic_runtime__: options.dynamicRuntime,
+      // 总开关：@mpxjs/perf 包内部使用，决定 impl 是否进入 bundle。
+      __mpx_perf__: perf.enable
     })
+    // 分组开关：调用方点缀代码使用。开关粒度独立、产物 DCE 独立。
+    for (let i = 0; i < PERF_GROUPS.length; i++) {
+      const k = PERF_GROUPS[i]
+      options.defs[`__mpx_perf_${k}__`] = perf[k]
+    }
     // 批量指定源码mode
     options.modeRules = options.modeRules || {}
     options.generateBuildMap = options.generateBuildMap || false
@@ -494,13 +507,31 @@ class MpxWebpackPlugin {
 
     let mpx
 
-    if (this.options.partialCompileRules) {
+    const pagePartialCompileRules = getPartialCompileRules(this.options.partialCompileRules, 'page')
+    const componentPartialCompileRules = getPartialCompileRules(this.options.partialCompileRules, 'component')
+
+    if (pagePartialCompileRules || componentPartialCompileRules) {
       function isResolvingPage (obj) {
         // valid query should start with '?'
         const query = parseQuery(obj.query || '?')
         return query.isPage && !query.type
       }
 
+      function isResolvingComponent (obj) {
+        // valid query should start with '?'
+        const query = parseQuery(obj.query || '?')
+        return query.isComponent && !query.type
+      }
+
+      const replaceResource = (obj, target) => {
+        const infix = obj.query ? '&' : '?'
+        obj.query += `${infix}resourcePath=${obj.path}`
+        obj.path = target
+      }
+
+      const defaultPagePath = require.resolve('./runtime/components/wx/default-page.mpx')
+      const defaultComponentPath = require.resolve('./runtime/components/wx/default-component.mpx')
+
       // new PartialCompilePlugin(this.options.partialCompile).apply(compiler)
       compiler.resolverFactory.hooks.resolver.intercept({
         factory: (type, hook) => {
@@ -509,13 +540,13 @@ class MpxWebpackPlugin {
               name: 'MpxPartialCompilePlugin',
               stage: -100
             }, (obj, resolverContext, callback) => {
-              if (obj.path.startsWith(require.resolve('./runtime/components/wx/default-page.mpx'))) {
+              if (obj.path.startsWith(defaultPagePath) || obj.path.startsWith(defaultComponentPath)) {
                 return callback(null, obj)
               }
-              if (isResolvingPage(obj) && !matchCondition(obj.path, this.options.partialCompileRules)) {
-                const infix = obj.query ? '&' : '?'
-                obj.query += `${infix}resourcePath=${obj.path}`
-                obj.path = require.resolve('./runtime/components/wx/default-page.mpx')
+              if (pagePartialCompileRules && isResolvingPage(obj) && !matchCondition(obj.path, pagePartialCompileRules)) {
+                replaceResource(obj, defaultPagePath)
+              } else if (componentPartialCompileRules && isResolvingComponent(obj) && !matchCondition(obj.path, componentPartialCompileRules)) {
+                replaceResource(obj, defaultComponentPath)
               }
               callback(null, obj)
             })

package/lib/json-compiler/helper.js

@@ -51,6 +51,8 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
     if (resolveMode === 'native') {
       component = urlToRequest(component)
     }
+    // 增加 component 标识，与 page 的 partialCompile 处理保持一致
+    component = addQuery(component, { isComponent: true })
     resolve(context, component, loaderContext, (err, resource, info) => {
       if (err) return callback(err)
       const { resourcePath, queryObj } = parseRequest(resource)
@@ -168,14 +170,14 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
     })
   }
 
-  const fillInComponentPlaceholder = ({ jsonObj, name: componentName, placeholder, placeholderEntry, resolveResourcePathMap }, callback) => {
+  const fillInComponentPlaceholder = ({ jsonObj, name: componentName, placeholder, placeholderEntry, resolveResourcePathMap }) => {
     let placeholderComponentName = placeholder.name
     const componentPlaceholder = jsonObj.componentPlaceholder || {}
     if (componentPlaceholder[componentName]) {
-      callback()
       return
     }
     jsonObj.componentPlaceholder = componentPlaceholder
+    componentPlaceholder[componentName] = placeholderComponentName
     if (placeholderEntry) {
       if (resolveResourcePathMap.has(placeholderComponentName) && resolveResourcePathMap.get(placeholderComponentName) !== placeholder.resourcePath) {
         // 如果存在placeholder与已有usingComponents冲突, 重新生成一个组件名，在当前组件后增加一个数字
@@ -184,16 +186,15 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
         while (jsonObj.usingComponents[newPlaceholder]) {
           newPlaceholder = placeholderComponentName + ++i
         }
-        placeholderComponentName = newPlaceholder
+        componentPlaceholder[componentName] = placeholderComponentName = newPlaceholder
       }
       jsonObj.usingComponents[placeholderComponentName] = placeholderEntry
       resolveResourcePathMap.set(placeholderComponentName, placeholder.resourcePath)
+      return {
+        name: placeholderComponentName,
+        entry: placeholderEntry
+      }
     }
-    componentPlaceholder[componentName] = placeholderComponentName
-    callback(null, {
-      name: placeholderComponentName,
-      entry: placeholderEntry
-    })
   }
 
   const getNormalizePlaceholder = (placeholder) => {
@@ -218,10 +219,10 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
           processComponent(placeholder.resource, context, { relativePath }, (err, entry, { resourcePath }) => {
             if (err) return callback(err)
             placeholder.resourcePath = resourcePath
-            fillInComponentPlaceholder({ jsonObj, name, placeholder, placeholderEntry: entry, resolveResourcePathMap }, callback)
+            callback(null, fillInComponentPlaceholder({ jsonObj, name, placeholder, placeholderEntry: entry, resolveResourcePathMap }))
           })
         } else {
-          fillInComponentPlaceholder({ jsonObj, name, placeholder }, callback)
+          callback(null, fillInComponentPlaceholder({ jsonObj, name, placeholder }))
         }
       } else {
         if (!jsonObj.componentPlaceholder || !jsonObj.componentPlaceholder[name]) {

package/lib/json-compiler/index.js

@@ -46,15 +46,15 @@ module.exports = function (content) {
   const fs = this._compiler.inputFileSystem
   const runtimeCompile = queryObj.isDynamic
 
-  const emitWarning = (msg) => {
+  const emitWarning = (msg, loc) => {
     this.emitWarning(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json error][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 
-  const emitError = (msg) => {
+  const emitError = (msg, loc) => {
     this.emitError(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json error][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 
@@ -180,6 +180,9 @@ module.exports = function (content) {
     waterfall: true,
     warn: emitWarning,
     error: emitError,
+    diagnostic: {
+      file: resourcePath
+    },
     data: {
       // polyfill global usingComponents
       globalComponents: mpx.globalComponents

package/lib/json-compiler/plugin.js

@@ -21,15 +21,15 @@ module.exports = function (source) {
 
   this._module.addPresentationalDependency(new FlagPluginDependency())
 
-  const emitWarning = (msg) => {
+  const emitWarning = (msg, loc) => {
     this.emitWarning(
-      new Error('[Mpx json warning][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json warning][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 
-  const emitError = (msg) => {
+  const emitError = (msg, loc) => {
     this.emitError(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json error][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 

package/lib/loader.js

@@ -53,15 +53,15 @@ module.exports = function (content) {
   const autoScope = matchCondition(resourcePath, mpx.autoScopeRules)
   const isRuntimeMode = queryObj.isDynamic
 
-  const emitWarning = (msg) => {
+  const emitWarning = (msg, loc) => {
     this.emitWarning(
-      new Error('[Mpx json warning][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json warning][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 
-  const emitError = (msg) => {
+  const emitError = (msg, loc) => {
     this.emitError(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json error][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 

package/lib/native-loader.js

@@ -105,15 +105,15 @@ module.exports = function (content) {
     })
   }
 
-  const emitWarning = (msg) => {
+  const emitWarning = (msg, loc) => {
     this.emitWarning(
-      new Error('[Mpx json warning][native-loader][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json warning][native-loader][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
 
-  const emitError = (msg) => {
+  const emitError = (msg, loc) => {
     this.emitError(
-      new Error('[Mpx json error][native-loader][' + this.resource + ']: ' + msg)
+      new Error('[Mpx json error][native-loader][' + (loc || this.resourcePath) + ']: ' + msg)
     )
   }
   let ctorType = pagesMap[resourcePath]

package/lib/parser.js

@@ -14,7 +14,7 @@ module.exports = (content, { filePath, needMap, mode, env }) => {
   output = compiler.parseComponent(content, {
     mode,
     filePath,
-    pad: 'line',
+    pad: mode !== 'web' && 'line',
     env
   })
   if (needMap) {

package/lib/platform/create-diagnostic.js

@@ -0,0 +1,168 @@
+const {
+  normalizeLoc,
+  createCodeFrame,
+  originalPositionFor,
+  readSource
+} = require('../utils/source-location')
+
+function formatAttr (attr) {
+  if (!attr) return ''
+  if (attr.value === true || attr.value == null) return attr.name
+  return `${attr.name}="${attr.value}"`
+}
+
+function formatTarget (context, extra) {
+  const target = extra && extra.target
+  if (target) {
+    if (target.kind === 'css-decl') return `${target.prop}: ${target.value}`
+    if (target.kind === 'css-atrule') return `@${target.name}${target.params ? ' ' + target.params : ''}`
+    if (target.kind === 'selector') return target.value
+    if (target.kind === 'event') return target.name
+  }
+  const input = context && context.input
+  const data = context && context.data
+  if (data && data.attr) {
+    return `<${data.el && data.el.tag}${formatAttr(data.attr) ? ' ' + formatAttr(data.attr) : ''}>`
+  }
+  if (input && input.prop) {
+    return `${input.prop}: ${input.value}`
+  }
+  if (input && input.selector) {
+    return input.selector
+  }
+  return ''
+}
+
+function inferPath (context, extra) {
+  if (extra && extra.path) {
+    return Array.isArray(extra.path) ? extra.path.join('.') : extra.path
+  }
+  const data = context && context.data
+  const meta = context && context.meta
+  if (data && meta && Array.isArray(meta.paths)) {
+    const paths = meta.paths.join('|')
+    return (data.pathArr || []).concat(paths).filter(Boolean).join('.')
+  }
+}
+
+function formatValue (value) {
+  if (value === undefined) return 'undefined'
+  let result
+  try {
+    result = JSON.stringify(value)
+  } catch (e) {
+    result = String(value)
+  }
+  if (result === undefined) result = String(value)
+  return result.length > 120 ? result.slice(0, 117) + '...' : result
+}
+
+function inferJsonTarget (context, extra) {
+  const path = inferPath(context, extra)
+  if (!path) return ''
+  if (extra && Object.prototype.hasOwnProperty.call(extra, 'value')) {
+    return `${path}: ${formatValue(extra.value)}`
+  }
+  return path
+}
+
+function inferLoc (context, extra) {
+  if (extra) {
+    if (extra.loc) return normalizeLoc(extra.loc)
+    if (extra.node && extra.node.source) return normalizeLoc(extra.node.source.start)
+    if (extra.decl && extra.decl.source) return normalizeLoc(extra.decl.source.start)
+    if (extra.attr) return normalizeLoc(extra.attr.loc)
+    if (extra.el) return normalizeLoc(extra.el.loc)
+  }
+  const input = context && context.input
+  const data = context && context.data
+  if (data) {
+    if (data.attr && data.attr.loc) return normalizeLoc(data.attr.loc)
+    if (data.el && data.el.loc) return normalizeLoc(data.el.loc)
+  }
+  if (input) {
+    if (input.decl && input.decl.source) return normalizeLoc(input.decl.source.start)
+    if (input.rule && input.rule.source) return normalizeLoc(input.rule.source.start)
+    if (input.loc) return normalizeLoc(input.loc)
+  }
+}
+
+function inferSourceMap (context, extra, base) {
+  if (extra && extra.sourceMap) return extra.sourceMap
+  if (context && context.input && context.input.sourceMap) return context.input.sourceMap
+  return base && base.sourceMap
+}
+
+function createDiagnostic ({
+  type,
+  mode,
+  srcMode,
+  warn,
+  error,
+  diagnostic = {}
+}) {
+  const stack = []
+  const file = diagnostic.file
+  const source = diagnostic.source
+  const inputFileSystem = diagnostic.inputFileSystem
+
+  function withContext (context, fn) {
+    stack.push(context)
+    try {
+      return fn()
+    } finally {
+      stack.pop()
+    }
+  }
+
+  function format (msg, extra) {
+    msg = msg && msg.message ? msg.message : String(msg)
+    const context = stack[stack.length - 1]
+    const lines = []
+    const loc = inferLoc(context, extra)
+    const sourceMap = inferSourceMap(context, extra, diagnostic)
+    let finalFile = file
+    let finalLoc = loc
+    let finalSource = source
+    let original
+    if (sourceMap && loc) {
+      original = originalPositionFor(sourceMap, loc)
+      if (original) {
+        finalFile = original.file
+        finalLoc = original.loc
+        finalSource = original.source || readSource(original.file, inputFileSystem)
+      }
+    }
+    const hasLoc = finalLoc && finalLoc.start
+    const locText = finalFile && hasLoc
+      ? `${finalFile}:${finalLoc.start.line}:${finalLoc.start.column}`
+      : ''
+    lines.push(msg)
+    const target = formatTarget(context, extra) || (type === 'json' ? inferJsonTarget(context, extra) : inferPath(context, extra))
+    if (target) lines.push(`Target: ${target}`)
+    if (srcMode || mode) lines.push(`Mode: ${srcMode || ''}${srcMode && mode ? ' -> ' : ''}${mode || ''}`)
+    const frame = createCodeFrame(finalSource, finalLoc)
+    if (frame) {
+      lines.push('')
+      lines.push(frame)
+    }
+    return {
+      message: lines.join('\n'),
+      loc: locText || undefined
+    }
+  }
+
+  return {
+    warn (msg, extra) {
+      const result = format(msg, extra)
+      warn && warn(result.message, result.loc)
+    },
+    error (msg, extra) {
+      const result = format(msg, extra)
+      error && error(result.message, result.loc)
+    },
+    withContext
+  }
+}
+
+module.exports = createDiagnostic

package/lib/platform/index.js

@@ -1,4 +1,5 @@
 const runRules = require('./run-rules')
+const createDiagnostic = require('./create-diagnostic')
 
 module.exports = function getRulesRunner ({
   type,
@@ -10,7 +11,8 @@ module.exports = function getRulesRunner ({
   mainKey,
   waterfall,
   warn,
-  error
+  error,
+  diagnostic
 }) {
   const specMap = {
     template: {
@@ -23,13 +25,24 @@ module.exports = function getRulesRunner ({
       wx: require('./json/wx')
     }
   }
-  const spec = specMap[type] && specMap[type][srcMode] && specMap[type][srcMode]({ warn, error })
+  diagnostic = createDiagnostic({
+    type,
+    mode,
+    srcMode,
+    warn,
+    error,
+    diagnostic
+  })
+  const spec = specMap[type] && specMap[type][srcMode] && specMap[type][srcMode]({
+    warn: diagnostic.warn,
+    error: diagnostic.error
+  })
   if (spec && spec.supportedModes.indexOf(mode) > -1) {
     const normalizeTest = spec.normalizeTest
     const mainRules = mainKey ? spec[mainKey] : spec
     if (mainRules) {
       return function (input) {
-        return runRules(mainRules, input, { mode, data, meta, testKey, waterfall, normalizeTest })
+        return runRules(mainRules, input, { mode, data, meta, testKey, waterfall, normalizeTest, diagnostic })
       }
     }
   }