@mpxjs/webpack-plugin 2.8.25-alpha → 2.8.25

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/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) => {
@@ -1073,27 +1073,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 +1197,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 +1435,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/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/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'
     },

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('.')
-              }
-            }
-            const modelValue = match[1].trim()
-            return [
-              {
-                name: ':' + modelProp,
-                value: modelValue
-              },
-              {
-                name: 'mpxModelEvent',
-                value: modelEvent
-              },
-              {
-                name: 'mpxModelEventId',
-                value: Math.random().toString(36).slice(3, 11)
-              },
-              {
-                name: '@mpxModel',
-                value: `__model(${stringifyWithResolveComputed(modelValue)}, $event, ${stringify(modelValuePathArr)}, ${stringify(modelFilter)})`
-              }
-            ]
-          }
         }
       },
       {
@@ -301,14 +217,6 @@ module.exports = function getSpec ({ warn, error }) {
             name: ':class',
             value: parsed.result
           }
-        },
-        tenon ({ name, value }) {
-          const dir = this.test.exec(name)[1]
-          const parsed = parseMustache(value)
-          return {
-            name: ':' + dir,
-            value: parsed.result
-          }
         }
       },
       // 通用指令
@@ -366,17 +274,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
-          }
         }
       },
       // 事件
@@ -449,23 +346,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/resolve-loader.js

@@ -1,6 +1,3 @@
 module.exports = function () {
-  return `
-  var currentURL = global.currentPagePath
-  var getRelativePath = require('@mpxjs/webpack-plugin/lib/utils/get-relative-path').getRelativePath
-  module.exports = __mpx_resolve_path__(${JSON.stringify(this.resource)})`
+  return `module.exports = __mpx_resolve_path__(${JSON.stringify(this.resource)})`
 }

package/lib/style-compiler/index.js

@@ -23,7 +23,7 @@ module.exports = function (css, map) {
   const transRpxRulesRaw = mpx.transRpxRules
   const transRpxRules = transRpxRulesRaw ? (Array.isArray(transRpxRulesRaw) ? transRpxRulesRaw : [transRpxRulesRaw]) : []
 
-  const transRpxFn = mpx.webConfig && mpx.webConfig.transRpxFn
+  const transRpxFn = mpx.webConfig.transRpxFn
   const testResolveRange = (include = () => true, exclude) => {
     return matchCondition(this.resourcePath, { include, exclude })
   }

package/lib/template-compiler/compiler.js

@@ -2065,15 +2065,6 @@ function processElement (el, root, options, meta) {
     processComponentGenericsForWeb(el, options, meta)
     return
   }
-  if (mode === 'tenon') {
-    // 收集内建组件
-    processBuiltInComponents(el, meta)
-    // 预处理代码维度条件编译
-    processIfForWeb(el)
-    // processWebExternalClassesHack(el, options)
-    // processComponentGenericsForWeb(el, options, meta)
-    return
-  }
 
   const pass = isNative || processTemplate(el) || processingTemplate
 
@@ -2106,7 +2097,7 @@ function processElement (el, root, options, meta) {
 
 function closeElement (el, meta, options) {
   postProcessAtMode(el)
-  if (mode === 'web' || mode === 'tenon') {
+  if (mode === 'web') {
     postProcessWxs(el, meta)
     // 处理代码维度条件编译移除死分支
     postProcessIf(el)
@@ -2220,7 +2211,7 @@ function serialize (root) {
           result += node.text
         }
       }
-      if (node.tag === 'wxs' && (mode === 'web' || mode === 'tenon')) {
+      if (node.tag === 'wxs' && mode === 'web') {
         return result
       }
       if (node.type === 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.25-alpha",
+  "version": "2.8.25",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -27,9 +27,6 @@
     "@better-scroll/slide": "^2.2.1",
     "@better-scroll/wheel": "^2.2.1",
     "@better-scroll/zoom": "^2.2.1",
-    "@hummer/tenon-dev-server-webpack-plugin": "0.0.2",
-    "@hummer/tenon-loader": "^1.1.0",
-    "@hummer/tenon-style-loader": "^0.2.0",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
     "consolidate": "^0.15.1",
@@ -85,5 +82,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "345dc10820535a06d9aee8d2a1e6cc735ba08882"
+  "gitHead": "f144694b7bc4db69572b1b3b1123c720a6cca018"
 }

package/lib/dependencies/AddEntryDependency.js

@@ -1,24 +0,0 @@
-const NullDependency = require('webpack/lib/dependencies/NullDependency')
-
-class AddEntryDependency extends NullDependency {
-  constructor ({ context, dep, name }) {
-    super()
-    this.__addEntryParams = [context, dep, name]
-  }
-
-  get type () {
-    return 'mpx add entry'
-  }
-
-  // updateHash (hash) {
-  //   super.updateHash(hash)
-  //   hash.update(this.childCompileEntryModule.identifier())
-  // }
-}
-
-AddEntryDependency.Template = class AddEntryDependencyTemplate {
-  apply () {
-  }
-}
-
-module.exports = AddEntryDependency