@mpxjs/webpack-plugin 2.8.25-alpha → 2.8.25-alpha.10

package/lib/dependencies/ResolveDependency.js

@@ -76,7 +76,8 @@ ResolveDependency.Template = class ResolveDependencyTemplate {
     const { resolved = '' } = dep
     // for tenon
     if (dep.compilation.__mpx__.mode === 'tenon') {
-      return `getRelativePath(currentURL, ${JSON.stringify(resolved)}) + '.js'`
+      // 暂时仅支持所有产物在一个目录下的场景
+      return `(Hummer.pageInfo && Hummer.pageInfo.url && Hummer.pageInfo.url.replace(/\\/[^/]+(?=\\.[^.]+($|\\?))/, '/${resolved}') || './${resolved}.js')`
     }
     // ?resolve 必定返回绝对路径
     return JSON.stringify('/' + resolved)

package/lib/loader.js

@@ -70,7 +70,9 @@ module.exports = function (content) {
 
   if (ctorType === 'app') {
     const appName = getEntryName(this)
-    this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
+    if (appName) {
+      this._module.addPresentationalDependency(new AppEntryDependency(resourcePath, appName))
+    }
   }
   const loaderContext = this
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)

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

@@ -263,6 +263,12 @@ module.exports = function getSpec ({ warn, error }) {
             name: 'ref',
             value: `__mpx_ref_${value}__`
           }
+        },
+        tenon ({ value }) {
+          return {
+            name: 'ref',
+            value: `${value}`
+          }
         }
       },
       {

package/lib/runtime/components/tenon/tenon-button.vue

@@ -64,6 +64,9 @@ export default (function(){
       },
     },
     computed: {
+      originRef() {
+        return this.$refs["mpx-button"]
+      },
       className() {
         if (this.hoverClass && this.hoverClass !== "none" && this.hover) {
           return this.hoverClass;
@@ -109,6 +112,7 @@ export default (function(){
       };
       const data = {
         class: ["mpx-button", ...this.classNameList],
+        ref: "mpx-button",
         ...domProps,
         ...getInnerListeners(this, {
           mergeAfter,

package/lib/runtime/components/tenon/tenon-image.vue

@@ -38,11 +38,17 @@ export default {
     }
     return h("image", {
       class: "mpx-image",
+      ref: "mpx-image",
       src: this.src,
       resize,
       ...getInnerListeners(this)
     });
   },
+  computed: {
+    originRef() {
+      return this.$refs["mpx-image"]
+    }
+  },
   data() {
     return {};
   },

package/lib/runtime/components/tenon/tenon-rich-text.vue

@@ -9,10 +9,15 @@ export default {
       value: {}
     }
   },
+  computed: {
+    originRef() {
+      return this.$refs["mpx-richtext"]
+    }
+  },
   render () {
-
     const data = {
       richText: this.richText,
+      ref: "mpx-richtext",
       ...getInnerListeners(this)
     }
     return h('text', data)

package/lib/runtime/components/tenon/tenon-scroll-view.vue

@@ -72,6 +72,9 @@ export default {
     return {};
   },
   computed: {
+    originRef() {
+      return this.$refs["scroll"]
+    },
     _scrollTop() {
       // return 1
       return processSize(this.scrollTop);

package/lib/runtime/components/tenon/tenon-switch.vue

@@ -22,6 +22,11 @@ export default {
       default: "#04BE02",
     },
   },
+  computed: {
+    originRef() {
+      return this.$refs["switch"]
+    }
+  },
   watch: {
     checked(newVal) {
       this.switchChecked = newVal;

package/lib/runtime/components/tenon/tenon-text.vue

@@ -39,11 +39,17 @@ export default {
       "text",
       {
         class: classNames,
+        ref: "mpx-text",
         ...getInnerListeners(this),
       },
       text
     );
   },
+  computed: {
+    originRef() {
+      return this.$refs["mpx-text"]
+    }
+  },
   data() {
     return {};
   },

package/lib/runtime/components/tenon/{tenon-text-area.vue → tenon-textarea.vue}

@@ -32,7 +32,6 @@ export default {
       default: -1,
     },
   },
-
   computed: {
     originRef() {
       return this.$refs["mpx-textarea"]

package/lib/template-compiler/compiler.js

@@ -1918,7 +1918,7 @@ function postProcessTemplate (el) {
   }
 }
 
-const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,noMode')
+const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,noMode')
 
 const wrapRE = /^\((.*)\)$/
 

package/lib/tenon/processJSON.js

@@ -129,16 +129,12 @@ module.exports = function (json, options, rawCallback) {
                 defs,
                 env
               })
-              const json = parts.json || {}
-              if (json.content) {
-                content = json.content
-              } else if (json.src) {
-                return getJSONContent(json || {}, loaderContext, (err, content) => {
-                  callback(err, result, content)
-                })
-              }
+              getJSONContent(parts.json || {}, result, loaderContext, (err, content) => {
+                callback(err, result, content)
+              })
+            } else {
+              callback(null, result, content)
             }
-            callback(null, result, content)
           },
           (result, content, callback) => {
             try {

package/lib/tenon/processScript.js

@@ -5,6 +5,7 @@ const normalize = require('../utils/normalize')
 const builtInLoaderPath = normalize.lib('built-in-loader')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
 const createJSONHelper = require('../json-compiler/helper')
+const createHelpers = require('../helpers')
 const async = require('async')
 const hasOwn = require('../utils/has-own')
 
@@ -89,6 +90,8 @@ module.exports = function (script, options, callback) {
     emitError
   })
 
+  const { getRequire } = createHelpers(loaderContext)
+
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
   // let tabBarPagesMap = {}
   // if (tabBar && tabBarMap) {
@@ -188,10 +191,14 @@ module.exports = function (script, options, callback) {
       if (!isProduction) {
         content += `  global.currentResource = ${JSON.stringify(loaderContext.resourcePath)}\n`
       }
-      // 为了正确获取currentSrcMode便于运行时进行转换，对于src引入的组件script采用require方式引入(由于webpack会将import的执行顺序上升至最顶)，这意味着对于src引入脚本中的named export将不会生效，不过鉴于mpx和小程序中本身也没有在组件script中声明export的用法，所以应该没有影响
-      content += script.src
-        ? `require(${stringifyRequest(script.src)})\n`
-        : (script.content + '\n') + '\n'
+      // 传递ctorType以补全js内容
+      const extraOptions = {
+        ctorType,
+        lang: script.lang || 'js'
+      }
+      // 使用 require 引入 script
+      content += `  ${getRequire('script', script, extraOptions)}\n`
+
       // createApp/Page/Component执行完成后立刻获取当前的option并暂存
       content += `  const currentOption = global.__mpxOptionsMap[${JSON.stringify(moduleId)}]\n`
       // 获取pageConfig
@@ -247,7 +254,7 @@ module.exports = function (script, options, callback) {
   let dynamicPageStr = ''
   async.each(localPagesMap, (pageCfg, callback) => {
     if (typeof pageCfg !== 'string') pageCfg.src = addQuery(pageCfg.src, { tenon: true })
-    processPage(pageCfg, loaderContext.context, '', (err, entry, { key }) => {
+    processPage(pageCfg, loaderContext.context, '', (err, entry, { key } = {}) => {
       if (err) return callback()
       if (pageSet.has(key)) return callback()
       pageSet.add(key)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.8.25-alpha",
+  "version": "2.8.25-alpha.10",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -28,7 +28,7 @@
     "@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-loader": "^1.2.0",
     "@hummer/tenon-style-loader": "^0.2.0",
     "acorn-walk": "^7.2.0",
     "async": "^2.6.0",
@@ -85,5 +85,5 @@
   "engines": {
     "node": ">=14.14.0"
   },
-  "gitHead": "345dc10820535a06d9aee8d2a1e6cc735ba08882"
+  "gitHead": "8644921e89035057c93f648063059b55537c83c3"
 }