@mpxjs/webpack-plugin 2.6.114-alpha.6 → 2.6.114-alpha.9

package/lib/template-compiler/index.js

@@ -1,19 +1,14 @@
 const compiler = require('./compiler')
-const loaderUtils = require('loader-utils')
 const bindThis = require('./bind-this').transform
-const InjectDependency = require('../dependency/InjectDependency')
 const parseRequest = require('../utils/parse-request')
-const getMainCompilation = require('../utils/get-main-compilation')
-const matchCondition = require('../utils/match-condition')
-const path = require('path')
+const { matchCondition } = require('../utils/match-condition')
+const loaderUtils = require('loader-utils')
 
 module.exports = function (raw) {
   this.cacheable()
-  const options = loaderUtils.getOptions(this) || {}
   const { resourcePath, queryObj } = parseRequest(this.resource)
-  const compilation = this._compilation
-  const mainCompilation = getMainCompilation(compilation)
-  const mpx = mainCompilation.__mpx__
+  const mpx = this.getMpx()
+  const root = mpx.projectRoot
   const mode = mpx.mode
   const env = mpx.env
   const defs = mpx.defs
@@ -25,6 +20,11 @@ module.exports = function (raw) {
   const packageName = queryObj.packageRoot || mpx.currentPackageRoot || 'main'
   const componentsMap = mpx.componentsMap[packageName]
   const wxsContentMap = mpx.wxsContentMap
+  const usingComponents = queryObj.usingComponents || []
+  const hasComment = queryObj.hasComment
+  const isNative = queryObj.isNative
+  const hasScoped = queryObj.hasScoped
+  const moduleId = queryObj.moduleId || 'm' + mpx.pathHash(resourcePath)
 
   const warn = (msg) => {
     this.emitWarning(
@@ -38,13 +38,12 @@ module.exports = function (raw) {
     )
   }
 
-  const parsed = compiler.parse(raw, {
+  const { root: ast, meta } = compiler.parse(raw, {
     warn,
     error,
-    usingComponents: options.usingComponents,
-    hasComment: options.hasComment,
-    isNative: options.isNative,
-    basename: path.basename(resourcePath),
+    usingComponents,
+    hasComment,
+    isNative,
     isComponent: !!componentsMap[resourcePath],
     mode,
     env,
@@ -52,49 +51,56 @@ module.exports = function (raw) {
     defs,
     decodeHTMLText,
     externalClasses,
-    hasScoped: options.hasScoped,
-    moduleId: options.moduleId,
-    filePath: this.resourcePath,
+    hasScoped,
+    moduleId,
+    // 这里需传递resourcePath和wxsContentMap保持一致
+    filePath: resourcePath,
     i18n,
     checkUsingComponents: mpx.checkUsingComponents,
     globalComponents: Object.keys(mpx.usingComponents),
-    // deprecated option
-    globalMpxAttrsFilter: mpx.globalMpxAttrsFilter,
-    forceProxyEvent: matchCondition(this.resourcePath, mpx.forceProxyEventRules),
-    hasVirtualHost: matchCondition(resourcePath, mpx.autoVirtualHostRules)
+    forceProxyEvent: matchCondition(resourcePath, mpx.forceProxyEventRules),
+    hasVirtualHost: matchCondition(resourcePath, mpx.autoVirtualHostRules),
+    proxyComponentEventsRules: mpx.proxyComponentEventsRules
   })
 
-  let ast = parsed.root
-  let meta = parsed.meta
-
   if (meta.wxsContentMap) {
     for (let module in meta.wxsContentMap) {
       wxsContentMap[`${resourcePath}~${module}`] = meta.wxsContentMap[module]
     }
   }
 
+  let resultSource = ''
+
+  for (let module in meta.wxsModuleMap) {
+    const src = loaderUtils.urlToRequest(meta.wxsModuleMap[module], root)
+    resultSource += `var ${module} = require(${loaderUtils.stringifyRequest(this, src)});\n`
+  }
+
   let result = compiler.serialize(ast)
 
-  if (options.isNative || mpx.forceDisableInject) {
+  if (isNative) {
     return result
   }
 
-  const rawCode = `global.currentInject = {
-    moduleId: ${JSON.stringify(options.moduleId)},
-    render: function () {
-      ${compiler.genNode(ast)}this._r();
-    }
+  const rawCode = `
+global.currentInject = {
+  moduleId: ${JSON.stringify(moduleId)},
+  render: function () {
+    ${compiler.genNode(ast)}
+    this._r();
+  }
 };\n`
 
-  let renderResult
+  let bindResult
 
   try {
-    renderResult = bindThis(rawCode, {
+    bindResult = bindThis(rawCode, {
       needCollect: true,
       ignoreMap: meta.wxsModuleMap
     })
   } catch (e) {
-    error(`Invalid render function generated by the template, please check!\n
+    error(`
+Invalid render function generated by the template, please check!\n
 Template result:
 ${result}\n
 Error code:
@@ -104,123 +110,30 @@ ${e.stack}`)
     return result
   }
 
-  // todo 此处在loader中往其他模块addDep更加危险，考虑修改为通过抽取后的空模块的module.exports来传递信息
-  let globalInjectCode = renderResult.code + '\n'
+  resultSource += bindResult.code + '\n'
 
-  if ((mode === 'tt' || mode === 'swan') && renderResult.propKeys) {
-    globalInjectCode += `global.currentInject.propKeys = ${JSON.stringify(renderResult.propKeys)};\n`
+  if ((mode === 'tt' || mode === 'swan') && bindResult.propKeys) {
+    resultSource += `global.currentInject.propKeys = ${JSON.stringify(bindResult.propKeys)};\n`
   }
 
   if (meta.computed) {
-    globalInjectCode += bindThis(`global.currentInject.injectComputed = {
+    resultSource += bindThis(`
+global.currentInject.injectComputed = {
   ${meta.computed.join(',')}
-  };`).code + '\n'
+};`).code + '\n'
   }
 
   if (meta.refs) {
-    globalInjectCode += `global.currentInject.getRefsData = function () {
+    resultSource += `
+global.currentInject.getRefsData = function () {
   return ${JSON.stringify(meta.refs)};
-  };\n`
-  }
-
-  if (meta.options) {
-    globalInjectCode += bindThis(`global.currentInject.injectOptions = ${JSON.stringify(meta.options)};`).code + '\n'
+};\n`
   }
 
-  const issuer = this._module.issuer
-  const parser = issuer.parser
-
-  // 同步issuer的dependencies，确保watch中issuer rebuild时template也进行rebuild，使该loader中往issuer中注入的依赖持续有效
-  issuer.buildInfo.fileDependencies.forEach((dep) => {
-    this.addDependency(dep)
-  })
-  issuer.buildInfo.contextDependencies.forEach((dep) => {
-    this.addContextDependency(dep)
-  })
-
-  // 删除issuer中上次注入的dependencies，避免issuer本身不需要更新时上次的注入代码残留
-  issuer.dependencies = issuer.dependencies.filter((dep) => {
-    return !dep.templateInject
-  })
-
-  const dep = new InjectDependency({
-    content: globalInjectCode,
-    index: -2
+  this.emitFile(resourcePath, '', undefined, {
+    skipEmit: true,
+    extractedResultSource: resultSource
   })
 
-  dep.templateInject = true
-  issuer.addDependency(dep)
-
-  let isSync = true
-
-  const iterationOfArrayCallback = (arr, fn) => {
-    for (let index = 0; index < arr.length; index++) {
-      fn(arr[index])
-    }
-  }
-
-  const dependencies = new Map()
-
-  const addDependency = dep => {
-    const resourceIdent = dep.getResourceIdentifier()
-    if (resourceIdent) {
-      const factory = compilation.dependencyFactories.get(dep.constructor)
-      if (factory === undefined) {
-        throw new Error(`No module factory available for dependency type: ${dep.constructor.name}`)
-      }
-      let innerMap = dependencies.get(factory)
-      if (innerMap === undefined) {
-        dependencies.set(factory, (innerMap = new Map()))
-      }
-      let list = innerMap.get(resourceIdent)
-      if (list === undefined) innerMap.set(resourceIdent, (list = []))
-      list.push(dep)
-    }
-  }
-
-  for (let module in meta.wxsModuleMap) {
-    isSync = false
-    const src = loaderUtils.urlToRequest(meta.wxsModuleMap[module], options.root)
-    // 编译render函数只在mpx文件中运行，此处issuer的context一定等同于当前loader的context
-    const expression = `require(${loaderUtils.stringifyRequest(this, src)})`
-    const deps = []
-    parser.parse(expression, {
-      current: {
-        addDependency: dep => {
-          dep.userRequest = module
-          deps.push(dep)
-        }
-      },
-      module: issuer
-    })
-    issuer.addVariable(module, expression, deps)
-    iterationOfArrayCallback(deps, addDependency)
-  }
-
-  if (isSync) {
-    return result
-  } else {
-    const callback = this.async()
-
-    const sortedDependencies = []
-    for (const pair1 of dependencies) {
-      for (const pair2 of pair1[1]) {
-        sortedDependencies.push({
-          factory: pair1[0],
-          dependencies: pair2[1]
-        })
-      }
-    }
-
-    compilation.addModuleDependencies(
-      issuer,
-      sortedDependencies,
-      compilation.bail,
-      null,
-      true,
-      () => {
-        callback(null, result)
-      }
-    )
-  }
+  return result
 }

package/lib/template-compiler/trans-dynamic-class-expr.js

@@ -1,29 +1,34 @@
 const babylon = require('@babel/parser')
 const t = require('@babel/types')
+const traverse = require('@babel/traverse').default
 const generate = require('@babel/generator').default
 
 module.exports = function transDynamicClassExpr (expr, { error } = {}) {
   try {
-    const ast = babylon.parseExpression(expr, {
+    const ast = babylon.parse(expr, {
       plugins: [
         'objectRestSpread'
       ]
     })
-    if (t.isObjectExpression(ast)) {
-      ast.properties.forEach((property) => {
-        if (t.isObjectProperty(property) && !property.computed) {
-          const propertyName = property.key.name || property.key.value
-          if (/-/.test(propertyName)) {
-            if (/\$/.test(propertyName)) {
-              error && error(`Dynamic classname [${propertyName}] is not supported, which includes [-] char and [$] char at the same time.`)
+    traverse(ast, {
+      ObjectExpression (path) {
+        path.node.properties.forEach((property) => {
+          if (t.isObjectProperty(property) && !property.computed) {
+            const propertyName = property.key.name || property.key.value
+            if (/-/.test(propertyName)) {
+              if (/\$/.test(propertyName)) {
+                error && error(`Dynamic classname [${propertyName}] is not supported, which includes [-] char and [$] char at the same time.`)
+              } else {
+                property.key = t.identifier(propertyName.replace(/-/g, '$$') + 'MpxDash')
+              }
             } else {
-              property.key = t.identifier(propertyName.replace(/-/g, '$$') + 'MpxDash')
+              property.key = t.identifier(propertyName)
             }
           }
-        }
-      })
-    }
-    return generate(ast, {
+        })
+      }
+    })
+    return generate(ast.program.body[0].expression, {
       compact: true
     }).code
   } catch (e) {

package/lib/tenon/index.js

@@ -15,8 +15,6 @@ module.exports = function ({
   queryObj,
   autoScope,
   componentsMap,
-  projectRoot,
-  getRequireForSrc,
   vueContentCache,
   moduleId,
   callback
@@ -29,6 +27,7 @@ module.exports = function ({
   const defs = mpx.defs
   const resolveMode = mpx.resolveMode
   const pagesMap = mpx.pagesMap
+  const projectRoot = mpx.projectRoot
 
   let output = ''
   let usingComponents = [].concat(Object.keys(mpx.usingComponents))
@@ -66,7 +65,6 @@ module.exports = function ({
             resolveMode,
             loaderContext,
             pagesMap,
-            pagesEntryMap: mpx.pagesEntryMap,
             pathHash: mpx.pathHash,
             componentsMap,
             projectRoot
@@ -89,7 +87,6 @@ module.exports = function ({
         srcMode,
         loaderContext,
         isProduction,
-        getRequireForSrc,
         projectRoot,
         jsonConfig: jsonRes.jsonObj,
         componentId: queryObj.componentId || '',

package/lib/tenon/processJSON.js

@@ -3,10 +3,10 @@ const path = require('path')
 const JSON5 = require('json5')
 const loaderUtils = require('loader-utils')
 const parseRequest = require('../utils/parse-request')
-const toPosix = require('../utils/to-posix')
+// const toPosix = require('../utils/to-posix')
 const addQuery = require('../utils/add-query')
 const parseComponent = require('../parser')
-const readJsonForSrc = require('../utils/read-json-for-src')
+const getJSONContent = require('../utils/get-json-content')
 const isUrlRequest = require('../utils/is-url-request')
 
 module.exports = function (json, options, rawCallback) {
@@ -15,9 +15,8 @@ module.exports = function (json, options, rawCallback) {
   const defs = options.defs
   const loaderContext = options.loaderContext
   const resolveMode = options.resolveMode
-  const pagesMap = options.pagesMap
+  // const pagesMap = options.pagesMap
   const componentsMap = options.componentsMap
-  const pagesEntryMap = options.pagesEntryMap
   const projectRoot = options.projectRoot
   const pathHash = options.pathHash
   const localPagesMap = {}
@@ -30,17 +29,17 @@ module.exports = function (json, options, rawCallback) {
   let tabBarStr
   const context = loaderContext.context
 
-  const emitWarning = (msg) => {
-    loaderContext.emitWarning(
-      new Error('[json processor][' + loaderContext.resource + ']: ' + msg)
-    )
-  }
+  // const emitWarning = (msg) => {
+  //   loaderContext.emitWarning(
+  //     new Error('[json processor][' + loaderContext.resource + ']: ' + msg)
+  //   )
+  // }
 
-  const emitError = (msg) => {
-    this.emitError(
-      new Error('[json compiler][' + this.resource + ']: ' + msg)
-    )
-  }
+  // const emitError = (msg) => {
+  //   this.emitError(
+  //     new Error('[json compiler][' + this.resource + ']: ' + msg)
+  //   )
+  // }
 
   // const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
 
@@ -134,8 +133,8 @@ module.exports = function (json, options, rawCallback) {
               if (json.content) {
                 content = json.content
               } else if (json.src) {
-                return readJsonForSrc(json.src, loaderContext, (content) => {
-                  callback(null, result, content)
+                return getJSONContent(json || {}, loaderContext, (err, content) => {
+                  callback(err, result, content)
                 })
               }
             }
@@ -187,73 +186,69 @@ module.exports = function (json, options, rawCallback) {
     }
   }
 
-  const getPageName = (resourcePath, ext) => {
-    const baseName = path.basename(resourcePath, ext)
-    return path.join('pages', baseName + pathHash(resourcePath), baseName)
-  }
+  // const getPageName = (resourcePath, ext) => {
+  //   const baseName = path.basename(resourcePath, ext)
+  //   return path.join('pages', baseName + pathHash(resourcePath), baseName)
+  // }
 
   const processPages = (pages, srcRoot = '', tarRoot = '', context, callback) => {
     if (pages) {
       context = path.join(context, srcRoot)
       async.forEach(pages, (page, callback) => {
-        let aliasPath = ''
+        let pagePath = page
         if (typeof page !== 'string') {
-          aliasPath = page.path
-          page = page.src
+          pagePath = page.src
         }
-        if (!isUrlRequest(page, projectRoot)) return callback()
-        if (resolveMode === 'native') {
-          page = loaderUtils.urlToRequest(page, projectRoot)
-        }
-        resolve(context, page, (err, resource) => {
-          if (err) return callback(err)
-          const { resourcePath, queryObj } = parseRequest(resource)
-          const ext = path.extname(resourcePath)
-          // 获取pageName
-          let pageName
-          if (aliasPath) {
-            pageName = toPosix(path.join(tarRoot, 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)
-            if (/^\./.test(relative)) {
-              // 如果当前page不存在于context中，对其进行重命名
-              pageName = toPosix(path.join(tarRoot, getPageName(resourcePath, ext)))
-              emitWarning(`Current page [${resourcePath}] is not in current pages directory [${context}], the page path will be replaced with [${pageName}], use ?resolve to get the page path and navigate to it!`)
-            } else {
-              pageName = toPosix(path.join(tarRoot, /^(.*?)(\.[^.]*)?$/.exec(relative)[1]))
-              // 如果当前page与已有page存在命名冲突，也进行重命名
-              for (let key in pagesMap) {
-                // 此处引入pagesEntryMap确保相同entry下路由路径重复注册才报错，不同entry下的路由路径重复则无影响
-                if (pagesMap[key] === pageName && key !== resourcePath && pagesEntryMap[key] === loaderContext.resourcePath) {
-                  const pageNameRaw = pageName
-                  pageName = toPosix(path.join(tarRoot, getPageName(resourcePath, ext)))
-                  emitWarning(`Current page [${resourcePath}] is registered with a conflict page path [${pageNameRaw}] which is already existed in system, the page path will be replaced with [${pageName}], use ?resolve to get the page path and navigate to it!`)
-                  break
-                }
-              }
-            }
-          }
-          if (pagesMap[resourcePath]) {
-            emitWarning(`Current page [${resourcePath}] which is imported from [${loaderContext.resourcePath}] has been registered in pagesMap already, it will be ignored, please check it and remove the redundant page declaration!`)
-            return callback()
-          }
-          buildInfo.pagesMap = buildInfo.pagesMap || {}
-          buildInfo.pagesMap[resourcePath] = pagesMap[resourcePath] = pageName
-          pagesEntryMap[resourcePath] = loaderContext.resourcePath
-          localPagesMap[pageName] = {
-            resource: addQuery(resource, { page: true }),
-            async: tarRoot || queryObj.async,
-            isFirst: queryObj.isFirst
-          }
-          callback()
-        })
+        // if (!isUrlRequest(page, projectRoot)) return callback()
+        // if (resolveMode === 'native') {
+        //   page = loaderUtils.urlToRequest(page, projectRoot)
+        // }
+        // resolve(context, page, (err, resource) => {
+        //   if (err) return callback(err)
+        //   const { resourcePath, queryObj } = parseRequest(resource)
+        //   const ext = path.extname(resourcePath)
+        //   // 获取pageName
+        //   let pageName
+        //   if (aliasPath) {
+        //     pageName = toPosix(path.join(tarRoot, 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)
+        //     if (/^\./.test(relative)) {
+        //       // 如果当前page不存在于context中，对其进行重命名
+        //       pageName = toPosix(path.join(tarRoot, getPageName(resourcePath, ext)))
+        //       emitWarning(`Current page [${resourcePath}] is not in current pages directory [${context}], the page path will be replaced with [${pageName}], use ?resolve to get the page path and navigate to it!`)
+        //     } else {
+        //       pageName = toPosix(path.join(tarRoot, /^(.*?)(\.[^.]*)?$/.exec(relative)[1]))
+        //       // 如果当前page与已有page存在命名冲突，也进行重命名
+        //       for (let key in pagesMap) {
+        //         // 此处引入pagesMap确保相同entry下路由路径重复注册才报错，不同entry下的路由路径重复则无影响
+        //         if (pagesMap[key] === pageName && key !== resourcePath && pagesMap[key] === loaderContext.resourcePath) {
+        //           const pageNameRaw = pageName
+        //           pageName = toPosix(path.join(tarRoot, getPageName(resourcePath, ext)))
+        //           emitWarning(`Current page [${resourcePath}] is registered with a conflict page path [${pageNameRaw}] which is already existed in system, the page path will be replaced with [${pageName}], use ?resolve to get the page path and navigate to it!`)
+        //           break
+        //         }
+        //       }
+        //     }
+        //   }
+        //   if (pagesMap[resourcePath]) {
+        //     emitWarning(`Current page [${resourcePath}] which is imported from [${loaderContext.resourcePath}] has been registered in pagesMap already, it will be ignored, please check it and remove the redundant page declaration!`)
+        //     return callback()
+        //   }
+        // buildInfo.pagesMap = buildInfo.pagesMap || {}
+        // buildInfo.pagesMap[resourcePath] = pagesMap[resourcePath] = pageName
+        // pagesMap[resourcePath] = loaderContext.resourcePath
+        localPagesMap[pagePath] = page
+        //   callback()
+        // })
+        callback()
       }, callback)
     } else {
       callback()