@mpxjs/webpack-plugin 2.8.25-alpha → 2.8.27

package/README.md

@@ -13,6 +13,6 @@ module.exports = {
     new mpxWebpackPlugin({
       mode: 'wx'
     })
-  ]
+  ],
 }
 ```

package/lib/config.js

@@ -356,20 +356,6 @@ module.exports = {
       templatePrefix: 'module.exports = \n'
     }
   },
-  tenon: {
-    directive: {
-      if: 'v-if',
-      elseif: 'v-else-if',
-      else: 'v-else'
-    },
-    wxs: {
-      tag: 'wxs',
-      module: 'module',
-      src: 'src',
-      ext: '.wxs',
-      templatePrefix: 'module.exports = \n'
-    }
-  },
   qa: {
     typeExtMap: {
       json: '.json',

package/lib/dependencies/DynamicEntryDependency.js

@@ -28,23 +28,10 @@ class DynamicEntryDependency extends NullDependency {
     return toPosix([request, entryType, outputPath, packageRoot, relativePath, context, ...range].join('|'))
   }
 
-  collectDynamicRequest (mpx) {
-    if (!this.packageRoot) return
-    const curValue = mpx.dynamicEntryInfo[this.packageRoot] = mpx.dynamicEntryInfo[this.packageRoot] || {
-      hasPage: false,
-      entries: []
-    }
-    if (this.entryType === 'page') {
-      curValue.hasPage = true
-    } else {
-      curValue.entries.push(this.request)
-    }
-  }
-
   addEntry (compilation, callback) {
     const mpx = compilation.__mpx__
     let { request, entryType, outputPath, relativePath, context, originEntryNode, publicPath, resolver } = this
-    this.collectDynamicRequest(mpx)
+
     async.waterfall([
       (callback) => {
         if (context && resolver) {
@@ -56,12 +43,13 @@ class DynamicEntryDependency extends NullDependency {
         }
       },
       (resource, callback) => {
+        const { resourcePath } = parseRequest(resource)
+
         if (!outputPath) {
-          const { resourcePath } = parseRequest(resource)
           outputPath = mpx.getOutputPath(resourcePath, entryType)
         }
 
-        const { packageRoot, outputPath: filename, alreadyOutputted } = mpx.getPackageInfo({
+        const { packageName, packageRoot, outputPath: filename, alreadyOutputted } = mpx.getPackageInfo({
           resource,
           outputPath,
           resourceType: entryType,
@@ -88,6 +76,13 @@ class DynamicEntryDependency extends NullDependency {
 
         const key = [resource, filename].join('|')
 
+        mpx.collectDynamicEntryInfo({
+          resource,
+          packageName,
+          filename,
+          entryType
+        })
+
         if (alreadyOutputted) {
           const addEntryPromise = mpx.addEntryPromiseMap.get(key)
           if (addEntryPromise) {

package/lib/dependencies/ResolveDependency.js

@@ -74,10 +74,6 @@ ResolveDependency.Template = class ResolveDependencyTemplate {
 
   getContent (dep) {
     const { resolved = '' } = dep
-    // for tenon
-    if (dep.compilation.__mpx__.mode === 'tenon') {
-      return `getRelativePath(currentURL, ${JSON.stringify(resolved)}) + '.js'`
-    }
     // ?resolve 必定返回绝对路径
     return JSON.stringify('/' + resolved)
   }

package/lib/index.js

@@ -317,7 +317,7 @@ class MpxWebpackPlugin {
     let splitChunksPlugin
     let splitChunksOptions
 
-    if (this.options.mode !== 'web' && this.options.mode !== 'tenon') {
+    if (this.options.mode !== 'web') {
       const optimization = compiler.options.optimization
       optimization.runtimeChunk = {
         name: (entrypoint) => {
@@ -454,17 +454,17 @@ class MpxWebpackPlugin {
       stage: -1000
     }, (compilation, callback) => {
       processSubpackagesEntriesMap(compilation, () => {
-        const checkRegisterPack = () => {
-          for (const packRoot in mpx.dynamicEntryInfo) {
-            const entryMap = mpx.dynamicEntryInfo[packRoot]
-            if (!entryMap.hasPage) {
+        const checkDynamicEntryInfo = () => {
+          for (const packageName in mpx.dynamicEntryInfo) {
+            const entryMap = mpx.dynamicEntryInfo[packageName]
+            if (packageName !== 'main' && !entryMap.hasPage) {
               // 引用未注册分包的所有资源
-              const strRequest = entryMap.entries.join(',')
-              compilation.errors.push(new Error(`资源${strRequest}目标是打入${packRoot}分包, 但是app.json中并未声明${packRoot}分包`))
+              const resources = entryMap.entries.map(info => info.resource).join(',')
+              compilation.errors.push(new Error(`资源${resources}通过分包异步声明为${packageName}分包, 但${packageName}分包未注册或不存在相关页面！`))
             }
           }
         }
-        checkRegisterPack()
+        checkDynamicEntryInfo()
         callback()
       })
     })
@@ -550,7 +550,7 @@ class MpxWebpackPlugin {
           subpackagesEntriesMap: {},
           replacePathMap: {},
           exportModules: new Set(),
-          // 动态记录注册的分包与注册页面映射
+          // 记录动态添加入口的分包信息
           dynamicEntryInfo: {},
           // 记录entryModule与entryNode的对应关系，用于体积分析
           entryNodeModulesMap: new Map(),
@@ -593,13 +593,27 @@ class MpxWebpackPlugin {
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
           enableAliRequireAsync: this.options.enableAliRequireAsync,
+          collectDynamicEntryInfo: ({ resource, packageName, filename, entryType }) => {
+            const curInfo = mpx.dynamicEntryInfo[packageName] = mpx.dynamicEntryInfo[packageName] || {
+              hasPage: false,
+              entries: []
+            }
+
+            if (entryType === 'page') curInfo.hasPage = true
+
+            curInfo.entries.push({
+              entryType,
+              resource,
+              filename
+            })
+          },
           pathHash: (resourcePath) => {
             if (this.options.pathHashMode === 'relative' && this.options.projectRoot) {
               return hash(path.relative(this.options.projectRoot, resourcePath))
             }
             return hash(resourcePath)
           },
-          addEntry (request, name, callback) {
+          addEntry: (request, name, callback) => {
             const dep = EntryPlugin.createDependency(request, { name })
             compilation.addEntry(compiler.context, dep, { name }, callback)
             return dep
@@ -1073,27 +1087,7 @@ class MpxWebpackPlugin {
           }
         })
 
-        // processing for tenon-store
-        if (mpx.mode === 'tenon') {
-          let TENON_STORE_ID = 0
-          parser.hooks.call.for('imported var').tap('MpxWebpackPlugin', (expr) => {
-            if (['createStore', 'createStoreWithThis'].includes(expr.callee.name)) {
-              const current = parser.state.current
-              const storeOptions = expr.arguments.length && expr.arguments[0]
-              if (storeOptions) {
-                current.addDependency(new InjectDependency({
-                  content: 'Object.assign(',
-                  index: storeOptions.range[0]
-                }))
-                current.addDependency(new InjectDependency({
-                  content: `, { __store_id: ${TENON_STORE_ID++} })`,
-                  index: storeOptions.range[1]
-                }))
-              }
-            }
-          })
-        }
-
+        // 处理跨平台转换
         if (mpx.srcMode !== mpx.mode) {
           // 处理跨平台全局对象转换
           const transGlobalObject = (expr) => {
@@ -1217,7 +1211,7 @@ class MpxWebpackPlugin {
         name: 'MpxWebpackPlugin',
         stage: compilation.PROCESS_ASSETS_STAGE_ADDITIONS
       }, () => {
-        if (mpx.mode === 'web' || mpx.mode === 'tenon') return
+        if (mpx.mode === 'web') return
 
         if (this.options.generateBuildMap) {
           const pagesMap = compilation.__mpx__.pagesMap
@@ -1455,31 +1449,21 @@ try {
         if (mpx.mode === 'web') {
           const mpxStyleOptions = queryObj.mpxStyleOptions
           const firstLoader = loaders[0] ? toPosix(loaders[0].loader) : ''
-          const isPitcherRequest = firstLoader.includes('vue-loader/lib/loaders/pitcher') || firstLoader.includes('@hummer/tenon-loader/dist/pitcher.js')
+          const isPitcherRequest = firstLoader.includes('vue-loader/lib/loaders/pitcher')
           let cssLoaderIndex = -1
           let vueStyleLoaderIndex = -1
           let mpxStyleLoaderIndex = -1
-          let tenonStyleLoaderIndex = -1
           loaders.forEach((loader, index) => {
             const currentLoader = toPosix(loader.loader)
             if (currentLoader.includes('css-loader') && cssLoaderIndex === -1) {
               cssLoaderIndex = index
             } else if (currentLoader.includes('vue-loader/lib/loaders/stylePostLoader') && vueStyleLoaderIndex === -1) {
               vueStyleLoaderIndex = index
-            } else if (currentLoader.includes('@hummer/tenon-style-loader/dist/index.js') && tenonStyleLoaderIndex === -1) {
-              tenonStyleLoaderIndex = index
             } else if (currentLoader.includes(styleCompilerPath) && mpxStyleLoaderIndex === -1) {
               mpxStyleLoaderIndex = index
             }
           })
-          if (mpx.mode === 'tenon' && mpxStyleLoaderIndex === -1) {
-            if (tenonStyleLoaderIndex > -1 && !isPitcherRequest) {
-              loaders.splice(tenonStyleLoaderIndex + 1, 0, {
-                loader: normalize.lib('style-compiler/index.js'),
-                options: (mpxStyleOptions && JSON.parse(mpxStyleOptions)) || {}
-              })
-            }
-          } else if (mpxStyleLoaderIndex === -1) {
+          if (mpxStyleLoaderIndex === -1) {
             let loaderIndex = -1
             if (cssLoaderIndex > -1 && vueStyleLoaderIndex === -1) {
               loaderIndex = cssLoaderIndex

package/lib/json-compiler/index.js

@@ -98,7 +98,14 @@ module.exports = function (content) {
                 if (err) return callback(err)
                 if (!this._compilation) return callback()
                 const targetPath = path.relative(context, file)
-                this.emitFile(targetPath, content)
+                this._compilation.assets[targetPath] = {
+                  size: function size () {
+                    return stats.size
+                  },
+                  source: function source () {
+                    return content
+                  }
+                }
                 callback()
               })
             }

package/lib/loader.js

@@ -11,7 +11,6 @@ const processJSON = require('./web/processJSON')
 const processScript = require('./web/processScript')
 const processStyles = require('./web/processStyles')
 const processTemplate = require('./web/processTemplate')
-const processForTenon = require('./tenon/index')
 const getJSONContent = require('./utils/get-json-content')
 const normalize = require('./utils/normalize')
 const getEntryName = require('./utils/get-entry-name')
@@ -128,45 +127,6 @@ module.exports = function (content) {
           return callback(e)
         }
       }
-
-      if (mode === 'tenon') {
-        if (ctorType === 'app' && !queryObj.app) {
-          const request = addQuery(this.resource, { app: true })
-          output += `
-      import App from ${stringifyRequest(request)}
-      import * as Tenon from '@hummer/tenon-vue'
-
-      Tenon.render(App)\n`
-          // 直接结束loader进入parse
-          this.loaderIndex = -1
-          return callback(null, output)
-        }
-        if (ctorType === 'page' && queryObj.tenon) {
-          console.log(resourcePath)
-          const request = addQuery(resourcePath, { page: true })
-          output += `
-      import page from ${stringifyRequest(request)}
-      import * as Tenon from '@hummer/tenon-vue'
-
-      Tenon.render(page)\n`
-          this.loaderIndex = -1
-          return callback(null, output)
-        }
-        return processForTenon({
-          mpx,
-          loaderContext,
-          isProduction,
-          queryObj,
-          filePath,
-          parts,
-          ctorType,
-          autoScope,
-          componentsMap,
-          moduleId,
-          callback
-        })
-      }
-
       // 处理mode为web时输出vue格式文件
       if (mode === 'web') {
         if (ctorType === 'app' && !queryObj.isApp) {

package/lib/platform/template/wx/component-config/button.js

@@ -28,8 +28,6 @@ module.exports = function ({ print }) {
   const ttEventLog = print({ platform: 'bytedance', tag: TAG_NAME, isError: false, type: 'event' })
   const webPropLog = print({ platform: 'web', tag: TAG_NAME, isError: false })
   const webEventLog = print({ platform: 'web', tag: TAG_NAME, isError: false, type: 'event' })
-  const tenonPropLog = print({ platform: 'tenon', tag: TAG_NAME, isError: false })
-  const tenonEventLog = print({ platform: 'tenon', tag: TAG_NAME, isError: false, type: 'event' })
   const qaPropLog = print({ platform: 'qa', tag: TAG_NAME, isError: false })
   const wxPropValueLog = print({ platform: 'wx', tag: TAG_NAME, isError: false, type: 'value' })
 
@@ -39,10 +37,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-button'
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-button'
-    },
     props: [
       {
         test: 'open-type',
@@ -137,18 +131,13 @@ module.exports = function ({ print }) {
       },
       {
         test: /^(open-type|lang|session-from|send-message-title|send-message-path|send-message-img|show-message-card|app-parameter)$/,
-        web: webPropLog,
-        tenon: tenonPropLog
+        web: webPropLog
       },
       {
         test: /^(size|type|plain|loading|form-type|hover-class|hover-stop-propagation|hover-start-time|hover-stay-time|use-built-in)$/,
         web (prop, { el }) {
           // todo 这部分能力基于内部封装实现
           el.isBuiltIn = true
-        },
-        tenon (prop, { el }) {
-          // todo 这部分能力基于内部封装实现
-          el.isBuiltIn = true
         }
       },
       {
@@ -185,8 +174,7 @@ module.exports = function ({ print }) {
       },
       {
         test: /^(getuserinfo|contact|error|launchapp|opensetting|getphonenumber)$/,
-        web: webEventLog,
-        tenon: tenonEventLog
+        web: webEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/component.js

@@ -1,11 +1,11 @@
 const templateCompiler = require('../../../../template-compiler/compiler')
-const parseMustache = templateCompiler.parseMustache
+const parseMustacheWithContext = templateCompiler.parseMustacheWithContext
 const normalize = require('../../../../utils/normalize')
 const TAG_NAME = 'component'
 
 /** is 属性格式化为中划线(-)连接 */
 const formatPropIs = (obj, data) => {
-  const parsed = parseMustache(obj.value)
+  const parsed = parseMustacheWithContext(obj.value)
   let value = parsed.result
   if (parsed.hasBinding) value = value.slice(1, -1)
   const el = data.el

package/lib/platform/template/wx/component-config/image.js

@@ -13,10 +13,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-image'
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-image'
-    },
     props: [
       {
         test: /^show-menu-by-longpress$/,

package/lib/platform/template/wx/component-config/input.js

@@ -20,10 +20,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-input'
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-input'
-    },
     props: [
       {
         test: /^(cursor-spacing|auto-focus|adjust-position|hold-keyboard)$/,

package/lib/platform/template/wx/component-config/rich-text.js

@@ -12,10 +12,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-rich-text'
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-rich-text'
-    },
     props: [
       {
         test: /^(space)$/,

package/lib/platform/template/wx/component-config/scroll-view.js

@@ -19,10 +19,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-scroll-view'
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-scroll-view'
-    },
     props: [
       {
         test: /^(enable-flex|scroll-anchorin|refresher-enabled|refresher-threshold|refresher-default-style|refresher-background|refresher-triggered|enhanced|bounces|show-scrollbar|paging-enabled|fast-deceleratio)$/,

package/lib/platform/template/wx/component-config/switch.js

@@ -10,10 +10,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-switch'
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-switch'
-    },
     props: [
       {
         test: /^type$/,

package/lib/platform/template/wx/component-config/text.js

@@ -19,10 +19,6 @@ module.exports = function ({ print }) {
         return 'span'
       }
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-text'
-    },
     props: [
       {
         test: /^(decode|user-select)$/,

package/lib/platform/template/wx/component-config/textarea.js

@@ -22,11 +22,6 @@ module.exports = function ({ print }) {
       el.isBuiltIn = true
       return 'mpx-textarea'
     },
-    tenon (tag, { el }) {
-      // form全量使用内建组件
-      el.isBuiltIn = true
-      return 'tenon-textarea'
-    },
     props: [
       {
         test: /^(auto-focus|fixed|cursor-spacing|cursor|show-confirm-bar|selection-start|selection-end|adjust-position|hold-keyboard|disable-default-padding|confirm-type)$/,

package/lib/platform/template/wx/component-config/view.js

@@ -21,10 +21,6 @@ module.exports = function ({ print }) {
         return 'div'
       }
     },
-    tenon (tag, { el }) {
-      el.isBuiltIn = true
-      return 'tenon-view'
-    },
     qa (tag) {
       return 'div'
     },