@mpxjs/webpack-plugin 2.6.114-alpha.8 → 2.6.115

package/lib/json-compiler/index.js

@@ -1,90 +1,88 @@
 const async = require('async')
 const JSON5 = require('json5')
 const path = require('path')
+const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin')
+const loaderUtils = require('loader-utils')
 const parseComponent = require('../parser')
 const config = require('../config')
+const normalize = require('../utils/normalize')
+const nativeLoaderPath = normalize.lib('native-loader')
+const themeLoaderPath = normalize.lib('json-compiler/theme-loader')
+const extractorPath = normalize.lib('extractor')
 const parseRequest = require('../utils/parse-request')
-const evalJSONJS = require('../utils/eval-json-js')
+const mpxJSON = require('../utils/mpx-json')
+const toPosix = require('../utils/to-posix')
 const fixUsingComponent = require('../utils/fix-using-component')
 const getRulesRunner = require('../platform/index')
+const isUrlRequestRaw = require('../utils/is-url-request')
 const addQuery = require('../utils/add-query')
-const getJSONContent = require('../utils/get-json-content')
-const createHelpers = require('../helpers')
-const createJSONHelper = require('./helper')
-const RecordGlobalComponentsDependency = require('../dependencies/RecordGlobalComponentsDependency')
-const RecordIndependentDependency = require('../dependencies/RecordIndependentDependency')
-const { MPX_DISABLE_EXTRACTOR_CACHE, RESOLVE_IGNORED_ERR, JSON_JS_EXT } = require('../utils/const')
-const resolve = require('../utils/resolve')
-
-module.exports = function (content) {
+const readJsonForSrc = require('../utils/read-json-for-src')
+const getMainCompilation = require('../utils/get-main-compilation')
+
+module.exports = function (raw = '{}') {
+  // 该loader中会在每次编译中动态添加entry，不能缓存，否则watch不好使
+  this.cacheable(false)
   const nativeCallback = this.async()
-  const mpx = this.getMpx()
+  const options = loaderUtils.getOptions(this) || {}
+  const mainCompilation = getMainCompilation(this._compilation)
+  const mpx = mainCompilation.__mpx__
+  const getOutputPath = mpx.getOutputPath
+
+  const emitWarning = (msg) => {
+    this.emitWarning(
+      new Error('[json compiler][' + this.resource + ']: ' + msg)
+    )
+  }
+
+  const emitError = (msg) => {
+    this.emitError(
+      new Error('[json compiler][' + this.resource + ']: ' + msg)
+    )
+  }
+
+  const stringifyRequest = r => loaderUtils.stringifyRequest(this, r)
+  const isUrlRequest = r => isUrlRequestRaw(r, options.root)
+  const urlToRequest = r => loaderUtils.urlToRequest(r)
 
   if (!mpx) {
-    return nativeCallback(null, content)
+    return nativeCallback(null, raw)
   }
-  // json模块必须每次都创建（但并不是每次都需要build），用于动态添加编译入口，传递信息以禁用父级extractor的缓存
-  this.emitFile(MPX_DISABLE_EXTRACTOR_CACHE, '', undefined, { skipEmit: true })
 
   // 微信插件下要求组件使用相对路径
   const useRelativePath = mpx.isPluginMode || mpx.useRelativePath
   const { resourcePath, queryObj } = parseRequest(this.resource)
-  const useJSONJS = queryObj.useJSONJS || this.resourcePath.endsWith(JSON_JS_EXT)
   const packageName = queryObj.packageRoot || mpx.currentPackageRoot || 'main'
   const pagesMap = mpx.pagesMap
   const componentsMap = mpx.componentsMap[packageName]
-  const appInfo = mpx.appInfo
+  const getEntryNode = mpx.getEntryNode
   const mode = mpx.mode
   const env = mpx.env
+  const defs = mpx.defs
   const globalSrcMode = mpx.srcMode
   const localSrcMode = queryObj.mode
   const srcMode = localSrcMode || globalSrcMode
-
+  const resolveMode = mpx.resolveMode
+  const externals = mpx.externals
+  const pathHash = mpx.pathHash
   const isApp = !(pagesMap[resourcePath] || componentsMap[resourcePath])
   const publicPath = this._compilation.outputOptions.publicPath || ''
   const fs = this._compiler.inputFileSystem
+  const rootName = mainCompilation._preparedEntrypoints[0].name
+  const currentName = componentsMap[resourcePath] || pagesMap[resourcePath] || rootName
+  const currentPath = publicPath + currentName
 
-  const emitWarning = (msg) => {
-    this.emitWarning(
-      new Error('[json compiler][' + this.resource + ']: ' + msg)
-    )
-  }
-
-  const emitError = (msg) => {
-    this.emitError(
-      new Error('[json compiler][' + this.resource + ']: ' + msg)
-    )
-  }
-
-  const {
-    isUrlRequest,
-    urlToRequest,
-    processPage,
-    processDynamicEntry,
-    processComponent,
-    processJsExport
-  } = createJSONHelper({
-    loaderContext: this,
-    emitWarning,
-    emitError
-  })
-
-  const { getRequestString } = createHelpers(this)
+  // json模块都是由.mpx或.js的入口模块引入，且引入关系为一对一，其issuer必为入口module
+  const entryModule = this._module.issuer
+  // 通过rawRequest关联entryNode和entryModule
+  const entryRequest = entryModule.rawRequest
+  const entryType = isApp ? 'App' : pagesMap[resourcePath] ? 'Page' : 'Component'
 
-  let currentName
-
-  if (isApp) {
-    currentName = appInfo.name
-  } else {
-    currentName = componentsMap[resourcePath] || pagesMap[resourcePath]
-  }
-
-  const relativePath = useRelativePath ? publicPath + path.dirname(currentName) : ''
+  const currentEntry = getEntryNode(entryRequest, entryType, entryModule)
 
   const copydir = (dir, context, callback) => {
     fs.readdir(dir, (err, files) => {
       if (err) return callback(err)
-      async.each(files, (file, callback) => {
+      async.forEach(files, (file, callback) => {
         file = path.join(dir, file)
         async.waterfall([
           (callback) => {
@@ -96,7 +94,6 @@ module.exports = function (content) {
             } else {
               fs.readFile(file, (err, content) => {
                 if (err) return callback(err)
-                if (!this._compilation) return callback()
                 let targetPath = path.relative(context, file)
                 this._compilation.assets[targetPath] = {
                   size: function size () {
@@ -115,20 +112,58 @@ module.exports = function (content) {
     })
   }
 
+  let entryDeps = new Set()
+
+  let cacheCallback
+
+  const checkEntryDeps = (callback) => {
+    callback = callback || cacheCallback
+    if (callback && entryDeps.size === 0) {
+      callback()
+    } else {
+      cacheCallback = callback
+    }
+  }
+
+  const addEntrySafely = (resource, name, callback) => {
+    // 如果loader已经回调，就不再添加entry
+    if (callbacked) return callback()
+    const dep = SingleEntryPlugin.createDependency(resource, name)
+    entryDeps.add(dep)
+    this._compilation.addEntry(this._compiler.context, dep, name, (err, module) => {
+      entryDeps.delete(dep)
+      checkEntryDeps()
+      callback(err, module)
+    })
+  }
+
+  // const deleteEntry = (name) => {
+  //   const index = this._compilation._preparedEntrypoints.findIndex(slot => slot.name === name)
+  //   if (index >= 0) {
+  //     this._compilation._preparedEntrypoints.splice(index, 1)
+  //   }
+  // }
+
+  let callbacked = false
   const callback = (err, processOutput) => {
-    if (err) return nativeCallback(err)
-    let output = `var json = ${JSON.stringify(json, null, 2)};\n`
-    if (processOutput) output = processOutput(output)
-    output += `module.exports = JSON.stringify(json, null, 2);\n`
-    nativeCallback(null, output)
+    checkEntryDeps(() => {
+      callbacked = true
+      if (err) return nativeCallback(err)
+      let output = `var json = ${JSON.stringify(json, null, 2)};\n`
+      if (processOutput) output = processOutput(output)
+      output += `module.exports = JSON.stringify(json, null, 2);\n`
+      nativeCallback(null, output)
+    })
   }
 
-  let json
+  let json = {}
   try {
-    if (useJSONJS) {
-      json = evalJSONJS(content, this.resourcePath, this)
+    // 使用了MPXJSON的话先编译
+    // 此处需要使用真实的resourcePath
+    if (this.resourcePath.endsWith('.json.js')) {
+      json = JSON.parse(mpxJSON.compileMPXJSONText({ source: raw, defs, filePath: this.resourcePath }))
     } else {
-      json = JSON5.parse(content || '{}')
+      json = JSON5.parse(raw)
     }
   } catch (err) {
     return callback(err)
@@ -141,9 +176,6 @@ module.exports = function (content) {
       if (!json.usingComponents) {
         json.usingComponents = {}
       }
-      if (!json.component && mode === 'swan') {
-        json.component = true
-      }
     }
   } else if (componentsMap[resourcePath]) {
     // component
@@ -189,7 +221,13 @@ module.exports = function (content) {
   } else {
     // 保存全局注册组件
     if (json.usingComponents) {
-      this._module.addPresentationalDependency(new RecordGlobalComponentsDependency(json.usingComponents, this.context))
+      mpx.usingComponents = {}
+      Object.keys(json.usingComponents).forEach((key) => {
+        const request = json.usingComponents[key]
+        mpx.usingComponents[key] = addQuery(request, {
+          context: this.context
+        })
+      })
     }
   }
 
@@ -199,68 +237,141 @@ module.exports = function (content) {
     rulesRunner(json)
   }
 
+  const resolve = (context, request, callback) => {
+    const { queryObj } = parseRequest(request)
+    context = queryObj.context || context
+    return this.resolve(context, request, callback)
+  }
+
   const processComponents = (components, context, callback) => {
     if (components) {
-      async.eachOf(components, (component, name, callback) => {
-        processComponent(component, context, { relativePath }, (err, entry) => {
-          if (err === RESOLVE_IGNORED_ERR) {
-            delete components[name]
-            return callback()
+      async.forEachOf(components, (component, name, callback) => {
+        processComponent(component, context, (componentPath) => {
+          if (useRelativePath === true) {
+            componentPath = toPosix(path.relative(path.dirname(currentPath), componentPath))
           }
-          if (err) return callback(err)
-          components[name] = entry
-          callback()
-        })
+          components[name] = componentPath
+        }, undefined, callback)
       }, callback)
     } else {
       callback()
     }
   }
 
+  const processComponent = (component, context, rewritePath, outputPath, callback) => {
+    if (!isUrlRequest(component)) return callback()
+    if (resolveMode === 'native') {
+      component = urlToRequest(component)
+    }
+
+    if (externals.some((external) => {
+      if (typeof external === 'string') {
+        return external === component
+      } else if (external instanceof RegExp) {
+        return external.test(component)
+      }
+      return false
+    })) {
+      return callback()
+    }
+
+    resolve(context, component, (err, resource, info) => {
+      if (err) return callback(err)
+      const resourcePath = parseRequest(resource).resourcePath
+      const parsed = path.parse(resourcePath)
+      const ext = parsed.ext
+      const resourceName = path.join(parsed.dir, parsed.name)
+
+      if (!outputPath) {
+        if (ext === '.js' && resourceName.includes('node_modules')) {
+          let root = info.descriptionFileRoot
+          let name = 'nativeComponent'
+          if (info.descriptionFileData) {
+            if (info.descriptionFileData.miniprogram) {
+              root = path.join(root, info.descriptionFileData.miniprogram)
+            }
+            if (info.descriptionFileData.name) {
+              // 去掉name里面的@符号，因为支付宝不支持文件路径上有@
+              name = info.descriptionFileData.name.split('@').join('')
+            }
+          }
+          let relativePath = path.relative(root, resourceName)
+          outputPath = path.join('components', name + pathHash(root), relativePath)
+        } else {
+          outputPath = getOutputPath(resourcePath, 'component')
+        }
+      }
+      const { packageRoot, outputPath: componentPath, alreadyOutputed } = mpx.getPackageInfo({
+        resource,
+        outputPath,
+        resourceType: 'components',
+        warn: (err) => {
+          this.emitWarning(err)
+        }
+      })
+      if (packageRoot) {
+        resource = addQuery(resource, {
+          packageRoot
+        })
+      }
+      rewritePath && rewritePath(publicPath + componentPath)
+      if (ext === '.js') {
+        resource = '!!' + nativeLoaderPath + '!' + resource
+      }
+      currentEntry.addChild(getEntryNode(resource, 'Component'))
+      // 如果之前已经创建了入口，直接return
+      if (alreadyOutputed) {
+        return callback()
+      }
+      addEntrySafely(resource, componentPath, callback)
+    })
+  }
+
+  // 由于json模块都是由mpx/js文件引入的，需要向上找两层issuer获取真实的引用源
+  const getJsonIssuer = (module) => {
+    if (module.issuer) {
+      return module.issuer.issuer
+    }
+  }
+
   if (isApp) {
+    if (!mpx.hasApp) {
+      mpx.hasApp = true
+    } else {
+      const issuer = getJsonIssuer(this._module)
+      if (issuer) {
+        emitError(`[json compiler]:Mpx单次构建中只能存在一个App，当前组件/页面[${this.resource}]通过[${issuer.resource}]非法引入，引用的资源将被忽略，请确保组件/页面资源通过usingComponents/pages配置引入！`)
+      } else {
+        emitError(`[json compiler]:Mpx单次构建中只能存在一个App，请检查当前entry中的资源[${this.resource}]是否为组件/页面，通过添加?component/page查询字符串显式声明该资源是组件/页面！`)
+      }
+      return callback()
+    }
     // app.json
-    const localPages = []
     const subPackagesCfg = {}
-    const pageKeySet = new Set()
-
-    const processPages = (pages, context, tarRoot = '', callback) => {
-      if (pages) {
-        async.each(pages, (page, callback) => {
-          processPage(page, context, tarRoot, (err, entry, { isFirst, key } = {}) => {
-            if (err) return callback(err === RESOLVE_IGNORED_ERR ? null : err)
-            if (pageKeySet.has(key)) return callback()
-            pageKeySet.add(key)
-            if (tarRoot && subPackagesCfg) {
-              subPackagesCfg[tarRoot].pages.push(entry)
-            } else {
-              // 确保首页
-              if (isFirst) {
-                localPages.unshift(entry)
-              } else {
-                localPages.push(entry)
-              }
-            }
-            callback()
-          })
-        }, callback)
+    const localPages = []
+    const processSubPackagesQueue = []
+    // 添加首页标识
+    if (json.pages && json.pages[0]) {
+      if (typeof json.pages[0] !== 'string') {
+        json.pages[0].src = addQuery(json.pages[0].src, { isFirst: true })
       } else {
-        callback()
+        json.pages[0] = addQuery(json.pages[0], { isFirst: true })
       }
     }
 
     const processPackages = (packages, context, callback) => {
       if (packages) {
-        async.each(packages, (packagePath, callback) => {
+        async.forEach(packages, (packagePath, callback) => {
           const { queryObj } = parseRequest(packagePath)
           async.waterfall([
             (callback) => {
-              resolve(context, packagePath, this, (err, result) => {
-                if (err) return callback(err)
+              resolve(context, packagePath, (err, result) => {
                 const { rawResourcePath } = parseRequest(result)
                 callback(err, rawResourcePath)
               })
             },
             (result, callback) => {
+              this.addDependency(result)
               fs.readFile(result, (err, content) => {
                 if (err) return callback(err)
                 callback(err, result, content.toString('utf-8'))
@@ -268,21 +379,24 @@ module.exports = function (content) {
             },
             (result, content, callback) => {
               const extName = path.extname(result)
-              if (extName === '.mpx') {
+              if (extName === '.mpx' || extName === '.vue') {
                 const parts = parseComponent(content, {
                   filePath: result,
                   needMap: this.sourceMap,
                   mode,
+                  defs,
                   env
                 })
-                // 对于通过.mpx文件声明的独立分包，默认将其自身的script block视为init module
-                if (queryObj.independent === true) queryObj.independent = result
-                getJSONContent(parts.json || {}, this, (err, content) => {
-                  callback(err, result, content)
-                })
-              } else {
-                callback(null, result, content)
+                const json = parts.json || {}
+                if (json.content) {
+                  content = json.content
+                } else if (json.src) {
+                  return readJsonForSrc(json.src, this, (content) => {
+                    callback(null, result, content)
+                  })
+                }
               }
+              callback(null, result, content)
             },
             (result, content, callback) => {
               try {
@@ -308,12 +422,12 @@ module.exports = function (content) {
                     subPackage.plugins = content.plugins
                   }
 
-                  processSelfQueue.push((callback) => {
+                  processSubPackagesQueue.push((callback) => {
                     processSubPackage(subPackage, context, callback)
                   })
                 } else {
                   processSelfQueue.push((callback) => {
-                    processPages(content.pages, context, '', callback)
+                    processPages(content.pages, '', '', context, callback)
                   })
                 }
               }
@@ -328,16 +442,14 @@ module.exports = function (content) {
                 callback()
               }
             }
-          ], (err) => {
-            callback(err === RESOLVE_IGNORED_ERR ? null : err)
-          })
+          ], callback)
         }, callback)
       } else {
         callback()
       }
     }
 
-    const getOtherConfig = (config) => {
+    const getOtherConfig = (raw) => {
       let result = {}
       let blackListMap = {
         tarRoot: true,
@@ -345,39 +457,14 @@ module.exports = function (content) {
         root: true,
         pages: true
       }
-      for (let key in config) {
+      for (let key in raw) {
         if (!blackListMap[key]) {
-          result[key] = config[key]
+          result[key] = raw[key]
         }
       }
       return result
     }
 
-    const recordIndependent = (root, request) => {
-      this._module && this._module.addPresentationalDependency(new RecordIndependentDependency(root, request))
-    }
-
-    const processIndependent = (otherConfig, context, tarRoot, callback) => {
-      // 支付宝不支持独立分包，无需处理
-      const independent = otherConfig.independent
-      if (!independent || mode === 'ali') {
-        delete otherConfig.independent
-        return callback()
-      }
-      // independent配置为字符串时视为init module
-      if (typeof independent === 'string') {
-        otherConfig.independent = true
-        resolve(context, independent, this, (err, result) => {
-          if (err) return callback(err)
-          recordIndependent(tarRoot, result)
-          callback()
-        })
-      } else {
-        recordIndependent(tarRoot, true)
-        callback()
-      }
-    }
-
     // 为了获取资源的所属子包，该函数需串行执行
     const processSubPackage = (subPackage, context, callback) => {
       if (subPackage) {
@@ -389,27 +476,29 @@ module.exports = function (content) {
         let srcRoot = subPackage.srcRoot || subPackage.root || ''
         if (!tarRoot || subPackagesCfg[tarRoot]) return callback()
 
-        context = path.join(context, srcRoot)
         const otherConfig = getOtherConfig(subPackage)
+        // 支付宝不支持独立分包，无需处理
+        if (otherConfig.independent && mode !== 'ali') {
+          mpx.independentSubpackagesMap[tarRoot] = true
+        }
+
         subPackagesCfg[tarRoot] = {
           root: tarRoot,
-          pages: []
+          pages: [],
+          ...otherConfig
         }
+        mpx.currentPackageRoot = tarRoot
+        mpx.componentsMap[tarRoot] = {}
+        mpx.staticResourcesMap[tarRoot] = {}
+        mpx.subpackageModulesMap[tarRoot] = {}
         async.parallel([
           (callback) => {
-            processIndependent(otherConfig, context, tarRoot, callback)
-          },
-          (callback) => {
-            processPages(subPackage.pages, context, tarRoot, callback)
+            processPages(subPackage.pages, srcRoot, tarRoot, context, callback)
           },
           (callback) => {
-            processPlugins(subPackage.plugins, context, tarRoot, callback)
+            processPlugins(subPackage.plugins, srcRoot, tarRoot, context, callback)
           }
-        ], (err) => {
-          if (err) return callback(err)
-          Object.assign(subPackagesCfg[tarRoot], otherConfig)
-          callback()
-        })
+        ], callback)
       } else {
         callback()
       }
@@ -417,8 +506,92 @@ module.exports = function (content) {
 
     const processSubPackages = (subPackages, context, callback) => {
       if (subPackages) {
-        async.each(subPackages, (subPackage, callback) => {
-          processSubPackage(subPackage, context, callback)
+        subPackages.forEach((subPackage) => {
+          processSubPackagesQueue.push((callback) => {
+            processSubPackage(subPackage, context, callback)
+          })
+        })
+      }
+      callback()
+    }
+
+    // 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 = ''
+          if (typeof page !== 'string') {
+            aliasPath = page.path
+            page = page.src
+          }
+          if (!isUrlRequest(page)) return callback()
+          if (resolveMode === 'native') {
+            page = urlToRequest(page)
+          }
+          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 = getOutputPath(resourcePath, 'page')
+                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) {
+                if (pagesMap[key] === pageName && key !== resourcePath) {
+                  const pageNameRaw = pageName
+                  pageName = getOutputPath(resourcePath, 'page', { conflictPath: pageNameRaw })
+                  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 (ext === '.js') {
+              resource = '!!' + nativeLoaderPath + '!' + resource
+            }
+            // 如果之前已经创建了页面入口，直接return，目前暂时不支持多个分包复用同一个页面
+            if (pagesMap[resourcePath]) {
+              emitWarning(`Current page [${resourcePath}] which is imported from [${this.resourcePath}] has been registered in pagesMap already, it will be ignored, please check it and remove the redundant page declaration!`)
+              return callback()
+            }
+            currentEntry.addChild(getEntryNode(resource, 'Page'))
+            pagesMap[resourcePath] = pageName
+            if (tarRoot && subPackagesCfg[tarRoot]) {
+              resource = addQuery(resource, {
+                packageRoot: tarRoot
+              })
+              subPackagesCfg[tarRoot].pages.push(toPosix(path.relative(tarRoot, pageName)))
+            } else {
+              // 确保首页
+              if (queryObj.isFirst) {
+                localPages.unshift(pageName)
+              } else {
+                localPages.push(pageName)
+              }
+            }
+            addEntrySafely(resource, pageName, callback)
+          })
         }, callback)
       } else {
         callback()
@@ -457,11 +630,15 @@ module.exports = function (content) {
 
     const processThemeLocation = (output) => {
       if (json.themeLocation && isUrlRequest(json.themeLocation)) {
-        const requestString = getRequestString('json', { src: urlToRequest(json.themeLocation) }, {
-          isTheme: true,
-          isStatic: true
-        })
-        output += `json.themeLocation = require(${requestString});\n`
+        const themeRequest = '!!' + extractorPath + '?' +
+          JSON.stringify({
+            type: 'json',
+            index: -1
+          }) + '!' +
+          themeLoaderPath + '?root = ' + options.root + '!' +
+          addQuery(urlToRequest(json.themeLocation), { __component: true, isStatic: true })
+
+        output += `json.themeLocation = require(${stringifyRequest(themeRequest)});\n`
       }
       return output
     }
@@ -478,114 +655,146 @@ module.exports = function (content) {
 
     const processCustomTabBar = (tabBar, context, callback) => {
       if (tabBar && tabBar.custom) {
-        processComponent('./custom-tab-bar/index', context, { outputPath: 'custom-tab-bar/index' }, (err, entry) => {
-          if (err === RESOLVE_IGNORED_ERR) {
-            delete tabBar.custom
-            return callback()
-          }
-          tabBar.custom = entry // hack for javascript parser call hook.
-          callback(err)
-        })
+        processComponent('./custom-tab-bar/index', context, undefined, 'custom-tab-bar/index', callback)
       } else {
         callback()
       }
     }
 
-    const processPluginGenericsImplementation = (plugin, context, tarRoot, callback) => {
-      if (!plugin.genericsImplementation) return callback()
-      const relativePath = useRelativePath ? publicPath + tarRoot : ''
-      async.eachOf(plugin.genericsImplementation, (genericComponents, name, callback) => {
-        async.eachOf(genericComponents, (genericComponentPath, name, callback) => {
-          processComponent(genericComponentPath, context, {
-            tarRoot,
-            relativePath
-          }, (err, entry) => {
-            if (err === RESOLVE_IGNORED_ERR) {
-              delete genericComponents[name]
-              return callback()
+    const addMiniToPluginModules = module => {
+      if (mpx.miniToPluginModules) {
+        mpx.miniToPluginModules.add(module)
+      } else {
+        mpx.miniToPluginModules = new Set([module])
+      }
+    }
+
+    const processPluginGenericsImplementation = (genericsImplementation, tarRoot, context, callback) => {
+      async.forEachOf(genericsImplementation, (genericComponents, name, callback) => {
+        async.forEachOf(genericComponents, (genericComponentPath, name, callback) => {
+          processComponent(genericComponentPath, context, (componentPath) => {
+            if (useRelativePath === true) {
+              componentPath = toPosix(path.relative(publicPath + tarRoot, componentPath))
             }
-            if (err) return callback(err)
-            genericComponents[name] = entry
-          })
+            genericComponents[name] = componentPath
+          }, undefined, callback)
         }, callback)
       }, callback)
     }
 
-    const processPluginExport = (plugin, context, tarRoot, callback) => {
-      if (!plugin.export) return callback()
-      processJsExport(plugin.export, context, tarRoot, (err, entry) => {
-        if (err === RESOLVE_IGNORED_ERR) {
-          delete plugin.export
-          return callback()
-        }
+    const processPluginExport = (plugin, tarRoot, context, callback) => {
+      if (!plugin.export) {
+        return callback()
+      }
+      let pluginExport = plugin.export
+      if (resolveMode === 'native') {
+        pluginExport = urlToRequest(pluginExport)
+      }
+      resolve(context, pluginExport, (err, resource, info) => {
         if (err) return callback(err)
-        plugin.export = entry
-        callback()
+        const { resourcePath } = parseRequest(resource)
+        // 获取 export 的模块名
+        const relative = path.relative(context, resourcePath)
+        const name = toPosix(/^(.*?)(\.[^.]*)?$/.exec(relative)[1])
+        if (/^\./.test(name)) {
+          return callback(new Error(`The miniprogram plugins' export path ${plugin.export} must be in the context ${context}!`))
+        }
+        plugin.export = name + '.js'
+        addEntrySafely(resource, toPosix(tarRoot ? `${tarRoot}/${name}` : name), (err, module) => {
+          if (err) return callback(err)
+          addMiniToPluginModules(module)
+          currentEntry.addChild(getEntryNode(resource, 'PluginExport', module))
+          callback(err, module)
+        })
       })
     }
 
-    const processPlugins = (plugins, context, tarRoot = '', callback) => {
-      if (mode !== 'wx' || !plugins) return callback() // 目前只有微信支持导出到插件
-      async.eachOf(plugins, (plugin, name, callback) => {
+    /* 导出到插件 */
+    const processPlugins = (plugins, srcRoot = '', tarRoot = '', context, callback) => {
+      if (mpx.mode !== 'wx' || !plugins) return callback() // 目前只有微信支持导出到插件
+      context = path.join(context, srcRoot)
+      async.forEachOf(plugins, (plugin, name, callback) => {
         async.parallel([
           (callback) => {
-            processPluginGenericsImplementation(plugin, context, tarRoot, callback)
+            if (plugin.genericsImplementation) {
+              processPluginGenericsImplementation(plugin.genericsImplementation, tarRoot, context, callback)
+            } else {
+              callback()
+            }
           },
           (callback) => {
-            processPluginExport(plugin, context, tarRoot, callback)
+            processPluginExport(plugin, tarRoot, context, callback)
           }
-        ], callback)
+        ], (err) => {
+          callback(err)
+        })
       }, callback)
     }
 
-    async.parallel([
+    // 串行处理，先处理主包代码，再处理分包代码，为了正确识别出分包中定义的组件属于主包还是分包
+    let errors = []
+    // 外部收集errors，确保整个series流程能够执行完
+    async.series([
       (callback) => {
-        // 添加首页标识
-        if (json.pages && json.pages[0]) {
-          if (typeof json.pages[0] !== 'string') {
-            json.pages[0].src = addQuery(json.pages[0].src, { isFirst: true })
-          } else {
-            json.pages[0] = addQuery(json.pages[0], { isFirst: true })
+        async.parallel([
+          (callback) => {
+            processPlugins(json.plugins, '', '', this.context, callback)
+          },
+          (callback) => {
+            processPages(json.pages, '', '', this.context, callback)
+          },
+          (callback) => {
+            processComponents(json.usingComponents, this.context, callback)
+          },
+          (callback) => {
+            processWorkers(json.workers, this.context, callback)
+          },
+          (callback) => {
+            processPackages(json.packages, this.context, callback)
+          },
+          (callback) => {
+            processCustomTabBar(json.tabBar, this.context, callback)
+          },
+          (callback) => {
+            processSubPackages(json.subPackages || json.subpackages, this.context, callback)
           }
-        }
-        processPages(json.pages, this.context, '', callback)
-      },
-      (callback) => {
-        processComponents(json.usingComponents, this.context, callback)
-      },
-      (callback) => {
-        processPlugins(json.plugins, this.context, '', callback)
-      },
-      (callback) => {
-        processWorkers(json.workers, this.context, callback)
-      },
-      (callback) => {
-        processPackages(json.packages, this.context, callback)
+        ], (err) => {
+          if (err) {
+            errors.push(err)
+          }
+          callback()
+        })
       },
       (callback) => {
-        processCustomTabBar(json.tabBar, this.context, callback)
+        if (mpx.appScriptPromise) {
+          mpx.appScriptPromise.then(callback)
+        } else {
+          callback()
+        }
       },
       (callback) => {
-        processSubPackages(json.subPackages || json.subpackages, this.context, callback)
+        async.series(processSubPackagesQueue, (err) => {
+          if (err) {
+            errors.push(err)
+          }
+          // 处理完分包后重置currentPackageRoot以确保app中的资源输出到主包
+          mpx.currentPackageRoot = ''
+          callback()
+        })
       }
-    ], (err) => {
-      if (err) return callback(err)
+    ], () => {
+      if (errors.length) return callback(errors[0])
       delete json.packages
       delete json.subpackages
       delete json.subPackages
       json.pages = localPages
       for (let root in subPackagesCfg) {
-        const subPackageCfg = subPackagesCfg[root]
-        // 分包不存在 pages，输出 subPackages 字段会报错
-        if (subPackageCfg.pages.length) {
-          if (!json.subPackages) {
-            json.subPackages = []
-          }
-          json.subPackages.push(subPackageCfg)
+        if (!json.subPackages) {
+          json.subPackages = []
         }
+        json.subPackages.push(subPackagesCfg[root])
       }
       const processOutput = (output) => {
-        output = processDynamicEntry(output)
         output = processTabBar(output)
         output = processOptionMenu(output)
         output = processThemeLocation(output)
@@ -594,20 +803,16 @@ module.exports = function (content) {
       callback(null, processOutput)
     })
   } else {
-    // page.json或component.json
     const processGenerics = (generics, context, callback) => {
       if (generics) {
-        async.eachOf(generics, (generic, name, callback) => {
+        async.forEachOf(generics, (generic, name, callback) => {
           if (generic.default) {
-            processComponent(generic.default, context, { relativePath }, (err, entry) => {
-              if (err === RESOLVE_IGNORED_ERR) {
-                delete generic.default
-                return callback()
+            processComponent(generic.default, context, (componentPath) => {
+              if (useRelativePath === true) {
+                componentPath = toPosix(path.relative(path.dirname(currentPath), componentPath))
               }
-              if (err) return callback(err)
-              generic.default = entry
-              callback()
-            })
+              generic.default = componentPath
+            }, undefined, callback)
           } else {
             callback()
           }
@@ -616,6 +821,7 @@ module.exports = function (content) {
         callback()
       }
     }
+    // page.json或component.json
     async.parallel([
       (callback) => {
         processComponents(json.usingComponents, this.context, callback)
@@ -624,7 +830,7 @@ module.exports = function (content) {
         processGenerics(json.componentGenerics, this.context, callback)
       }
     ], (err) => {
-      callback(err, processDynamicEntry)
+      callback(err)
     })
   }
 }