@mpxjs/webpack-plugin 2.6.110 → 2.6.114-alpha.0

package/lib/tenon/processTemplate.js

@@ -0,0 +1,133 @@
+const templateCompiler = require('../template-compiler/compiler')
+const genComponentTag = require('../utils/gen-component-tag')
+const addQuery = require('../utils/add-query')
+const path = require('path')
+const parseRequest = require('../utils/parse-request')
+// const getMainCompilation = require('../utils/get-main-compilation')
+
+// function calculateRootEleChild (arr) {
+//   if (!arr) {
+//     return 0
+//   }
+//   return arr.reduce((total, item) => {
+//     if (item.type === 1) {
+//       if (item.tag === 'template') {
+//         total += calculateRootEleChild(item.children)
+//       } else {
+//         total += 1
+//       }
+//     }
+//     return total
+//   }, 0)
+// }
+
+module.exports = function (template, options, callback) {
+  const mode = options.mode
+  const srcMode = options.srcMode
+  const defs = options.defs
+  const moduleId = options.moduleId
+  const loaderContext = options.loaderContext
+  const ctorType = options.ctorType
+  const resourcePath = parseRequest(loaderContext.resource).resourcePath
+  const builtInComponentsMap = {}
+  // const compilation = loaderContext._compilation
+  // const mainCompilation = getMainCompilation(compilation)
+  // const mpx = mainCompilation.__mpx__
+  // const wxsContentMap = mpx.wxsContentMap
+  let wxsModuleMap, genericsInfo
+  let output = '/* template */\n'
+
+  if (ctorType === 'app') {
+    template = {
+      tag: 'template',
+      content: '<div class="app">this is app</div>'
+    }
+    // builtInComponentsMap['mpx-keep-alive'] = {
+    //   resource: addQuery('@mpxjs/webpack-plugin/lib/runtime/components/web/mpx-keep-alive.vue', { component: true })
+    // }
+  }
+
+  if (template) {
+    // 由于远端src template资源引用的相对路径可能发生变化，暂时不支持。
+    if (template.src) {
+      return callback(new Error('[mpx loader][' + loaderContext.resource + ']: ' + 'template content must be inline in .mpx files!'))
+    }
+    if (template.lang) {
+      return callback(new Error('[mpx loader][' + loaderContext.resource + ']: ' + 'template lang is not supported in trans web mode temporarily, we will support it in the future!'))
+    }
+
+    output += genComponentTag(template, (template) => {
+      if (ctorType === 'app') {
+        return template.content
+      }
+      if (template.content) {
+        const templateSrcMode = template.mode || srcMode
+        const parsed = templateCompiler.parse(template.content, {
+          warn: (msg) => {
+            loaderContext.emitWarning(
+              new Error('[template compiler][' + loaderContext.resource + ']: ' + msg)
+            )
+          },
+          error: (msg) => {
+            loaderContext.emitError(
+              new Error('[template compiler][' + loaderContext.resource + ']: ' + msg)
+            )
+          },
+          usingComponents: options.usingComponents,
+          hasComment: options.hasComment,
+          isNative: options.isNative,
+          basename: path.basename(resourcePath),
+          isComponent: ctorType === 'component',
+          mode,
+          srcMode: templateSrcMode,
+          defs,
+          decodeHTMLText: options.decodeHTMLText,
+          // externalClasses: options.externalClasses,
+          hasScoped: false,
+          moduleId,
+          filePath: loaderContext.resourcePath,
+          i18n: null,
+          checkUsingComponents: options.checkUsingComponents,
+          // web模式下全局组件不会被合入usingComponents中，故globalComponents可以传空
+          globalComponents: [],
+          // web模式下实现抽象组件
+          componentGenerics: options.componentGenerics
+        })
+        // if (parsed.meta.wxsModuleMap) {
+        //   wxsModuleMap = parsed.meta.wxsModuleMap
+        // }
+        // if (parsed.meta.wxsContentMap) {
+        //   for (let module in parsed.meta.wxsContentMap) {
+        //     wxsContentMap[`${resourcePath}~${module}`] = parsed.meta.wxsContentMap[module]
+        //   }
+        // }
+        if (parsed.meta.builtInComponentsMap) {
+          Object.keys(parsed.meta.builtInComponentsMap).forEach((name) => {
+            builtInComponentsMap[name] = {
+              resource: addQuery(parsed.meta.builtInComponentsMap[name], { component: true })
+            }
+          })
+        }
+        // if (parsed.meta.genericsInfo) {
+        //   genericsInfo = parsed.meta.genericsInfo
+        // }
+        // 输出H5有多个root element时, 使用div标签包裹
+        // if (parsed.root.tag === 'temp-node') {
+        //   const childLen = calculateRootEleChild(parsed.root.children)
+        //   if (childLen >= 2) {
+        //     parsed.root.tag = 'div'
+        //   }
+        // }
+        return templateCompiler.serialize(parsed.root)
+      }
+    })
+    output += '\n\n'
+  }
+
+  callback(null, {
+    output,
+    builtInComponentsMap,
+    genericsInfo,
+    wxsModuleMap
+  })
+}

package/lib/utils/get-relative-path.js

@@ -0,0 +1,24 @@
+function getRelativePath (source, target) {
+  source = source && source.replace(/\/[^/]*$/, ''); // get dirname
+  // make sure source and target are absolute path
+  /^\//.test(source) || (source = '/' + source);
+  /^\//.test(target) || (target = '/' + target)
+  // check if source or target is root path
+  let sourceArr = source.split('/').filter((item, index) => index !== 0 && !!item)
+  let targetArr = target.split('/').filter((item, index) => index !== 0 && !!item)
+  let i = 0
+  while (sourceArr[i] === targetArr[i] && i < sourceArr.length && i < targetArr.length) {
+    i++
+  }
+  let relativePath = ''
+  for (let j = 0; j < sourceArr.length - i; j++) {
+    relativePath += '../'
+  }
+  relativePath += targetArr.slice(i).join('/')
+  if (relativePath[0] !== '.') relativePath = './' + relativePath
+  return relativePath
+}
+
+module.exports = {
+  getRelativePath
+}

package/lib/web/processScript.js

@@ -109,12 +109,6 @@ module.exports = function (script, options, callback) {
   import Vue from 'vue'
   import VueRouter from 'vue-router'
   Vue.use(VueRouter)
-  import BScroll from '@better-scroll/core'
-  import PullDown from '@better-scroll/pull-down'
-  import ObserveDOM from '@better-scroll/observe-dom'
-  BScroll.use(ObserveDOM)
-  BScroll.use(PullDown)
-  global.BScroll = BScroll
   global.getApp = function(){}
   global.getCurrentPages = function(){
     if(!global.__mpxRouter) return []

package/lib/wxs/wxs-pre-loader.js

@@ -40,11 +40,16 @@ module.exports = function (content) {
             let results = targetPath.unshiftContainer('body', insertNodes) || []
             targetPath.inserted = true
             results.forEach((item) => {
-              item.stop()
+              item.shouldStopTraverse = true
             })
           }
         }
       },
+      ForStatement (path) {
+        if (path.shouldStopTraverse) {
+          path.stop()
+        }
+      },
       // 处理vant-aliapp中export var bem = bem;这种不被acorn支持的2b语法
       ExportNamedDeclaration (path) {
         if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.6.110",
+  "version": "2.6.114-alpha.0",
   "description": "mpx compile core",
   "keywords": [
     "mpx"
@@ -27,6 +27,9 @@
     "@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",
@@ -79,7 +82,8 @@
   },
   "devDependencies": {
     "@types/babel-traverse": "^6.25.4",
-    "@types/babel-types": "^7.0.4"
+    "@types/babel-types": "^7.0.4",
+    "webpack": "^4.46.0"
   },
-  "gitHead": "a772b52decbf4a3bdc3b5b608a18327bce453b6c"
+  "gitHead": "7f944d9d7fe0dd3bd0a798c6268c6d08f90d62c0"
 }