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

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

@@ -6,7 +6,7 @@ const parseRequest = require('../utils/parse-request')
 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) {
@@ -17,7 +17,6 @@ module.exports = function (json, options, rawCallback) {
   const resolveMode = options.resolveMode
   const pagesMap = options.pagesMap
   const componentsMap = options.componentsMap
-  const pagesEntryMap = options.pagesEntryMap
   const projectRoot = options.projectRoot
   const pathHash = options.pathHash
   const localPagesMap = {}
@@ -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)
                 })
               }
             }
@@ -230,8 +229,8 @@ module.exports = function (json, options, rawCallback) {
               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) {
+                // 此处引入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!`)
@@ -244,9 +243,9 @@ module.exports = function (json, options, rawCallback) {
             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
+          // buildInfo.pagesMap = buildInfo.pagesMap || {}
+          // buildInfo.pagesMap[resourcePath] = pagesMap[resourcePath] = pageName
+          // pagesMap[resourcePath] = loaderContext.resourcePath
           localPagesMap[pageName] = {
             resource: addQuery(resource, { page: true }),
             async: tarRoot || queryObj.async,

package/lib/tenon/processScript.js

@@ -2,10 +2,10 @@ const genComponentTag = require('../utils/gen-component-tag')
 const loaderUtils = require('loader-utils')
 const addQuery = require('../utils/add-query')
 const normalize = require('../utils/normalize')
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin')
-const AddEntryDependency = require('../dependency/AddEntryDependency')
 const builtInLoaderPath = normalize.lib('built-in-loader')
 const optionProcessorPath = normalize.lib('runtime/optionProcessor')
+const createJSONHelper = require('../json-compiler/helper')
+const async = require('async')
 
 function shallowStringify (obj) {
   let arr = []
@@ -21,11 +21,6 @@ function shallowStringify (obj) {
   return `{${arr.join(',')}}`
 }
 
-let entryDeps = new Set()
-
-let callbacked = false
-let cacheCallback
-
 module.exports = function (script, options, callback) {
   const ctorType = options.ctorType
   const builtInComponentsMap = options.builtInComponentsMap
@@ -35,7 +30,6 @@ module.exports = function (script, options, callback) {
   const loaderContext = options.loaderContext
   const isProduction = options.isProduction
   const componentId = options.componentId
-  const getRequireForSrc = options.getRequireForSrc
   // const i18n = options.i18n
   const jsonConfig = options.jsonConfig
   // const tabBar = jsonConfig.tabBar
@@ -46,37 +40,52 @@ module.exports = function (script, options, callback) {
   const forceDisableBuiltInLoader = options.forceDisableBuiltInLoader
 
   // add entry
-  const checkEntryDeps = (callback) => {
-    callback = callback || cacheCallback
-    if (callback && entryDeps.size === 0) {
-      callback()
-    } else {
-      cacheCallback = callback
-    }
+  // const checkEntryDeps = (callback) => {
+  //   callback = callback || cacheCallback
+  //   if (callback && entryDeps.size === 0) {
+  //     callback()
+  //   } else {
+  //     cacheCallback = callback
+  //   }
+  // }
+
+  // const addEntryDep = (context, resource, name) => {
+  //   // 如果loader已经回调，就不再添加entry
+  //   if (callbacked) return
+  //   const dep = SingleEntryPlugin.createDependency(resource, name)
+  //   entryDeps.add(dep)
+  //   const virtualModule = new AddEntryDependency({
+  //     context: context._compiler.context,
+  //     dep,
+  //     name
+  //   })
+  //   /* eslint-disable camelcase */
+  //   context._module.__has_tenon_entry = true
+  //   context._module.addDependency(virtualModule)
+  //   entryDeps.delete(dep)
+  //   checkEntryDeps()
+  // }
+
+  const emitWarning = (msg) => {
+    loaderContext.emitWarning(
+      new Error('[tenon script processor][' + loaderContext.resource + ']: ' + msg)
+    )
   }
 
-  const addEntryDep = (context, resource, name) => {
-    // 如果loader已经回调，就不再添加entry
-    if (callbacked) return
-    const dep = SingleEntryPlugin.createDependency(resource, name)
-    entryDeps.add(dep)
-    const virtualModule = new AddEntryDependency({
-      context: context._compiler.context,
-      dep,
-      name
-    })
-    /* eslint-disable camelcase */
-    context._module.__has_tenon_entry = true
-    context._module.addDependency(virtualModule)
-    entryDeps.delete(dep)
-    checkEntryDeps()
+  const emitError = (msg) => {
+    loaderContext.emitError(
+      new Error('[tenon script processor][' + loaderContext.resource + ']: ' + msg)
+    )
   }
 
-  // const emitWarning = (msg) => {
-  //   loaderContext.emitWarning(
-  //     new Error('[script processor][' + loaderContext.resource + ']: ' + msg)
-  //   )
-  // }
+  const {
+    processPage,
+    processDynamicEntry
+  } = createJSONHelper({
+    loaderContext,
+    emitWarning,
+    emitError
+  })
 
   const stringifyRequest = r => loaderUtils.stringifyRequest(loaderContext, r)
   // let tabBarPagesMap = {}
@@ -156,26 +165,6 @@ module.exports = function (script, options, callback) {
       let firstPage = ''
       const pagesMap = {}
       const componentsMap = {}
-      Object.keys(localPagesMap).forEach((pagePath) => {
-        const pageCfg = localPagesMap[pagePath]
-        // const pageRequest = stringifyRequest(pageCfg.resource)
-        addEntryDep(loaderContext, addQuery(pageCfg.resource, { tenon: true }), pagePath)
-        // addEntrySafely(loaderContext, addQuery(pageCfg.resource, { tenon: true }), pagePath)
-        // loaderContext.resolve(loaderContext._compiler.context, addQuery(pageCfg.resource, { tenon: true }), (err, resource) => {
-        //   if(err) return callback(err)
-
-        // })
-        // if (pageCfg.async) {
-        //   pagesMap[pagePath] = `()=>import(${pageRequest}).then(res => getComponent(res, { __mpxPageRoute: ${JSON.stringify(pagePath)} }))`
-        // } else {
-        //   // 为了保持小程序中app->page->component的js执行顺序，所有的page和component都改为require引入
-        //   pagesMap[pagePath] = `getComponent(require(${pageRequest}), { __mpxPageRoute: ${JSON.stringify(pagePath)} })`
-        // }
-
-        // if (pageCfg.isFirst) {
-        //   firstPage = pagePath
-        // }
-      })
 
       Object.keys(localComponentsMap).forEach((componentName) => {
         const componentCfg = localComponentsMap[componentName]
@@ -199,7 +188,7 @@ module.exports = function (script, options, callback) {
       }
       // 为了正确获取currentSrcMode便于运行时进行转换，对于src引入的组件script采用require方式引入(由于webpack会将import的执行顺序上升至最顶)，这意味着对于src引入脚本中的named export将不会生效，不过鉴于mpx和小程序中本身也没有在组件script中声明export的用法，所以应该没有影响
       content += script.src
-        ? (getRequireForSrc('script', script) + '\n')
+        ? `require(${stringifyRequest(script.src)})\n`
         : (script.content + '\n') + '\n'
       // createApp/Page/Component执行完成后立刻获取当前的option并暂存
       content += `  const currentOption = global.currentOption\n`
@@ -246,13 +235,24 @@ module.exports = function (script, options, callback) {
       // i18n`
       //     }
       //   }
-      content += `\n  )\n`
+      content += `\n  )\n__dynamic_page_slot__\n`
       return content
     }
   })
   output += '\n'
-  checkEntryDeps(() => {
-    callbacked = true
+  // 处理pages
+  const pageSet = new Set()
+  let dynamicPageStr = ''
+  async.each(localPagesMap, (pageCfg, callback) => {
+    processPage(addQuery(pageCfg.resource, { tenon: true }), loaderContext.context, '', (err, entry, { key }) => {
+      if (err) return callback()
+      if (pageSet.has(key)) return callback()
+      pageSet.add(key)
+      dynamicPageStr += `\n"${entry}"`
+      callback()
+    })
+  }, () => {
+    output = output.replace('__dynamic_page_slot__', processDynamicEntry(dynamicPageStr) || '')
     callback(null, {
       output
     })

package/lib/url-loader.js

@@ -1,51 +1,33 @@
 const loaderUtils = require('loader-utils')
 const mime = require('mime')
+const parseRequest = require('./utils/parse-request')
 const getOptions = loaderUtils.getOptions
-const parseQuery = loaderUtils.parseQuery
 
 function isStyleRequest (request) {
-  let elements = request.replace(/^-?!+/, '').replace(/!!+/g, '!').split('!')
-  elements.pop()
-  for (let i = 0; i < elements.length; i++) {
-    let element = elements[i]
-    let queryString = '?'
-    let loaderString = element
-    let idx = element.indexOf('?')
-    if (idx >= 0) {
-      queryString = element.substr(idx)
-      loaderString = element.substr(0, idx)
-    }
-    if (/css-loader/.test(loaderString)) {
-      return true
-    }
-    if (/content-loader/.test(loaderString)) {
-      let query = parseQuery(queryString)
-      if (query.type === 'styles') {
-        return true
-      }
-    }
-  }
+  const { loaderString, queryObj } = parseRequest(request)
+  if (queryObj.type === 'styles') return true
+  if (/(css-loader|wxss\/loader)/.test(loaderString)) return true
   return false
 }
 
 module.exports = function (src) {
   let transBase64 = false
   const options = Object.assign({}, getOptions(this))
-  const filePath = this.resourcePath
-  const mimetype = options.mimetype || mime.getType(filePath)
-  const issuer = this._module.issuer
+  const { resourcePath, queryObj } = parseRequest(this.resource)
+  const mimetype = options.mimetype || mime.getType(resourcePath)
+  const moduleGraph = this._compilation.moduleGraph
+  const issuer = moduleGraph.getIssuer(this._module)
   const publicPathScope = options.publicPathScope === 'all' ? 'all' : 'styleOnly'
-  const queryOption = parseQuery(this.resourceQuery || '?')
   const limit = options.limit
-  const useLocal = !limit || src.length < limit || queryOption.useLocal
-  const isStyle = (issuer && issuer.request && isStyleRequest(issuer.request)) || queryOption.isStyle
+  const useLocal = !limit || src.length < limit || queryObj.useLocal
+  const isStyle = (issuer && issuer.request && isStyleRequest(issuer.request)) || queryObj.isStyle
 
   if (isStyle) {
     if (options.publicPath) {
       if (useLocal) {
         transBase64 = true
       }
-      if (queryOption.fallback) {
+      if (queryObj.fallback) {
         transBase64 = false
       }
     } else {

package/lib/utils/add-query.js

@@ -3,7 +3,7 @@ const stringifyQuery = require('./stringify-query')
 const type = require('./type')
 
 // 默认为非强行覆盖原query，如需强行覆盖传递force为true
-module.exports = function (request, data = {}, force, removeKeys) {
+module.exports = function addQuery (request, data = {}, force, removeKeys) {
   const { rawResourcePath: resourcePath, loaderString, queryObj: queryObjRaw } = parseRequest(request)
   const queryObj = Object.assign({}, queryObjRaw)
   if (force) {

package/lib/utils/const.js

@@ -0,0 +1,10 @@
+module.exports = {
+  MPX_PROCESSED_FLAG: 'mpx_processed',
+  MPX_DISABLE_EXTRACTOR_CACHE: 'mpx_disable_extractor_cache',
+  DEFAULT_RESULT_SOURCE: '',
+  RESOLVE_IGNORED_ERR: new Error('Resolve ignored!'),
+  JSON_JS_EXT: '.json.js',
+  MPX_ROOT_VIEW: 'mpx-root-view', // 根节点类名
+  MPX_APP_MODULE_ID: 'mpx-app-scope', // app文件moduleId
+  MPX_CURRENT_CHUNK: 'mpx_current_chunk'
+}

package/lib/utils/emit-file.js

@@ -0,0 +1,10 @@
+const { RawSource } = require('webpack').sources
+
+module.exports = (module, name, content, sourceMap, assetInfo) => {
+  if (!module.buildInfo.assets) {
+    module.buildInfo.assets = Object.create(null)
+    module.buildInfo.assetsInfo = new Map()
+  }
+  module.buildInfo.assets[name] = new RawSource(content)
+  module.buildInfo.assetsInfo.set(name, assetInfo)
+}