@mpxjs/webpack-plugin 2.10.6-beta.3 → 2.10.6-beta.4

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(`./${url}`)})`
+  if (isRN) publicPath = `__non_webpack_require__(${JSON.stringify(`_mpx_rn_img_relative_path_/${url}`)})`
 
   if (options.publicPath) {
     if (typeof options.publicPath === 'function') {

package/lib/index.js

@@ -1217,12 +1217,12 @@ class MpxWebpackPlugin {
         // 自动使用分包配置修改splitChunksPlugin配置
         if (splitChunksPlugin) {
           let needInit = false
-          if (isWeb(mpx.mode)) {
+          if (isWeb(mpx.mode) || isReact(mpx.mode)) {
             // web独立处理splitChunk
-            if (!hasOwn(splitChunksOptions.cacheGroups, 'main')) {
+            if (isWeb(mpx.mode) && !hasOwn(splitChunksOptions.cacheGroups, 'main')) {
               splitChunksOptions.cacheGroups.main = {
                 chunks: 'initial',
-                name: 'bundle',
+                name: 'bundle/index', // web 输出 chunk 路径和 rn 输出分包格式拉齐
                 test: /[\\/]node_modules[\\/]/
               }
               needInit = true
@@ -1230,7 +1230,7 @@ class MpxWebpackPlugin {
             if (!hasOwn(splitChunksOptions.cacheGroups, 'async')) {
               splitChunksOptions.cacheGroups.async = {
                 chunks: 'async',
-                name: 'async',
+                name: 'async/index',
                 minChunks: 2
               }
               needInit = true
@@ -1333,6 +1333,15 @@ 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) {

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, isBuildInTag } = require('../../../utils/dom-tag-config')
+const { isOriginTag, isBuildInWebTag, isBuildInReactTag } = 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,19 +128,41 @@ module.exports = function getSpec ({ warn, error }) {
   /**
    * 将小程序代码中使用的与原生 HTML tag 或 内建组件 同名的组件进行转化，以解决与原生tag命名冲突问题。
    */
-  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]
+  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]
           }
         })
       }
-      return input
     }
+    return input
   }
 
   const componentRules = [
@@ -154,13 +176,6 @@ 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'),
@@ -170,7 +185,11 @@ module.exports = function getSpec ({ warn, error }) {
       swan: addGlobalComponents,
       qq: addGlobalComponents,
       tt: addGlobalComponents,
-      jd: addGlobalComponents
+      jd: addGlobalComponents,
+      web: fixComponentName,
+      ios: fixComponentName,
+      android: fixComponentName,
+      harmony: fixComponentName
     }
   ]
 
@@ -371,13 +390,6 @@ 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'),
@@ -442,6 +454,12 @@ 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, isBuildInTag } = require('../../../../utils/dom-tag-config')
+const { isOriginTag, isBuildInWebTag } = 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) || isBuildInTag(input),
+    test: (input) => isOriginTag(input) || isBuildInWebTag(input),
     web: handleComponentTag,
     ios: handleComponentTag,
     android: handleComponentTag,

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

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

package/lib/react/processJSON.js

@@ -11,8 +11,11 @@ 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,
@@ -133,6 +136,29 @@ 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)
@@ -301,19 +327,48 @@ module.exports = function (jsonContent, {
   const processComponents = (components, context, callback) => {
     if (components) {
       async.eachOf(components, (component, name, callback) => {
-        processComponent(component, context, {}, (err, { resource, outputPath } = {}, { tarRoot } = {}) => {
+        processComponent(component, context, {}, (err, entry = {}, { tarRoot, placeholder } = {}) => {
           if (err) return callback(err === RESOLVE_IGNORED_ERR ? null : err)
-          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
+          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()
           }
-          callback()
         })
       }, callback)
     } else {

package/lib/react/script-helper.js

@@ -15,7 +15,7 @@ function getMpxComponentRequest (component) {
   return JSON.stringify(addQuery(`@mpxjs/webpack-plugin/lib/runtime/components/react/dist/${component}`, { isComponent: true }))
 }
 
-const mpxAsyncContainer = getMpxComponentRequest('AsyncContainer')
+const mpxAsyncSuspense = getMpxComponentRequest('AsyncSuspense')
 
 function getAsyncChunkName (chunkName) {
   if (chunkName && typeof chunkName !== 'boolean') {
@@ -27,17 +27,14 @@ function getAsyncChunkName (chunkName) {
 function getAsyncComponent (componentName, componentRequest, chunkName, fallback) {
   return `getComponent(memo(forwardRef(function(props, ref) {
     return createElement(
-      getComponent(require(${mpxAsyncContainer})),
+      getComponent(require(${mpxAsyncSuspense})),
       {
         type: 'component',
         props: Object.assign({}, props, { ref }),
+        chunkName: ${JSON.stringify(chunkName)},
+        request: ${JSON.stringify(componentRequest)},
         loading: getComponent(require(${fallback})),
-        children: (props) => createElement(
-          getComponent(
-            lazy(function(){ return import(${getAsyncChunkName(chunkName)}${componentRequest}) }), { displayName: ${JSON.stringify(componentName)} }
-          ),
-          props
-        )
+        getChildren: () => import(${getAsyncChunkName(chunkName)}${componentRequest})
       }
     )
   })))`
@@ -48,18 +45,15 @@ function getAsyncPage (componentName, componentRequest, chunkName, fallback, loa
   loading = loading && `getComponent(require('${loading}?isComponent=true'))`
   return `getComponent(function(props) {
     return createElement(
-      getComponent(require(${mpxAsyncContainer})),
+      getComponent(require(${mpxAsyncSuspense})),
       {
         type: 'page',
         props: props,
+        chunkName: ${JSON.stringify(chunkName)},
+        request: ${JSON.stringify(componentRequest)},
         fallback: ${fallback},
         loading: ${loading},
-        children: (props) => createElement(
-          getComponent(
-            lazy(function(){ return import(${getAsyncChunkName(chunkName)}${componentRequest}) }), { __mpxPageRoute: ${JSON.stringify(componentName)}, displayName: 'Page' }
-          ),
-          props
-        )
+        getChildren: () => import(${getAsyncChunkName(chunkName)}${componentRequest})
       }
     )
   })`
@@ -114,12 +108,13 @@ function buildComponentsMap ({ localComponentsMap, builtInComponentsMap, loaderC
             const placeholderRequest = JSON.stringify(path.resolve(queryObj.context, rawResourcePath))
             componentsMap[componentName] = getAsyncComponent(componentName, componentRequest, componentCfg.async, placeholderRequest)
           } else {
-            if (!isBuildInReactTag(placeholder)) {
+            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(`mpx-${placeholder}`))
+            componentsMap[componentName] = getAsyncComponent(componentName, componentRequest, componentCfg.async, getMpxComponentRequest(tag))
           }
         } else {
           loaderContext.emitError(

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

@@ -1,6 +1,29 @@
-import { ComponentType, ReactNode, Component, Fragment, Suspense } from 'react'
+import { ComponentType, ReactNode, Component, 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: {
@@ -59,7 +82,7 @@ interface PropsType<T extends AsyncType> {
   props: object
   loading: ComponentType<unknown>
   fallback: ComponentType<unknown>
-  children: (props: unknown) => ReactNode
+  children: (props: any) => ReactNode | ReactNode
 }
 
 interface StateType {
@@ -72,7 +95,7 @@ interface ComponentError extends Error {
   type: 'timeout' | 'fail'
 }
 
-const DefaultLoading = () => {
+export const DefaultLoading = () => {
   return (
     <View style={styles.container}>
       <FastImage
@@ -83,11 +106,11 @@ const DefaultLoading = () => {
   )
 }
 
-interface DefaultFallbackProps {
+export interface DefaultFallbackProps {
   onReload: () => void
 }
 
-const DefaultFallback = ({ onReload }: DefaultFallbackProps) => {
+export const DefaultFallback = ({ onReload }: DefaultFallbackProps) => {
   return (
     <View style={styles.container}>
       <Image
@@ -177,11 +200,16 @@ export default class AsyncContainer extends Component<PropsType<AsyncType>, Stat
 
   render () {
     if (this.state.hasError) {
-      return this.errorFallback
+      if (this.props.type === 'component') {
+        return this.errorFallback
+      } else {
+        return (<PageWrapper>{this.errorFallback}</PageWrapper>)
+      }
     } else {
       return (
         <Suspense fallback={this.suspenseFallback} key={this.state.key}>
-          {this.props.children(this.props.props)}
+          {typeof this.props.children === 'function' ? this.props.children(this.props.props) : this.props.children}
+          {/* {this.props.children(this.props.props)} */}
         </Suspense>
       )
     }

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

@@ -0,0 +1,81 @@
+import { useState, ComponentType, useEffect, useCallback, useRef } from 'react'
+import { DefaultFallback, DefaultLoading, PageWrapper } from './AsyncContainer'
+import type { DefaultFallbackProps } from './AsyncContainer'
+
+const asyncChunkMap = new Map()
+
+interface props {
+  type: 'component' | 'page'
+  chunkName: string
+  request: string
+  props: any,
+  loading: ComponentType<unknown>
+  fallback: ComponentType<unknown>
+  getChildren: () => Promise<unknown>
+}
+
+const AsyncSuspense: React.FC<props> = ({ type, props, chunkName, request, loading, fallback, getChildren }) => {
+  const [status, setStatus] = useState('pending')
+  const loaded = asyncChunkMap.has(request)
+  const [, setKey] = useState(0)
+  const chunkPromise = useRef<null | Promise<unknown>>(null)
+
+  const reloadPage = useCallback(() => {
+    setKey((preV) => preV + 1)
+    console.log('[mpxAsyncSuspense]: reload page')
+    setStatus('pending')
+  }, [])
+
+  useEffect(() => {
+    if (!loaded && status === 'pending') {
+      // todo 清楚副作用？
+      console.log('the current :', chunkPromise.current)
+      chunkPromise.current!
+        .then((m: any) => {
+          console.log('[mpxAsyncSuspense]: load sucess')
+          asyncChunkMap.set(request, m.__esModule ? m.default : m)
+          setStatus('loaded')
+        })
+        .catch((e) => {
+          if (type === 'component') {
+            console.log(11111, e)
+            global.onLazyLoadError({
+              type: 'subpackage',
+              subpackage: [chunkName],
+              errMsg: `loadSubpackage: ${e.type}`
+            })
+          }
+          console.log('[mpxAsyncSuspense]: load eror', e)
+          chunkPromise.current = null
+          setStatus('error')
+        })
+    }
+  })
+
+  if (loaded) {
+    const Comp = asyncChunkMap.get(request)
+    return <Comp {...props}></Comp>
+  } else if (status === 'error') {
+    console.log('the status is:', status)
+    if (type === 'page') {
+      const Fallback = fallback as ComponentType<DefaultFallbackProps> || DefaultFallback
+      return <><PageWrapper><Fallback onReload={reloadPage}></Fallback></PageWrapper></>
+    } else {
+      const Fallback = loading
+      return <Fallback {...props}></Fallback>
+    }
+  } else {
+    if (!chunkPromise.current) {
+      chunkPromise.current = getChildren()
+    }
+    if (type === 'page') {
+      const Fallback = loading || DefaultLoading
+      return <PageWrapper><Fallback /></PageWrapper>
+    } else {
+      const Fallback = loading
+      return <Fallback {...props}></Fallback>
+    }
+  }
+}
+
+export default AsyncSuspense