@mpxjs/webpack-plugin 2.6.114-alpha.8 → 2.6.115

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

@@ -10,7 +10,7 @@ const normalize = require('../../../utils/normalize')
 
 module.exports = function getSpec ({ warn, error }) {
   const spec = {
-    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'tenon'],
+    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd'],
     // props预处理
     preProps: [],
     // props后处理
@@ -24,15 +24,6 @@ module.exports = function getSpec ({ warn, error }) {
               value: parsed.result
             }
           }
-        },
-        tenon ({ name, value }) {
-          const parsed = parseMustache(value)
-          if (parsed.hasBinding) {
-            return {
-              name: name === 'animation' ? 'v-' + name : ':' + name,
-              value: parsed.result
-            }
-          }
         }
       }
     ],
@@ -95,16 +86,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'v-for',
             value: `(${itemName}, ${indexName}) in ${parsed.result}`
           }
-        },
-        tenon ({ value }, { el }) {
-          const parsed = parseMustache(value)
-          const attrsMap = el.attrsMap
-          const itemName = attrsMap['wx:for-item'] || 'item'
-          const indexName = attrsMap['wx:for-index'] || 'index'
-          return {
-            name: 'v-for',
-            value: `(${itemName}, ${indexName}) in ${parsed.result}`
-          }
         }
       },
       {
@@ -130,25 +111,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: ':key',
             value
           }
-        },
-        tenon ({ value }, { el }) {
-          // vue的template中不能包含key，对应于小程序中的block
-          if (el.tag === 'block') return false
-          const itemName = el.attrsMap['wx:for-item'] || 'item'
-          const keyName = value
-          if (value === '*this') {
-            value = itemName
-          } else {
-            if (isValidIdentifierStr(keyName)) {
-              value = `${itemName}.${keyName}`
-            } else {
-              value = `${itemName}['${keyName}']`
-            }
-          }
-          return {
-            name: ':key',
-            value
-          }
         }
       },
       {
@@ -159,9 +121,6 @@ module.exports = function getSpec ({ warn, error }) {
         },
         web () {
           return false
-        },
-        tenon () {
-          return false
         }
       },
       {
@@ -204,49 +163,6 @@ module.exports = function getSpec ({ warn, error }) {
               }
             ]
           }
-        },
-        tenon ({ value }, { el }) {
-          el.hasEvent = true
-          const attrsMap = el.attrsMap
-          const tagRE = /\{\{((?:.|\n|\r)+?)\}\}(?!})/
-          const stringify = JSON.stringify
-          const match = tagRE.exec(value)
-          if (match) {
-            const modelProp = attrsMap['wx:model-prop'] || 'value'
-            const modelEvent = attrsMap['wx:model-event'] || 'input'
-            const modelValuePathRaw = attrsMap['wx:model-value-path']
-            const modelValuePath = modelValuePathRaw === undefined ? 'value' : modelValuePathRaw
-            const modelFilter = attrsMap['wx:model-filter']
-            let modelValuePathArr
-            try {
-              modelValuePathArr = JSON5.parse(modelValuePath)
-            } catch (e) {
-              if (modelValuePath === '') {
-                modelValuePathArr = []
-              } else {
-                modelValuePathArr = modelValuePath.split('.')
-              }
-            }
-            let modelValue = match[1].trim()
-            return [
-              {
-                name: ':' + modelProp,
-                value: modelValue
-              },
-              {
-                name: 'mpxModelEvent',
-                value: modelEvent
-              },
-              {
-                name: 'mpxModelEventId',
-                value: Math.random().toString(36).substr(3, 8)
-              },
-              {
-                name: '@mpxModel',
-                value: `__model(${stringifyWithResolveComputed(modelValue)}, $event, ${stringify(modelValuePathArr)}, ${stringify(modelFilter)})`
-              }
-            ]
-          }
         }
       },
       {
@@ -265,44 +181,10 @@ 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)$/,
-        web ({ value }) {
-          const parsed = parseMustache(value)
-          return {
-            name: ':class',
-            value: parsed.result
-          }
-        },
-        tenon ({ name, value }) {
+        test: /^wx:(class|style)$/,
+        web ({ name, value }) {
           const dir = this.test.exec(name)[1]
           const parsed = parseMustache(value)
           return {
@@ -366,17 +248,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'v-' + dir,
             value: parsed.result
           }
-        },
-        tenon ({ name, value }) {
-          let dir = this.test.exec(name)[1]
-          const parsed = parseMustache(value)
-          if (dir === 'elif') {
-            dir = 'else-if'
-          }
-          return {
-            name: 'v-' + dir,
-            value: parsed.result
-          }
         }
       },
       // 事件
@@ -417,23 +288,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: rPrefix + rEventName + meta.modifierStr,
             value
           }
-        },
-        tenon ({ name, value }, { eventRules, el }) {
-          const match = this.test.exec(name)
-          const prefix = match[1]
-          const eventName = match[2]
-          const modifierStr = match[3] || ''
-          const meta = {
-            modifierStr
-          }
-          // 记录event监听信息用于后续判断是否需要使用内置基础组件
-          el.hasEvent = true
-          const rPrefix = runRules(spec.event.prefix, prefix, { mode: 'web', meta })
-          const rEventName = runRules(eventRules, eventName, { mode: 'web' })
-          return {
-            name: rPrefix + rEventName + meta.modifierStr,
-            value
-          }
         }
       },
       // 无障碍

package/lib/plugin-loader.js

@@ -0,0 +1,287 @@
+const path = require('path')
+const async = require('async')
+const JSON5 = require('json5')
+const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin')
+const parseRequest = require('./utils/parse-request')
+const toPosix = require('./utils/to-posix')
+const getMainCompilation = require('./utils/get-main-compilation')
+const isUrlRequestRaw = require('./utils/is-url-request')
+const loaderUtils = require('loader-utils')
+const normalize = require('./utils/normalize')
+const addQuery = require('./utils/add-query')
+const nativeLoaderPath = normalize.lib('native-loader')
+
+// webpack4中.json文件会走json parser，抽取内容的占位内容必须为合法json，否则会在parse阶段报错
+const defaultResultSource = '{}'
+
+// ali不导出的插件页面的固定prefix
+const NO_EXPORT = '__mpx_plugin_no_export_page__'
+
+module.exports = function (source) {
+  // 该loader中会在每次编译中动态添加entry，不能缓存，否则watch不好使
+  this.cacheable(false)
+
+  const nativeCallback = this.async()
+  const mainCompilation = getMainCompilation(this._compilation)
+  const mpx = mainCompilation.__mpx__
+
+  mpx.isPluginMode = true
+
+  const isUrlRequest = r => isUrlRequestRaw(r, projectRoot)
+  const urlToRequest = r => loaderUtils.urlToRequest(r, projectRoot)
+  const resolve = (context, request, callback) => {
+    const { queryObj } = parseRequest(request)
+    context = queryObj.context || context
+    return this.resolve(context, request, callback)
+  }
+
+  const emitWarning = (msg) => {
+    this.emitWarning(
+      new Error('[plugin loader][' + this.resource + ']: ' + msg)
+    )
+  }
+
+  const emitError = (msg) => {
+    this.emitError(
+      new Error('[plugin loader][' + this.resource + ']: ' + msg)
+    )
+  }
+
+  if (!mpx) {
+    return nativeCallback(null, source)
+  }
+
+  const context = this.context
+  const packageName = 'main'
+  const pagesMap = mpx.pagesMap
+  const getOutputPath = mpx.getOutputPath
+  const componentsMap = mpx.componentsMap[packageName]
+  const getEntryNode = mpx.getEntryNode
+  const resolveMode = mpx.resolveMode
+  const projectRoot = mpx.projectRoot
+  const extract = mpx.extract
+  const pathHash = mpx.pathHash
+  const resourceName = this._compilation._preparedEntrypoints[0].name
+
+  const entryModule = this._module
+  // 通过rawRequest关联entryNode和entryModule
+  const entryRequest = entryModule.rawRequest
+  const entryType = 'Plugin'
+  const currentEntry = getEntryNode(entryRequest, entryType, entryModule)
+  // 最终输出中不需要为plugin.json产生chunk，而是使用extract直接输出json文件，删除plugin.json对应的entrypoint
+  this._compilation._preparedEntrypoints.pop()
+  // 为了在体积统计中能够统计到该entry，将其缓存在mpx.removedChunks中
+  mpx.removedChunks.push({
+    entryModule
+  })
+
+  let entryDeps = new Set()
+
+  let cacheCallback
+
+  const checkEntryDeps = (callback) => {
+    callback = callback || cacheCallback
+    if (callback && entryDeps.size === 0) {
+      callback()
+    } else {
+      cacheCallback = callback
+    }
+  }
+
+  const addEntrySafely = (resource, name, callback) => {
+    const dep = SingleEntryPlugin.createDependency(resource, name)
+    entryDeps.add(dep)
+    this._compilation.addEntry(this._compiler.context, dep, name, (err, module) => {
+      entryDeps.delete(dep)
+      checkEntryDeps()
+      callback(err, module)
+    })
+  }
+
+  // 初次处理json
+  const callback = (err) => {
+    checkEntryDeps(() => {
+      if (err) return nativeCallback(err)
+      if (mpx.mode === 'ali' && pluginEntry.pages) {
+        let publicPages = Object.keys(pluginEntry.pages).reduce((cur, key) => {
+          if (!key.startsWith(NO_EXPORT)) {
+            cur[key] = pluginEntry.pages[key]
+          }
+          return cur
+        }, {})
+        pluginEntry.publicPages = publicPages
+        pluginEntry.pages = Object.values(pluginEntry.pages)
+      }
+      const sideEffects = []
+      const file = resourceName + '.json'
+      sideEffects.push((additionalAssets) => {
+        additionalAssets[file].modules = additionalAssets[file].modules || []
+        additionalAssets[file].modules.push(entryModule)
+      })
+      extract(JSON.stringify(pluginEntry), file, 0, sideEffects)
+      nativeCallback(null, defaultResultSource)
+    })
+  }
+
+  let pluginEntry
+  try {
+    pluginEntry = JSON5.parse(source)
+  } catch (err) {
+    return callback(err)
+  }
+
+  let processMain, processComponents, processPages
+
+  processMain = processComponents = processPages = (callback) => {
+    callback()
+  }
+
+  if (pluginEntry.main) {
+    processMain = function (main, callback) {
+      if (!isUrlRequest(main)) return callback()
+      if (resolveMode === 'native') {
+        main = urlToRequest(main)
+      }
+      resolve(context, main, (err, resource) => {
+        if (err) return callback(err)
+        const { resourcePath } = parseRequest(resource)
+        // 获取pageName
+        const relative = path.relative(context, resourcePath)
+        const mainPath = toPosix(/^(.*?)(\.[^.]*)?$/.exec(relative)[1])
+        if (/^\./.test(mainPath)) {
+          emitError(`The plugin's main path [${main}] must be in the context [${context}]!`)
+          return callback()
+        }
+        pluginEntry.main = mainPath + '.js'
+        addEntrySafely(resource, mainPath, (err, module) => {
+          if (err) return callback(err)
+          mpx.pluginMainModule = module
+          currentEntry.addChild(getEntryNode(resource, 'PluginMain', module))
+          callback(err, module)
+        })
+      })
+    }.bind(this, pluginEntry.main)
+  }
+
+  if (pluginEntry.publicComponents) {
+    processComponents = function (components, callback) {
+      async.forEachOf(components, (component, name, callback) => {
+        if (!isUrlRequest(component)) return callback()
+        if (resolveMode === 'native') {
+          component = urlToRequest(component)
+        }
+        resolve(context, component, (err, resource, info) => {
+          if (err) return callback(err)
+          const resourcePath = parseRequest(resource).resourcePath
+          const parsed = path.parse(resourcePath)
+          const ext = parsed.ext
+          let outputPath
+          if (ext === '.js') {
+            let root = info.descriptionFileRoot
+            let name = 'nativeComponent'
+            if (info.descriptionFileData) {
+              if (info.descriptionFileData.miniprogram) {
+                root = path.join(root, info.descriptionFileData.miniprogram)
+              }
+              if (info.descriptionFileData.name) {
+                // 去掉name里面的@符号，因为支付宝不支持文件路径上有@
+                name = info.descriptionFileData.name.split('@').join('')
+              }
+            }
+            const resourceName = path.join(parsed.dir, parsed.name)
+            let relativePath = path.relative(root, resourceName)
+            outputPath = path.join('components', name + pathHash(root), relativePath)
+          } else {
+            outputPath = getOutputPath(resourcePath, 'component')
+          }
+          const componentPath = toPosix(outputPath)
+          pluginEntry.publicComponents[name] = componentPath
+          // 与json-compiler处理组件的行为表现一致
+          resource = addQuery(resource, {
+            packageName: 'main'
+          })
+          if (ext === '.js') {
+            resource = '!!' + nativeLoaderPath + '!' + resource
+          }
+          currentEntry.addChild(getEntryNode(resource, 'Component'))
+          // 如果之前已经创建了入口，直接return
+          if (componentsMap[resourcePath] === componentPath) return callback()
+          componentsMap[resourcePath] = componentPath
+          addEntrySafely(resource, componentPath, callback)
+        })
+      }, callback)
+    }.bind(this, pluginEntry.publicComponents)
+  }
+
+  if (pluginEntry.pages) {
+    // 处理 pages
+    if (mpx.srcMode === 'ali') { // 处理ali
+      let pagesMap = pluginEntry.publicPages
+      pluginEntry.pages = pluginEntry.pages.reduce((cur, val, index) => {
+        if (!Object.values(pagesMap).includes(val)) { // no export page
+          cur[`${NO_EXPORT}${index}`] = val
+        }
+        return cur
+      }, pagesMap)
+    }
+    processPages = function (pages, callback) {
+      async.forEachOf(pages, (page, name, callback) => {
+        let aliasPath = ''
+        if (typeof page !== 'string') {
+          aliasPath = page.path
+          page = page.src
+        }
+        if (!isUrlRequest(page)) return callback()
+        if (resolveMode === 'native') {
+          page = urlToRequest(page)
+        }
+        resolve(context, page, (err, resource) => {
+          if (err) return callback(err)
+          const { resourcePath } = parseRequest(resource)
+          const ext = path.extname(resourcePath)
+          // 获取pageName
+          let pageName
+          if (aliasPath) {
+            pageName = toPosix(aliasPath)
+            // 判断 key 存在重复情况直接报错
+            for (let key in pagesMap) {
+              if (pagesMap[key] === pageName && key !== resourcePath) {
+                emitError(`Current page [${resourcePath}] registers a conflict page path [${pageName}] with existed page [${key}], which is not allowed, please rename it!`)
+                return callback()
+              }
+            }
+          } else {
+            const relative = path.relative(context, resourcePath)
+            pageName = toPosix(/^(.*?)(\.[^.]*)?$/.exec(relative)[1])
+            if (/^\./.test(pageName)) {
+              // 如果当前page不存在于context中，插件模式下报错
+              emitError(`Current page [${resourcePath}] is not in current pages directory [${context}], which is not allowed in plugin mode!`)
+              return callback()
+            }
+            // 如果当前page与已有page存在命名冲突，插件模式下报错
+            for (let key in pagesMap) {
+              if (pagesMap[key] === pageName && key !== resourcePath) {
+                emitError(`Current page [${resourcePath}] is registered with a conflict page path [${pageName}], which is already existed in system, which is not allowed in plugin mode!`)
+                return callback()
+              }
+            }
+          }
+          if (ext === '.js') {
+            resource = '!!' + nativeLoaderPath + '!' + resource
+          }
+          // 如果之前已经创建了入口，直接return
+          if (pagesMap[resourcePath]) {
+            emitWarning(`Current page [${resourcePath}] which is imported from [${this.resourcePath}] has been registered in pagesMap already, it will be ignored, please check it and remove the redundant page declaration!`)
+            return callback()
+          }
+          currentEntry.addChild(getEntryNode(resource, 'Page'))
+          pagesMap[resourcePath] = pageName
+          pluginEntry.pages[name] = pageName
+          addEntrySafely(resource, pageName, callback)
+        })
+      }, callback)
+    }.bind(this, pluginEntry.pages)
+  }
+
+  async.parallel([processMain, processComponents, processPages], callback)
+}

package/lib/resolver/AddEnvPlugin.js

@@ -2,8 +2,7 @@ const path = require('path')
 const stringifyQuery = require('../utils/stringify-query')
 const parseQuery = require('loader-utils').parseQuery
 const addInfix = require('../utils/add-infix')
-const { matchCondition } = require('../utils/match-condition')
-const { JSON_JS_EXT } = require('../utils/const')
+const matchCondition = require('../utils/match-condition')
 
 module.exports = class AddEnvPlugin {
   constructor (source, env, fileConditionRules, target) {
@@ -25,8 +24,8 @@ module.exports = class AddEnvPlugin {
       }
       const resourcePath = request.path
       let extname = ''
-      if (resourcePath.endsWith(JSON_JS_EXT)) {
-        extname = JSON_JS_EXT
+      if (resourcePath.endsWith('.json.js')) {
+        extname = '.json.js'
       } else {
         extname = path.extname(resourcePath)
       }

package/lib/resolver/AddModePlugin.js

@@ -1,9 +1,8 @@
 const path = require('path')
 const stringifyQuery = require('../utils/stringify-query')
 const parseQuery = require('loader-utils').parseQuery
-const { matchCondition } = require('../utils/match-condition')
+const matchCondition = require('../utils/match-condition')
 const addInfix = require('../utils/add-infix')
-const { JSON_JS_EXT } = require('../utils/const')
 
 module.exports = class AddModePlugin {
   constructor (source, mode, fileConditionRules, target) {
@@ -25,8 +24,8 @@ module.exports = class AddModePlugin {
       }
       const resourcePath = request.path
       let extname = ''
-      if (resourcePath.endsWith(JSON_JS_EXT)) {
-        extname = JSON_JS_EXT
+      if (resourcePath.endsWith('.json.js')) {
+        extname = '.json.js'
       } else {
         extname = path.extname(resourcePath)
       }

package/lib/resolver/PackageEntryPlugin.js

@@ -1,42 +1,55 @@
 const path = require('path')
-const toPosix = require('../utils/to-posix')
+/**
+ * @desc 获取小程序npm包资源入口目录
+ */
+const getEntry = (name, miniprogram) => {
+  return path.join(name, miniprogram)
+}
 
 module.exports = class PackageEntryPlugin {
-  constructor (source, miniNpmPackages, target) {
+  constructor (source, miniNpmPackage, target) {
     this.source = source
     this.target = target
-    this.miniNpmPackages = miniNpmPackages
+    this.miniNpmPackage = miniNpmPackage
   }
 
   /**
    * 判断是否需要更改innerRequest
    * 小程序发布npm包约束: package.json配置miniprogram 或默认 miniprogram_dist目录
+   * 0. 前提: request中含有package.json中name字段
    * 1. package.json中配置了miniprogram, 且request中不含miniprogram，尝试拼接
-   * 2. 用户配置miniNpmPackages说明是小程序npm包，如果package.json中没配置miniprogram字段，则尝试拼接默认miniprogram_dist目录
+   * 2. 用户配置miniNpmPackage说明是小程序npm包，如果package.json中没配置miniprogram字段，则尝试拼接默认miniprogram_dist目录
    */
   apply (resolver) {
     const target = resolver.ensureHook(this.target)
-    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()
-
-      let { name, miniprogram } = descriptionFileData
-      if (!miniprogram && this.miniNpmPackages.includes(name)) miniprogram = 'miniprogram_dist'
-      if (!miniprogram) return callback()
-
-      let relativePath = path.relative(descriptionFileRoot, resourcePath)
-      if (relativePath.startsWith(miniprogram)) return callback()
-
-      relativePath = path.join(miniprogram, relativePath)
+    resolver.getHook(this.source).tapAsync('PackagePlugin', (request, resolveContext, callback) => {
+      const innerRequest = request.request || request.path
+      if (!innerRequest || request.miniprogram) return callback()
 
-      const obj = Object.assign({}, request, {
-        path: path.join(descriptionFileRoot, relativePath),
-        relativePath: './' + toPosix(relativePath),
-        miniprogram: true
-      })
+      const descriptionFileData = request.descriptionFileData || {}
+      const { name = '', miniprogram } = descriptionFileData
+      let newEntry = ''
+      // request.path和系统环境有关：windows和linux
+      let normalizedName = path.normalize(name)
+      if (innerRequest.indexOf(normalizedName) === -1) {
+        return callback()
+      }
+      if (miniprogram) {
+        newEntry = getEntry(normalizedName, miniprogram)
+      } else if (this.miniNpmPackage.includes(name)) {
+        newEntry = getEntry(normalizedName, 'miniprogram_dist')
+      }
 
-      resolver.doResolve(target, obj, 'add miniprogram dist: ' + miniprogram, resolveContext, callback)
+      if (newEntry) {
+        const newRequest = innerRequest.replace(normalizedName, newEntry)
+        const obj = Object.assign({}, request, {
+          request: newRequest,
+          miniprogram: true
+        })
+        resolver.doResolve(target, obj, `change request ${innerRequest} to :` + newRequest, resolveContext, callback)
+      } else {
+        callback()
+      }
     })
   }
 }

package/lib/runtime/base.styl

@@ -120,8 +120,3 @@ html, body, .app {
   font-family "weui"
   src url('data:application/octet-stream;base64,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') format('truetype')
 }
-
-.mpx-root-view {
-  display: inline
-  line-height: normal
-}

package/lib/runtime/components/web/getInnerListeners.js

@@ -1,5 +1,7 @@
 import { isEmptyObject } from './util'
-const isTouchDevice = 'ontouchstart' in document.documentElement
+import { inBrowser } from '../../../utils/env'
+
+const isTouchDevice = inBrowser && ('ontouchstart' in document.documentElement)
 
 function processModel (listeners, context) {
   // 该函数只有wx:model的情况下才调用，而且默认e.detail.value有值