@mpxjs/webpack-plugin 2.10.7-beta.4 → 2.10.7-beta.5

package/lib/file-loader.js

@@ -36,7 +36,7 @@ module.exports = function loader (content, prevOptions) {
   let publicPath = `__webpack_public_path__ + ${JSON.stringify(url)}`
 
   // todo 未来添加分包处理后相对地址不一定是./开头的，需要考虑通过dependency的方式在sourceModule时通过最终的chunkName得到准确的相对路径
-  if (isRN) publicPath = `__non_webpack_require__(${JSON.stringify(`_mpx_rn_img_relative_path_/${url}`)})`
+  if (isRN) publicPath = `__non_webpack_require__(${JSON.stringify(`./${url}`)})`
 
   if (options.publicPath) {
     if (typeof options.publicPath === 'function') {

package/lib/index.js

@@ -72,8 +72,6 @@ const isEmptyObject = require('./utils/is-empty-object')
 const DynamicPlugin = require('./resolver/DynamicPlugin')
 const { isReact, isWeb } = require('./utils/env')
 const VirtualModulesPlugin = require('webpack-virtual-modules')
-const RuntimeGlobals = require('webpack/lib/RuntimeGlobals')
-const LoadAsyncChunkModule = require('./react/LoadAsyncChunkModule')
 require('./utils/check-core-version-match')
 
 const isProductionLikeMode = options => {
@@ -410,7 +408,7 @@ class MpxWebpackPlugin {
     let splitChunksOptions = null
     let splitChunksPlugin = null
     // 输出web ssr需要将optimization.splitChunks设置为false以关闭splitChunks
-    if (optimization.splitChunks !== false) {
+    if (optimization.splitChunks !== false && !isReact(this.options.mode)) {
       splitChunksOptions = Object.assign({
         chunks: 'all',
         usedExports: optimization.usedExports === true,
@@ -608,22 +606,6 @@ class MpxWebpackPlugin {
           return mpx
         }
       })
-
-      if (isReact(this.options.mode)) {
-        compilation.hooks.runtimeRequirementInTree
-          .for(RuntimeGlobals.loadScript)
-          .tap({
-            stage: -1000,
-            name: 'LoadAsyncChunk'
-          }, (chunk, set) => {
-            compilation.addRuntimeModule(
-              chunk,
-              new LoadAsyncChunkModule(this.options.rnConfig && this.options.rnConfig.asyncChunk && this.options.rnConfig.asyncChunk.timeout)
-            )
-            return true
-          })
-      }
-
       compilation.dependencyFactories.set(ResolveDependency, new NullFactory())
       compilation.dependencyTemplates.set(ResolveDependency, new ResolveDependency.Template())
 
@@ -758,7 +740,7 @@ class MpxWebpackPlugin {
           removedChunks: [],
           forceProxyEventRules: this.options.forceProxyEventRules,
           // 若配置disableRequireAsync=true, 则全平台构建不支持异步分包
-          supportRequireAsync: !this.options.disableRequireAsync && (this.options.mode === 'wx' || this.options.mode === 'ali' || this.options.mode === 'tt' || isWeb(this.options.mode) || isReact(this.options.mode)),
+          supportRequireAsync: !this.options.disableRequireAsync && (this.options.mode === 'wx' || this.options.mode === 'ali' || this.options.mode === 'tt' || isWeb(this.options.mode)),
           partialCompileRules: this.options.partialCompileRules,
           collectDynamicEntryInfo: ({ resource, packageName, filename, entryType, hasAsync }) => {
             const curInfo = mpx.dynamicEntryInfo[packageName] = mpx.dynamicEntryInfo[packageName] || {
@@ -1217,12 +1199,12 @@ class MpxWebpackPlugin {
         // 自动使用分包配置修改splitChunksPlugin配置
         if (splitChunksPlugin) {
           let needInit = false
-          if (isWeb(mpx.mode) || isReact(mpx.mode)) {
+          if (isWeb(mpx.mode)) {
             // web独立处理splitChunk
-            if (isWeb(mpx.mode) && !hasOwn(splitChunksOptions.cacheGroups, 'main')) {
+            if (!hasOwn(splitChunksOptions.cacheGroups, 'main')) {
               splitChunksOptions.cacheGroups.main = {
                 chunks: 'initial',
-                name: 'bundle/index', // web 输出 chunk 路径和 rn 输出分包格式拉齐
+                name: 'bundle',
                 test: /[\\/]node_modules[\\/]/
               }
               needInit = true
@@ -1230,7 +1212,7 @@ class MpxWebpackPlugin {
             if (!hasOwn(splitChunksOptions.cacheGroups, 'async')) {
               splitChunksOptions.cacheGroups.async = {
                 chunks: 'async',
-                name: 'async/index',
+                name: 'async',
                 minChunks: 2
               }
               needInit = true
@@ -1333,15 +1315,6 @@ class MpxWebpackPlugin {
       compilation.hooks.processAssets.tap({
         name: 'MpxWebpackPlugin'
       }, (assets) => {
-        if (isReact(mpx.mode)) {
-          Object.keys(assets).forEach((chunkName) => {
-            if (/\.js$/.test(chunkName)) {
-              let val = assets[chunkName].source()
-              val = val.replace(/_mpx_rn_img_relative_path_/g, chunkName === 'app.js' ? '.' : '..')
-              compilation.assets[chunkName] = new RawSource(val)
-            }
-          })
-        }
         try {
           const dynamicAssets = {}
           for (const packageName in mpx.runtimeInfo) {
@@ -1416,10 +1389,10 @@ class MpxWebpackPlugin {
               if (queryObj.root) request = addQuery(request, {}, false, ['root'])
               // wx、ali和web平台支持require.async，其余平台使用CommonJsAsyncDependency进行模拟抹平
               if (mpx.supportRequireAsync) {
-                if (isWeb(mpx.mode) || isReact(mpx.mode)) {
+                if (isWeb(mpx.mode)) {
                   const depBlock = new AsyncDependenciesBlock(
                     {
-                      name: tarRoot + '/index'
+                      name: tarRoot
                     },
                     expr.loc,
                     request

package/lib/platform/json/wx/index.js

@@ -3,7 +3,7 @@ const normalizeTest = require('../normalize-test')
 const changeKey = require('../change-key')
 const normalize = require('../../../utils/normalize')
 const { capitalToHyphen } = require('../../../utils/string')
-const { isOriginTag, isBuildInWebTag, isBuildInReactTag } = require('../../../utils/dom-tag-config')
+const { isOriginTag, isBuildInTag } = require('../../../utils/dom-tag-config')
 
 const mpxViewPath = normalize.lib('runtime/components/ali/mpx-view.mpx')
 const mpxTextPath = normalize.lib('runtime/components/ali/mpx-text.mpx')
@@ -128,41 +128,19 @@ module.exports = function getSpec ({ warn, error }) {
   /**
    * 将小程序代码中使用的与原生 HTML tag 或 内建组件 同名的组件进行转化，以解决与原生tag命名冲突问题。
    */
-  function fixComponentName (input, { mode }) {
-    const isNeedFixTag = (tag) => {
-      switch (mode) {
-        case 'web': return isOriginTag(tag) || isBuildInWebTag(tag)
-        case 'ios':
-        case 'android':
-        case 'harmony': return isOriginTag(tag) || isBuildInReactTag(tag)
-      }
-    }
-
-    const usingComponents = input.usingComponents
-    const componentPlaceholder = input.componentPlaceholder
-    if (usingComponents) {
-      const transfromKeys = []
-      Object.keys(usingComponents).forEach(tag => {
-        if (isNeedFixTag(tag)) {
-          usingComponents[`mpx-com-${tag}`] = usingComponents[tag]
-          delete usingComponents[tag]
-          transfromKeys.push(tag)
-        }
-      })
-
-      if (transfromKeys.length && componentPlaceholder) {
-        Object.keys(componentPlaceholder).forEach(key => {
-          if (transfromKeys.includes(componentPlaceholder[key])) {
-            componentPlaceholder[key] = `mpx-com-${componentPlaceholder[key]}`
-          }
-          if (transfromKeys.includes(key)) {
-            componentPlaceholder[`mpx-com-${key}`] = componentPlaceholder[key]
-            delete componentPlaceholder[key]
+  function fixComponentName (type) {
+    return function (input) {
+      const usingComponents = input[type]
+      if (usingComponents) {
+        Object.keys(usingComponents).forEach(tag => {
+          if (isOriginTag(tag) || isBuildInTag(tag)) {
+            usingComponents[`mpx-com-${tag}`] = usingComponents[tag]
+            delete usingComponents[tag]
           }
         })
       }
+      return input
     }
-    return input
   }
 
   const componentRules = [
@@ -176,6 +154,13 @@ module.exports = function getSpec ({ warn, error }) {
       swan: deletePath(),
       jd: deletePath()
     },
+    {
+      test: 'usingComponents',
+      web: fixComponentName('usingComponents'),
+      ios: fixComponentName('usingComponents'),
+      android: fixComponentName('usingComponents'),
+      harmony: fixComponentName('usingComponents')
+    },
     {
       test: 'usingComponents',
       ali: componentNameCapitalToHyphen('usingComponents'),
@@ -185,11 +170,7 @@ module.exports = function getSpec ({ warn, error }) {
       swan: addGlobalComponents,
       qq: addGlobalComponents,
       tt: addGlobalComponents,
-      jd: addGlobalComponents,
-      web: fixComponentName,
-      ios: fixComponentName,
-      android: fixComponentName,
-      harmony: fixComponentName
+      jd: addGlobalComponents
     }
   ]
 
@@ -390,6 +371,13 @@ module.exports = function getSpec ({ warn, error }) {
         tt: deletePath(),
         jd: deletePath(true)
       },
+      {
+        test: 'usingComponents',
+        web: fixComponentName('usingComponents'),
+        ios: fixComponentName('usingComponents'),
+        android: fixComponentName('usingComponents'),
+        harmony: fixComponentName('usingComponents')
+      },
       {
         test: 'usingComponents',
         ali: componentNameCapitalToHyphen('usingComponents'),
@@ -454,12 +442,6 @@ module.exports = function getSpec ({ warn, error }) {
         swan: getWindowRule(),
         tt: getWindowRule(),
         jd: getWindowRule()
-      },
-      {
-        web: fixComponentName,
-        ios: fixComponentName,
-        android: fixComponentName,
-        harmony: fixComponentName
       }
     ]
   }

package/lib/platform/template/wx/component-config/fix-component-name.js

@@ -1,4 +1,4 @@
-const { isOriginTag, isBuildInWebTag } = require('../../../../utils/dom-tag-config')
+const { isOriginTag, isBuildInTag } = require('../../../../utils/dom-tag-config')
 
 module.exports = function () {
   const handleComponentTag = (el, data) => {
@@ -16,7 +16,7 @@ module.exports = function () {
     waterfall: true,
     skipNormalize: true,
     supportedModes: ['web', 'ios', 'android', 'harmony'],
-    test: (input) => isOriginTag(input) || isBuildInWebTag(input),
+    test: (input) => isOriginTag(input) || isBuildInTag(input),
     web: handleComponentTag,
     ios: handleComponentTag,
     android: handleComponentTag,

package/lib/platform/template/wx/index.js

@@ -34,8 +34,7 @@ module.exports = function getSpec ({ warn, error }) {
       touchstart: 'touchstart',
       touchmove: 'touchmove',
       touchend: 'touchend',
-      touchcancel: 'touchcancel',
-      transitionend: 'transitionend'
+      touchcancel: 'touchcancel'
     }
     if (eventMap[eventName]) {
       return eventMap[eventName]

package/lib/react/index.js

@@ -35,7 +35,6 @@ module.exports = function ({
     })
   }
   const mpx = loaderContext.getMpx()
-  const rnConfig = mpx.rnConfig
   // 通过RecordLoaderContentDependency和loaderContentCache确保子request不再重复生成loaderContent
   const cacheContent = mpx.loaderContentCache.get(loaderContext.resourcePath)
   if (cacheContent) return callback(null, cacheContent)
@@ -92,8 +91,7 @@ module.exports = function ({
         genericsInfo: templateRes.genericsInfo,
         wxsModuleMap: templateRes.wxsModuleMap,
         localComponentsMap: jsonRes.localComponentsMap,
-        localPagesMap: jsonRes.localPagesMap,
-        rnConfig
+        localPagesMap: jsonRes.localPagesMap
       }, callback)
     }
   ], (err, scriptRes) => {

package/lib/react/processJSON.js

@@ -11,11 +11,8 @@ const resolve = require('../utils/resolve')
 const createJSONHelper = require('../json-compiler/helper')
 const getRulesRunner = require('../platform/index')
 const { RESOLVE_IGNORED_ERR } = require('../utils/const')
-const normalize = require('../utils/normalize')
 const RecordResourceMapDependency = require('../dependencies/RecordResourceMapDependency')
 const RecordPageConfigsMapDependency = require('../dependencies/RecordPageConfigsMapDependency')
-const mpxViewPath = normalize.lib('runtime/components/react/dist/mpx-view.jsx')
-const mpxTextPath = normalize.lib('runtime/components/react/dist/mpx-text.jsx')
 
 module.exports = function (jsonContent, {
   loaderContext,
@@ -116,14 +113,14 @@ module.exports = function (jsonContent, {
   }
 
   if (ctorType === 'page') {
-    const keysToExtract = ['navigationStyle', 'navigationBarTitleText', 'navigationBarTextStyle', 'navigationBarBackgroundColor']
+    // const keysToExtract = ['navigationStyle']
     const configObj = {}
     // 暂时先不注入数据，后续如需要使用再用
-    keysToExtract.forEach(key => {
-      if (jsonObj[key]) {
-        configObj[key] = jsonObj[key]
-      }
-    })
+    // keysToExtract.forEach(key => {
+    //   if (jsonObj[key]) {
+    //     configObj[key] = jsonObj[key]
+    //   }
+    // })
     loaderContext._module.addPresentationalDependency(new RecordPageConfigsMapDependency(parseRequest(loaderContext.resource).resourcePath, configObj))
   }
 
@@ -136,29 +133,6 @@ module.exports = function (jsonContent, {
     isShow: true
   }
 
-  const fillInComponentPlaceholder = (name, placeholder, placeholderEntry) => {
-    const componentPlaceholder = jsonObj.componentPlaceholder || {}
-    if (componentPlaceholder[name]) return
-    componentPlaceholder[name] = placeholder
-    jsonObj.componentPlaceholder = componentPlaceholder
-    if (placeholderEntry && !jsonObj.usingComponents[placeholder]) jsonObj.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 processTabBar = (tabBar, callback) => {
     if (tabBar) {
       tabBar = Object.assign({}, defaultTabbar, tabBar)
@@ -327,48 +301,19 @@ module.exports = function (jsonContent, {
   const processComponents = (components, context, callback) => {
     if (components) {
       async.eachOf(components, (component, name, callback) => {
-        processComponent(component, context, {}, (err, entry = {}, { tarRoot, placeholder } = {}) => {
+        processComponent(component, context, {}, (err, { resource, outputPath } = {}, { tarRoot } = {}) => {
           if (err) return callback(err === RESOLVE_IGNORED_ERR ? null : err)
-          const fillComponentsMap = (name, entry, tarRoot) => {
-            const { resource, outputPath } = entry
-            const { resourcePath, queryObj } = parseRequest(resource)
-            componentsMap[resourcePath] = outputPath
-            loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'component', outputPath))
-            localComponentsMap[name] = {
-              resource: addQuery(resource, {
-                isComponent: true,
-                outputPath
-              }),
-              async: queryObj.async || tarRoot
-            }
-          }
-          fillComponentsMap(name, entry, tarRoot)
-          const { relativePath } = entry
-
-          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)
-                  fillComponentsMap(placeholder.name, entry, '')
-                  callback()
-                })
-              } else {
-                fillInComponentPlaceholder(name, placeholder.name)
-                callback()
-              }
-            } else {
-              if (!jsonObj.componentPlaceholder || !jsonObj.componentPlaceholder[name]) {
-                const errMsg = `componentPlaceholder of "${name}" doesn't exist! \n\r`
-                emitError(errMsg)
-              }
-              callback()
-            }
-          } else {
-            callback()
+          const { resourcePath, queryObj } = parseRequest(resource)
+          componentsMap[resourcePath] = outputPath
+          loaderContext._module && loaderContext._module.addPresentationalDependency(new RecordResourceMapDependency(resourcePath, 'component', outputPath))
+          localComponentsMap[name] = {
+            resource: addQuery(resource, {
+              isComponent: true,
+              outputPath
+            }),
+            async: queryObj.async || tarRoot
           }
+          callback()
         })
       }, callback)
     } else {

package/lib/react/processScript.js

@@ -13,7 +13,6 @@ module.exports = function (script, {
   builtInComponentsMap,
   localComponentsMap,
   localPagesMap,
-  rnConfig,
   componentGenerics,
   genericsInfo
 }, callback) {
@@ -33,7 +32,6 @@ module.exports = function (script, {
   }
 
   let output = '/* script */\n'
-  output += "import { lazy, createElement, memo, forwardRef } from 'react'\n"
   if (ctorType === 'app') {
     output += `
 import { getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}
@@ -41,8 +39,7 @@ import { getComponent } from ${stringifyRequest(loaderContext, optionProcessorPa
     const { pagesMap, firstPage } = buildPagesMap({
       localPagesMap,
       loaderContext,
-      jsonConfig,
-      rnConfig
+      jsonConfig
     })
     const componentsMap = buildComponentsMap({
       localComponentsMap,
@@ -53,6 +50,8 @@ import { getComponent } from ${stringifyRequest(loaderContext, optionProcessorPa
     output += getRequireScript({ ctorType, script, loaderContext })
     output += `export default global.__mpxOptionsMap[${JSON.stringify(moduleId)}]\n`
   } else {
+    // RN环境暂不支持异步加载
+    // output += 'import { lazy } from \'react\'\n'
     output += `import { getComponent } from ${stringifyRequest(loaderContext, optionProcessorPath)}\n`
     // 获取组件集合
     const componentsMap = buildComponentsMap({

package/lib/react/script-helper.js

@@ -3,74 +3,30 @@ const createHelpers = require('../helpers')
 const parseRequest = require('../utils/parse-request')
 const shallowStringify = require('../utils/shallow-stringify')
 const normalize = require('../utils/normalize')
-const addQuery = require('../utils/add-query')
-const path = require('path')
-const { isBuildInReactTag } = require('../utils/dom-tag-config')
 
 function stringifyRequest (loaderContext, request) {
   return loaderUtils.stringifyRequest(loaderContext, request)
 }
 
-function getMpxComponentRequest (component) {
-  return JSON.stringify(addQuery(`@mpxjs/webpack-plugin/lib/runtime/components/react/dist/${component}`, { isComponent: true }))
-}
-
-const mpxAsyncSuspense = getMpxComponentRequest('AsyncSuspense')
-
-function getAsyncChunkName (chunkName) {
-  if (chunkName && typeof chunkName !== 'boolean') {
-    return `/* webpackChunkName: "${chunkName}/index" */`
-  }
-  return ''
-}
+// function getAsyncChunkName (chunkName) {
+//   if (chunkName && typeof chunkName !== 'boolean') {
+//     return `/* webpackChunkName: "${chunkName}" */`
+//   }
+//   return ''
+// }
 
-function getAsyncComponent (componentName, componentRequest, chunkName, fallback) {
-  return `getComponent(memo(forwardRef(function(props, ref) {
-    return createElement(
-      getComponent(require(${mpxAsyncSuspense})),
-      {
-        type: 'component',
-        props: Object.assign({}, props, { ref }),
-        chunkName: ${JSON.stringify(chunkName)},
-        request: ${JSON.stringify(componentRequest)},
-        loading: getComponent(require(${fallback})),
-        getChildren: () => import(${getAsyncChunkName(chunkName)}${componentRequest})
-      }
-    )
-  })))`
-}
-
-function getAsyncPage (componentName, componentRequest, chunkName, fallback, loading) {
-  fallback = fallback && `getComponent(require('${fallback}?isComponent=true'))`
-  loading = loading && `getComponent(require('${loading}?isComponent=true'))`
-  return `getComponent(function(props) {
-    return createElement(
-      getComponent(require(${mpxAsyncSuspense})),
-      {
-        type: 'page',
-        props: props,
-        chunkName: ${JSON.stringify(chunkName)},
-        request: ${JSON.stringify(componentRequest)},
-        fallback: ${fallback},
-        loading: ${loading},
-        getChildren: () => import(${getAsyncChunkName(chunkName)}${componentRequest})
-      }
-    )
-  })`
-}
-
-function buildPagesMap ({ localPagesMap, loaderContext, jsonConfig, rnConfig }) {
+function buildPagesMap ({ localPagesMap, loaderContext, jsonConfig }) {
   let firstPage = ''
   const pagesMap = {}
   Object.keys(localPagesMap).forEach((pagePath) => {
     const pageCfg = localPagesMap[pagePath]
     const pageRequest = stringifyRequest(loaderContext, pageCfg.resource)
-    if (pageCfg.async) {
-      pagesMap[pagePath] = getAsyncPage(pagePath, pageRequest, pageCfg.async, rnConfig.asyncChunk && rnConfig.asyncChunk.fallback, rnConfig.asyncChunk && rnConfig.asyncChunk.loading)
-    } else {
+    // if (pageCfg.async) {
+    //   pagesMap[pagePath] = `lazy(function(){return import(${getAsyncChunkName(pageCfg.async)} ${pageRequest}).then(function(res){return getComponent(res, {__mpxPageRoute: ${JSON.stringify(pagePath)}, displayName: "Page"})})})`
+    // } else {
     // 为了保持小程序中app->page->component的js执行顺序，所有的page和component都改为require引入
-      pagesMap[pagePath] = `getComponent(require(${pageRequest}), {__mpxPageRoute: ${JSON.stringify(pagePath)}, displayName: "Page"})`
-    }
+    pagesMap[pagePath] = `getComponent(require(${pageRequest}), {__mpxPageRoute: ${JSON.stringify(pagePath)}, displayName: "Page"})`
+    // }
     if (pagePath === jsonConfig.entryPagePath) {
       firstPage = pagePath
     }
@@ -86,45 +42,16 @@ function buildPagesMap ({ localPagesMap, loaderContext, jsonConfig, rnConfig })
 
 function buildComponentsMap ({ localComponentsMap, builtInComponentsMap, loaderContext, jsonConfig }) {
   const componentsMap = {}
-  const mpx = loaderContext.getMpx()
   if (localComponentsMap) {
     Object.keys(localComponentsMap).forEach((componentName) => {
       const componentCfg = localComponentsMap[componentName]
       const componentRequest = stringifyRequest(loaderContext, componentCfg.resource)
-      if (componentCfg.async) {
-        const placeholder = jsonConfig.componentPlaceholder && jsonConfig.componentPlaceholder[componentName]
-        if (placeholder) {
-          if (localComponentsMap[placeholder]) {
-            const placeholderCfg = localComponentsMap[placeholder]
-            const placeholderRequest = stringifyRequest(loaderContext, placeholderCfg.resource)
-            if (placeholderCfg.async) {
-              loaderContext.emitWarning(
-                new Error(`[json processor][${loaderContext.resource}]: componentPlaceholder ${placeholder} should not be a async component, please check!`)
-              )
-            }
-            componentsMap[componentName] = getAsyncComponent(componentName, componentRequest, componentCfg.async, placeholderRequest)
-          } else if (mpx.globalComponents[placeholder]) {
-            const { queryObj, rawResourcePath } = parseRequest(mpx.globalComponents[placeholder])
-            const placeholderRequest = JSON.stringify(path.resolve(queryObj.context, rawResourcePath))
-            componentsMap[componentName] = getAsyncComponent(componentName, componentRequest, componentCfg.async, placeholderRequest)
-          } else {
-            const tag = `mpx-${placeholder}`
-            if (!isBuildInReactTag(tag)) {
-              loaderContext.emitError(
-                new Error(`[json processor][${loaderContext.resource}]: componentPlaceholder ${placeholder} is not built-in component, please check!`)
-              )
-            }
-            componentsMap[componentName] = getAsyncComponent(componentName, componentRequest, componentCfg.async, getMpxComponentRequest(tag))
-          }
-        } else {
-          loaderContext.emitError(
-            new Error(`[json processor][${loaderContext.resource}]: ${componentName} has no componentPlaceholder, please check!`)
-          )
-          componentsMap[componentName] = getAsyncComponent(componentName, componentRequest, componentCfg.async)
-        }
-      } else {
-        componentsMap[componentName] = `getComponent(require(${componentRequest}), {displayName: ${JSON.stringify(componentName)}})`
-      }
+      // RN中暂不支持异步加载
+      // if (componentCfg.async) {
+      //   componentsMap[componentName] = `lazy(function(){return import(${getAsyncChunkName(componentCfg.async)}${componentRequest}).then(function(res){return getComponent(res, {displayName: ${JSON.stringify(componentName)}})})})`
+      // } else {
+      componentsMap[componentName] = `getComponent(require(${componentRequest}), {displayName: ${JSON.stringify(componentName)}})`
+      // }
     })
   }
   if (builtInComponentsMap) {
@@ -180,7 +107,6 @@ global.__mpxPageConfig = ${JSON.stringify(jsonConfig.window)}
 global.__getAppComponents = function () {
   return ${shallowStringify(componentsMap)}
 }
-global.__preloadRule = ${JSON.stringify(jsonConfig.preloadRule)}
 global.currentInject.getPages = function () {
   return ${shallowStringify(pagesMap)}
 }

package/lib/runtime/components/react/AsyncContainer.tsx

@@ -1,29 +1,6 @@
-import { ComponentType, ReactNode, Component, Suspense } from 'react'
+import { ComponentType, ReactNode, Component, Fragment, Suspense } from 'react'
 import { View, Text, Image, StyleSheet, TouchableOpacity } from 'react-native'
 import FastImage from '@d11/react-native-fast-image'
-import Animated, { useAnimatedStyle } from 'react-native-reanimated'
-
-type PageWrapper = {
-  children: ReactNode
-}
-
-export const PageWrapper = ({ children }: PageWrapper) => {
-  const animatedStyle = useAnimatedStyle(() => ({
-    transform: [{ translateY: -0 }],
-    flexBasis: 'auto',
-    flex: 1
-  }))
-
-  return (
-    <Animated.View
-      style={[
-        animatedStyle
-      ]}
-    >
-      {children}
-    </Animated.View>
-  )
-}
 
 const styles = StyleSheet.create({
   container: {
@@ -82,7 +59,7 @@ interface PropsType<T extends AsyncType> {
   props: object
   loading: ComponentType<unknown>
   fallback: ComponentType<unknown>
-  children: (props: any) => ReactNode | ReactNode
+  children: (props: unknown) => ReactNode
 }
 
 interface StateType {
@@ -95,7 +72,7 @@ interface ComponentError extends Error {
   type: 'timeout' | 'fail'
 }
 
-export const DefaultLoading = () => {
+const DefaultLoading = () => {
   return (
     <View style={styles.container}>
       <FastImage
@@ -106,11 +83,11 @@ export const DefaultLoading = () => {
   )
 }
 
-export interface DefaultFallbackProps {
+interface DefaultFallbackProps {
   onReload: () => void
 }
 
-export const DefaultFallback = ({ onReload }: DefaultFallbackProps) => {
+const DefaultFallback = ({ onReload }: DefaultFallbackProps) => {
   return (
     <View style={styles.container}>
       <Image
@@ -200,16 +177,11 @@ export default class AsyncContainer extends Component<PropsType<AsyncType>, Stat
 
   render () {
     if (this.state.hasError) {
-      if (this.props.type === 'component') {
-        return this.errorFallback
-      } else {
-        return (<PageWrapper>{this.errorFallback}</PageWrapper>)
-      }
+      return this.errorFallback
     } else {
       return (
         <Suspense fallback={this.suspenseFallback} key={this.state.key}>
-          {typeof this.props.children === 'function' ? this.props.children(this.props.props) : this.props.children}
-          {/* {this.props.children(this.props.props)} */}
+          {this.props.children(this.props.props)}
         </Suspense>
       )
     }