@mpxjs/webpack-plugin 2.10.16-beta.9 → 2.10.16-xp.1

package/lib/config.js

@@ -553,66 +553,6 @@ module.exports = {
       show: 'dd:show'
     }
   },
-  ks: {
-    typeExtMap: {
-      json: '.json',
-      script: '.js',
-      template: '.ksml',
-      styles: '.css'
-    },
-    tabBar: {
-      itemKey: 'list',
-      iconKey: 'iconPath',
-      activeIconKey: 'selectedIconPath'
-    },
-    event: {
-      parseEvent (attr) {
-        const match = /^(bind|catch|capture-bind|capture-catch):?(.*?)(?:\.(.*))?$/.exec(attr)
-        if (match) {
-          return {
-            prefix: match[1],
-            eventName: match[2],
-            modifier: match[3]
-          }
-        }
-      },
-      getEvent (eventName, prefix = 'bind') {
-         if (eventName.includes('-')) {
-          return `${prefix}:${eventName}`
-        } else {
-          return prefix + eventName
-        }
-      },
-      defaultModelProp: 'value',
-      defaultModelEvent: 'input',
-      defaultModelValuePath: 'value'
-    },
-    wxs: {
-      tag: 'ks',
-      module: 'module',
-      src: 'src',
-      ext: '.ks',
-      templatePrefix: 'module.exports = \n'
-    },
-    directive: {
-      if: 'ks:if',
-      elseif: 'ks:elif',
-      else: 'ks:else',
-      for: 'ks:for',
-      forIndex: 'ks:for-index',
-      forItem: 'ks:for-item',
-      key: 'ks:key',
-      dynamicClass: 'ks:class',
-      dynamicStyle: 'ks:style',
-      ref: 'ks:ref',
-      show: 'ks:show',
-      model: 'ks:model',
-      modelProp: 'ks:model-prop',
-      modelEvent: 'ks:model-event',
-      modelValuePath: 'ks:model-value-path',
-      modelFilter: 'ks:model-filter'
-    }
-  },
   ios: reactConfig,
   android: reactConfig,
   harmony: reactConfig

package/lib/dependencies/AppEntryDependency.js

@@ -21,8 +21,8 @@ class AppEntryDependency extends NullDependency {
     if (mpx.appInfo.name) {
       const issuer = moduleGraph.getIssuer(module)
       const err = new Error(issuer
-        ? `[Mpx json error]:Mpx单次构建中只能存在一个App，当前组件/页面[${module.resource}]通过[${issuer.resource}]非法引入，引用的资源将被忽略，请确保组件/页面资源通过usingComponents/pages配置引入！`
-        : `[Mpx json error]:Mpx单次构建中只能存在一个App，请检查当前entry中的资源[${module.resource}]是否为组件/页面，通过添加?component/page查询字符串显式声明该资源是组件/页面！`)
+        ? `[json compiler]:Mpx单次构建中只能存在一个App，当前组件/页面[${module.resource}]通过[${issuer.resource}]非法引入，引用的资源将被忽略，请确保组件/页面资源通过usingComponents/pages配置引入！`
+        : `[json compiler]:Mpx单次构建中只能存在一个App，请检查当前entry中的资源[${module.resource}]是否为组件/页面，通过添加?component/page查询字符串显式声明该资源是组件/页面！`)
       return callback(err)
     }
 

package/lib/dependencies/ResolveDependency.js

@@ -36,7 +36,7 @@ class ResolveDependency extends NullDependency {
     const resolveResult = pagesMap[resourcePath] || currentComponentsMap[resourcePath] || mainComponentsMap[resourcePath] || currentStaticResourcesMap[resourcePath] || mainStaticResourcesMap[resourcePath] || ''
     if (!resolveResult) {
       if (!partialCompileRules || matchCondition(resourcePath, partialCompileRules)) {
-        compilation.errors.push(new Error(`[Mpx json error]:Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
+        compilation.errors.push(new Error(`Path ${resource} is not a page/component/static resource, which is resolved from ${issuerResource}!`))
       }
     }
     return resolveResult

package/lib/file-loader.js

@@ -8,9 +8,7 @@ module.exports = function loader (content, prevOptions) {
   const options = prevOptions || loaderUtils.getOptions(this) || {}
   const context = options.context || this.rootContext
   const mpx = this.getMpx()
-
-  const { mode } = mpx
-  const isRN = ['ios', 'android', 'harmony'].includes(mode)
+  const isRN = ['ios', 'android', 'harmony'].includes(mpx.mode)
 
   let url = loaderUtils.interpolateName(this, options.name, {
     context,
@@ -19,7 +17,6 @@ module.exports = function loader (content, prevOptions) {
   })
 
   let outputPath = url
-  const { resourcePath, queryObj } = parseRequest(this.resource)
 
   if (options.publicPath) {
     if (options.outputPathCDN) {
@@ -30,19 +27,13 @@ module.exports = function loader (content, prevOptions) {
       }
     }
   } else {
+    const { resourcePath, queryObj } = parseRequest(this.resource)
     const packageRoot = queryObj.packageRoot || ''
     url = outputPath = toPosix(path.join(packageRoot, outputPath))
     this._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'staticResource', outputPath, packageRoot))
   }
 
-  let publicPath
-
-  // 快手小程序 tabbar icon 资源路径不能以 / 开头
-  if (queryObj.from === 'tabbar' && mode === 'ks') {
-    publicPath = JSON.stringify(url)
-  } else {
-    publicPath = `__webpack_public_path__ + ${JSON.stringify(url)}`
-  }
+  let publicPath = `__webpack_public_path__ + ${JSON.stringify(url)}`
 
   if (isRN) {
     publicPath = `__mpx_require_external__(${JSON.stringify(url)})`
@@ -56,7 +47,6 @@ module.exports = function loader (content, prevOptions) {
         ? options.publicPath
         : `${options.publicPath}/`}${url}`
     }
-
     publicPath = JSON.stringify(publicPath)
   }
 

package/lib/helpers.js

@@ -69,8 +69,6 @@ module.exports = function createHelpers (loaderContext) {
         if (part.useJSONJS) options.useJSONJS = true
       // eslint-disable-next-line no-fallthrough
       case 'styles':
-        options.lang = part.lang
-      // eslint-disable-next-line no-fallthrough
       case 'template':
         options.extract = true
     }

package/lib/index.js

@@ -36,7 +36,6 @@ const FixDescriptionInfoPlugin = require('./resolver/FixDescriptionInfoPlugin')
 const AppEntryDependency = require('./dependencies/AppEntryDependency')
 const RecordPageConfigMapDependency = require('./dependencies/RecordPageConfigsMapDependency')
 const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
-const RecordModuleIdMapDependency = require('./dependencies/RecordModuleIdMapDependency')
 const RecordGlobalComponentsDependency = require('./dependencies/RecordGlobalComponentsDependency')
 const RecordIndependentDependency = require('./dependencies/RecordIndependentDependency')
 const DynamicEntryDependency = require('./dependencies/DynamicEntryDependency')
@@ -674,9 +673,6 @@ class MpxWebpackPlugin {
       compilation.dependencyFactories.set(RecordResourceMapDependency, new NullFactory())
       compilation.dependencyTemplates.set(RecordResourceMapDependency, new RecordResourceMapDependency.Template())
 
-      compilation.dependencyFactories.set(RecordModuleIdMapDependency, new NullFactory())
-      compilation.dependencyTemplates.set(RecordModuleIdMapDependency, new RecordModuleIdMapDependency.Template())
-
       compilation.dependencyFactories.set(RecordGlobalComponentsDependency, new NullFactory())
       compilation.dependencyTemplates.set(RecordGlobalComponentsDependency, new RecordGlobalComponentsDependency.Template())
 
@@ -725,8 +721,6 @@ class MpxWebpackPlugin {
           componentsMap: {
             main: {}
           },
-          // 资源与moduleId关系记录
-          resourceModuleIdMap: {},
           // 静态资源(图片，字体，独立样式)等，依照所属包进行记录
           staticResourcesMap: {
             main: {}
@@ -1690,12 +1684,11 @@ class MpxWebpackPlugin {
 
         if (this.options.generateBuildMap) {
           const pagesMap = compilation.__mpx__.pagesMap
-          const resourceModuleIdMap = compilation.__mpx__.resourceModuleIdMap
           const componentsPackageMap = compilation.__mpx__.componentsMap
           const componentsMap = Object.keys(componentsPackageMap).map(item => componentsPackageMap[item]).reduce((pre, cur) => {
             return { ...pre, ...cur }
           }, {})
-          const outputMap = JSON.stringify({ outputPathMap: { ...pagesMap, ...componentsMap }, moduleIdMap: resourceModuleIdMap })
+          const outputMap = JSON.stringify({ ...pagesMap, ...componentsMap })
           const filename = this.options.generateBuildMap.filename || 'outputMap.json'
           compilation.assets[filename] = new RawSource(outputMap)
         }
@@ -1907,41 +1900,24 @@ try {
       normalModuleFactory.hooks.afterResolve.tap('MpxWebpackPlugin', ({ createData }) => {
         const { queryObj } = parseRequest(createData.request)
         const loaders = createData.loaders
-
-        // 样式 loader 类型检测和条件编译 loader 插入的工具函数
-        const STYLE_LOADER_TYPES = ['stylus-loader', 'sass-loader', 'less-loader', 'css-loader', wxssLoaderPath]
-        const injectStyleStripLoader = (loaders) => {
-          // 检查是否已经存在 stripLoader
-          const hasStripLoader = loaders.some(loader => {
-            const loaderPath = toPosix(loader.loader)
-            return loaderPath.includes('style-compiler/strip-conditional-loader')
-          })
-          if (hasStripLoader) {
-            return
-          }
-          const loaderTypes = new Map(STYLE_LOADER_TYPES.map(type => [`node_modules/${type}`, -1]))
-          loaders.forEach((loader, index) => {
-            const currentLoader = toPosix(loader.loader)
-            for (const [key] of loaderTypes) {
-              if (currentLoader.includes(key)) {
-                loaderTypes.set(key, index)
-                break
-              }
-            }
-          })
-          const targetIndex = STYLE_LOADER_TYPES
-            .map(type => loaderTypes.get(`node_modules/${type}`))
-            .find(index => index !== -1)
-
-          if (targetIndex !== undefined) {
-            loaders.splice(targetIndex + 1, 0, { loader: styleStripConditionalPath })
-          }
-        }
         if (queryObj.mpx && queryObj.mpx !== MPX_PROCESSED_FLAG) {
           const type = queryObj.type
           const extract = queryObj.extract
+
           if (type === 'styles') {
-            injectStyleStripLoader(loaders)
+            let insertBeforeIndex = -1
+            // 单次遍历收集所有索引
+            loaders.forEach((loader, index) => {
+              const currentLoader = toPosix(loader.loader)
+              if (currentLoader.includes('node_modules/stylus-loader') || currentLoader.includes('node_modules/sass-loader') || currentLoader.includes('node_modules/less-loader')) {
+                insertBeforeIndex = index
+              }
+            })
+
+            if (insertBeforeIndex !== -1) {
+              loaders.splice(insertBeforeIndex, 0, { loader: styleStripConditionalPath })
+            }
+            loaders.push({ loader: styleStripConditionalPath })
           }
 
           switch (type) {
@@ -1995,7 +1971,6 @@ try {
         }
         // mpxStyleOptions 为 mpx style 文件的标识，避免 Vue 文件插入 styleCompiler 后导致 vue scoped 样式隔离失效
         if (isWeb(mpx.mode) && queryObj.mpxStyleOptions) {
-          injectStyleStripLoader(loaders)
           const firstLoader = loaders[0] ? toPosix(loaders[0].loader) : ''
           const isPitcherRequest = firstLoader.includes('node_modules/vue-loader/lib/loaders/pitcher')
           let cssLoaderIndex = -1

package/lib/json-compiler/helper.js

@@ -8,10 +8,8 @@ const loaderUtils = require('loader-utils')
 const resolve = require('../utils/resolve')
 const { matchCondition } = require('../utils/match-condition')
 const { isWeb, isReact } = require('../utils/env')
-const getBuildInTagComponent = require('../utils/get-build-tag-component')
-const { capitalToHyphen } = require('../utils/string')
 
-module.exports = function createJSONHelper ({ loaderContext, emitWarning, customGetDynamicEntry, emitError }) {
+module.exports = function createJSONHelper ({ loaderContext, emitWarning, customGetDynamicEntry }) {
   const mpx = loaderContext.getMpx()
   const resolveMode = mpx.resolveMode
   const externals = mpx.externals
@@ -160,7 +158,7 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
       const { resourcePath } = parseRequest(resource)
       const relative = path.relative(context, resourcePath)
       if (/^\./.test(relative)) {
-        return callback(new Error(`[Mpx json error]:The js export path ${resourcePath} must be in the context ${context}!`))
+        return callback(new Error(`The js export path ${resourcePath} must be in the context ${context}!`))
       }
       const outputPath = /^(.*?)(\.[^.]*)?$/.exec(relative)[1]
       const entry = getDynamicEntry(resource, 'export', outputPath, tarRoot, publicPath + tarRoot)
@@ -168,79 +166,11 @@ module.exports = function createJSONHelper ({ loaderContext, emitWarning, custom
     })
   }
 
-  const fillInComponentPlaceholder = ({ jsonObj, name: componentName, placeholder, placeholderEntry, resolveResourcePathMap }, callback) => {
-    let placeholderComponentName = placeholder.name
-    const componentPlaceholder = jsonObj.componentPlaceholder || {}
-    if (componentPlaceholder[componentName]) {
-      callback()
-      return
-    }
-    jsonObj.componentPlaceholder = componentPlaceholder
-    if (placeholderEntry) {
-      if (resolveResourcePathMap.has(placeholderComponentName) && resolveResourcePathMap.get(placeholderComponentName) !== placeholder.resourcePath) {
-        // 如果存在placeholder与已有usingComponents冲突, 重新生成一个组件名，在当前组件后增加一个数字
-        let i = 1
-        let newPlaceholder = placeholderComponentName + i
-        while (jsonObj.usingComponents[newPlaceholder]) {
-          newPlaceholder = placeholderComponentName + ++i
-        }
-        placeholderComponentName = newPlaceholder
-      }
-      jsonObj.usingComponents[placeholderComponentName] = placeholderEntry
-      resolveResourcePathMap.set(placeholderComponentName, placeholder.resourcePath)
-    }
-    componentPlaceholder[componentName] = placeholderComponentName
-    callback(null, {
-      name: placeholderComponentName,
-      entry: placeholderEntry
-    })
-  }
-
-  const getNormalizePlaceholder = (placeholder) => {
-    if (typeof placeholder === 'string') {
-      placeholder = getBuildInTagComponent(mode, placeholder) || { name: placeholder }
-    }
-    if (!placeholder.name) {
-      emitError('The asyncSubpackageRules configuration format of @mpxjs/webpack-plugin a is incorrect')
-    }
-    // ali 下与 rulesRunner 规则一致，组件名驼峰转连字符
-    if (mode === 'ali') {
-      placeholder.name = capitalToHyphen(placeholder.name)
-    }
-    return placeholder
-  }
-
-  const processPlaceholder = ({ jsonObj, context, name, tarRoot, placeholder, relativePath, resolveResourcePathMap }, callback) => {
-    if (tarRoot) {
-      if (placeholder) {
-        placeholder = getNormalizePlaceholder(placeholder)
-        if (placeholder.resource) {
-          processComponent(placeholder.resource, context, { relativePath }, (err, entry, { resourcePath }) => {
-            if (err) return callback(err)
-            placeholder.resourcePath = resourcePath
-            fillInComponentPlaceholder({ jsonObj, name, placeholder, placeholderEntry: entry, resolveResourcePathMap }, callback)
-          })
-        } else {
-          fillInComponentPlaceholder({ jsonObj, name, placeholder }, callback)
-        }
-      } else {
-        if (!jsonObj.componentPlaceholder || !jsonObj.componentPlaceholder[name]) {
-          const errMsg = `componentPlaceholder of "${name}" doesn't exist! \n\r`
-          emitError(errMsg)
-        }
-        callback()
-      }
-    } else {
-      callback()
-    }
-  }
-
   return {
     processComponent,
     processDynamicEntry,
     processPage,
     processJsExport,
-    processPlaceholder,
     isUrlRequest,
     urlToRequest
   }

package/lib/json-compiler/index.js

@@ -15,6 +15,9 @@ const RecordRuntimeInfoDependency = require('../dependencies/RecordRuntimeInfoDe
 const { MPX_DISABLE_EXTRACTOR_CACHE, RESOLVE_IGNORED_ERR, JSON_JS_EXT } = require('../utils/const')
 const resolve = require('../utils/resolve')
 const resolveTabBarPath = require('../utils/resolve-tab-bar-path')
+const normalize = require('../utils/normalize')
+const mpxViewPath = normalize.lib('runtime/components/ali/mpx-view.mpx')
+const mpxTextPath = normalize.lib('runtime/components/ali/mpx-text.mpx')
 const resolveMpxCustomElementPath = require('../utils/resolve-mpx-custom-element-path')
 
 module.exports = function (content) {
@@ -40,6 +43,7 @@ module.exports = function (content) {
   const globalSrcMode = mpx.srcMode
   const localSrcMode = queryObj.mode
   const srcMode = localSrcMode || globalSrcMode
+  const projectRoot = mpx.projectRoot
 
   const isApp = !(pagesMap[resourcePath] || componentsMap[resourcePath])
   const publicPath = this._compilation.outputOptions.publicPath || ''
@@ -48,24 +52,46 @@ module.exports = function (content) {
 
   const emitWarning = (msg) => {
     this.emitWarning(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[json compiler][' + this.resource + ']: ' + msg)
     )
   }
 
   const emitError = (msg) => {
     this.emitError(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[json compiler][' + this.resource + ']: ' + msg)
     )
   }
 
+  const fillInComponentPlaceholder = (name, placeholder, placeholderEntry) => {
+    const componentPlaceholder = json.componentPlaceholder || {}
+    if (componentPlaceholder[name]) return
+    componentPlaceholder[name] = placeholder
+    json.componentPlaceholder = componentPlaceholder
+    if (placeholderEntry && !json.usingComponents[placeholder]) json.usingComponents[placeholder] = placeholderEntry
+  }
+  const normalizePlaceholder = (placeholder) => {
+    if (typeof placeholder === 'string') {
+      const placeholderMap = mode === 'ali'
+        ? {
+          view: { name: 'mpx-view', resource: mpxViewPath },
+          text: { name: 'mpx-text', resource: mpxTextPath }
+        }
+        : {}
+      placeholder = placeholderMap[placeholder] || { name: placeholder }
+    }
+    if (!placeholder.name) {
+      emitError('The asyncSubpackageRules configuration format of @mpxjs/webpack-plugin a is incorrect')
+    }
+    return placeholder
+  }
+
   const {
     isUrlRequest,
     urlToRequest,
     processPage,
     processDynamicEntry,
     processComponent,
-    processJsExport,
-    processPlaceholder
+    processJsExport
   } = createJSONHelper({
     loaderContext: this,
     emitWarning,
@@ -197,9 +223,6 @@ module.exports = function (content) {
 
   const processComponents = (components, context, callback) => {
     if (components) {
-      // 存在所有命中asyncSubpackageRules的组件
-      const asyncComponents = []
-      const resolveResourcePathMap = new Map()
       async.eachOf(components, (component, name, callback) => {
         processComponent(component, context, { relativePath }, (err, entry, { tarRoot, placeholder, resourcePath, queryObj = {} } = {}) => {
           if (err === RESOLVE_IGNORED_ERR) {
@@ -219,9 +242,29 @@ module.exports = function (content) {
               isDynamic: queryObj.isDynamic
             }
           }
-          resolveResourcePathMap.set(name, resourcePath)
-          if (tarRoot) asyncComponents.push({ name, tarRoot, placeholder, relativePath })
-          callback()
+          if (tarRoot) {
+            if (placeholder) {
+              placeholder = normalizePlaceholder(placeholder)
+              if (placeholder.resource) {
+                processComponent(placeholder.resource, projectRoot, { relativePath }, (err, entry) => {
+                  if (err) return callback(err)
+                  fillInComponentPlaceholder(name, placeholder.name, entry)
+                  callback()
+                })
+              } else {
+                fillInComponentPlaceholder(name, placeholder.name)
+                callback()
+              }
+            } else {
+              if (!json.componentPlaceholder || !json.componentPlaceholder[name]) {
+                const errMsg = `componentPlaceholder of "${name}" doesn't exist! \n\r`
+                emitError(errMsg)
+              }
+              callback()
+            }
+          } else {
+            callback()
+          }
         })
       }, (err) => {
         if (err) return callback(err)
@@ -236,10 +279,7 @@ module.exports = function (content) {
           components.element = mpxCustomElementPath
           Object.assign(components, mpx.getPackageInjectedComponentsMap(packageName))
         }
-        // 使用async处理所有asyncComponents完成后调用callback
-        async.each(asyncComponents, ({ name, tarRoot, placeholder, relativePath }, callback) => {
-          processPlaceholder({ jsonObj: json, context, name, tarRoot, placeholder, relativePath, resolveResourcePathMap }, callback)
-        }, callback)
+        callback()
       })
     } else {
       callback()
@@ -481,10 +521,10 @@ module.exports = function (content) {
       if (json.tabBar && json.tabBar[itemKey]) {
         json.tabBar[itemKey].forEach((item, index) => {
           if (item[iconKey] && isUrlRequest(item[iconKey])) {
-            output += `json.tabBar.${itemKey}[${index}].${iconKey} = require("${addQuery(urlToRequest(item[iconKey]), { useLocal: true, from: 'tabbar' })}");\n`
+            output += `json.tabBar.${itemKey}[${index}].${iconKey} = require("${addQuery(urlToRequest(item[iconKey]), { useLocal: true })}");\n`
           }
           if (item[activeIconKey] && isUrlRequest(item[activeIconKey])) {
-            output += `json.tabBar.${itemKey}[${index}].${activeIconKey} = require("${addQuery(urlToRequest(item[activeIconKey]), { useLocal: true, from: 'tabbar' })}");\n`
+            output += `json.tabBar.${itemKey}[${index}].${activeIconKey} = require("${addQuery(urlToRequest(item[activeIconKey]), { useLocal: true })}");\n`
           }
         })
       }

package/lib/json-compiler/plugin.js

@@ -23,13 +23,13 @@ module.exports = function (source) {
 
   const emitWarning = (msg) => {
     this.emitWarning(
-      new Error('[Mpx json warning][' + this.resource + ']: ' + msg)
+      new Error('[plugin loader][' + this.resource + ']: ' + msg)
     )
   }
 
   const emitError = (msg) => {
     this.emitError(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[plugin loader][' + this.resource + ']: ' + msg)
     )
   }
 

package/lib/loader.js

@@ -10,7 +10,6 @@ const AppEntryDependency = require('./dependencies/AppEntryDependency')
 const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
 const CommonJsVariableDependency = require('./dependencies/CommonJsVariableDependency')
 const DynamicEntryDependency = require('./dependencies/DynamicEntryDependency')
-const RecordModuleIdMapDependency = require('./dependencies/RecordModuleIdMapDependency')
 const tsWatchRunLoaderFilter = require('./utils/ts-loader-watch-run-loader-filter')
 const { isReact } = require('./utils/env')
 const preProcessJson = require('./utils/pre-process-json')
@@ -51,13 +50,13 @@ module.exports = function (content) {
 
   const emitWarning = (msg) => {
     this.emitWarning(
-      new Error('[Mpx json warning][' + this.resource + ']: ' + msg)
+      new Error('[mpx-loader][' + this.resource + ']: ' + msg)
     )
   }
 
   const emitError = (msg) => {
     this.emitError(
-      new Error('[Mpx json error][' + this.resource + ']: ' + msg)
+      new Error('[mpx-loader][' + this.resource + ']: ' + msg)
     )
   }
 
@@ -88,7 +87,6 @@ module.exports = function (content) {
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
   const filePath = this.resourcePath
   const moduleId = mpx.getModuleId(resourcePath, ctorType === 'app')
-  this._module.addPresentationalDependency(new RecordModuleIdMapDependency(moduleId, resourcePath))
 
   const parts = parseComponent(content, {
     filePath,
@@ -123,7 +121,6 @@ module.exports = function (content) {
         componentPlaceholder,
         componentGenerics,
         usingComponentsInfo,
-        originalUsingComponents,
         jsonContent
       } = jsonInfo
       const hasScoped = parts.styles.some(({ scoped }) => scoped) || autoScope
@@ -147,8 +144,7 @@ module.exports = function (content) {
           hasScoped,
           hasComment,
           isNative,
-          usingComponentsInfo,
-          originalUsingComponents,
+          usingComponentsInfo: JSON.stringify(usingComponentsInfo),
           componentGenerics,
           autoScope,
           callback
@@ -170,8 +166,7 @@ module.exports = function (content) {
           hasScoped,
           hasComment,
           isNative,
-          usingComponentsInfo,
-          originalUsingComponents,
+          usingComponentsInfo: JSON.stringify(usingComponentsInfo),
           componentGenerics,
           autoScope,
           callback
@@ -240,7 +235,6 @@ module.exports = function (content) {
           ctorType,
           moduleId,
           usingComponentsInfo: JSON.stringify(usingComponentsInfo),
-          originalUsingComponents: JSON.stringify(originalUsingComponents),
           componentPlaceholder
           // 添加babel处理渲染函数中可能包含的...展开运算符
           // 由于...运算符应用范围极小以及babel成本极高，先关闭此特性后续看情况打开

package/lib/native-loader.js

@@ -8,7 +8,6 @@ const { JSON_JS_EXT } = require('./utils/const')
 const getEntryName = require('./utils/get-entry-name')
 const AppEntryDependency = require('./dependencies/AppEntryDependency')
 const RecordResourceMapDependency = require('./dependencies/RecordResourceMapDependency')
-const RecordModuleIdMapDependency = require('./dependencies/RecordModuleIdMapDependency')
 const preProcessJson = require('./utils/pre-process-json')
 
 // todo native-loader考虑与mpx-loader或加强复用，原生组件约等于4个区块都为src的.mpx文件
@@ -24,9 +23,7 @@ module.exports = function (content) {
   const loaderContext = this
   const isProduction = this.minimize || process.env.NODE_ENV === 'production'
   const filePath = this.resourcePath
-  const moduleId = mpx.getModuleId(filePath, false, this)
-  this._module.addPresentationalDependency(new RecordModuleIdMapDependency(moduleId, filePath))
-
+  const moduleId = mpx.getModuleId(filePath)
   const { resourcePath, queryObj } = parseRequest(this.resource)
   const packageRoot = queryObj.packageRoot || mpx.currentPackageRoot
   const mode = mpx.mode
@@ -107,13 +104,13 @@ module.exports = function (content) {
 
   const emitWarning = (msg) => {
     this.emitWarning(
-      new Error('[Mpx json warning][native-loader][' + this.resource + ']: ' + msg)
+      new Error('[native-loader][' + this.resource + ']: ' + msg)
     )
   }
 
   const emitError = (msg) => {
     this.emitError(
-      new Error('[Mpx json error][native-loader][' + this.resource + ']: ' + msg)
+      new Error('[native-loader][' + this.resource + ']: ' + msg)
     )
   }
   let ctorType = pagesMap[resourcePath]