feat: @umijs/plugin-dva

Author: 徐远翔

README.md

@@ -23,7 +23,12 @@
 
 RN 示例工程：[UMIRNExample](https://github.com/xuyuanxiang/UMIRNExample)
 
-- [compare/0.0.1...0.1.0](https://github.com/xuyuanxiang/UMIRNExample/compare/0.0.1...0.1.0)：使用`react-native init`初始化工程 到 集成 `umi-preset-react-native` 后的改动内容。
+- [0.0.1](https://github.com/xuyuanxiang/UMIRNExample/tree/0.0.1): 使用`react-native init`得到的初始工程
+- [0.1.0](https://github.com/xuyuanxiang/UMIRNExample/tree/0.1.0)：添加`umi`依赖并集成`umi-preset-react-native`
+  - [compare/0.0.1...0.1.0](https://github.com/xuyuanxiang/UMIRNExample/compare/0.0.1...0.1.0)
+- [1.0.0](https://github.com/xuyuanxiang/UMIRNExample/tree/1.0.0)：集成`@umijs/plugin-dva`
+  - [compare/0.0.1...1.0.0](https://github.com/xuyuanxiang/UMIRNExample/compare/0.0.1...1.0.0)
+  - [compare/0.1.0...1.0.0](https://github.com/xuyuanxiang/UMIRNExample/compare/0.1.0...1.0.0)
 
 ## 安装
 
@@ -66,7 +71,7 @@ export default {
 
 - `history`：在 RN 中只能使用：`'memory'`类型，[umi](https://umijs.org/) 默认值是：`'browser'`。`'browser'`和`'hash'`类型都需要 DOM，在 RN 中会报错；
 
-_umi 3.x 后会自动探测宿主工程`devDependencies`和`dependencies`中所有含`umi-preset-`和`umi-plugin-`前缀的 npm 包，自动装配。所以不再需要在`.umirc.js`中配置`plugins`和`presets`_
+_umi 3.x 后会自动探测宿主工程`devDependencies`和`dependencies`并自动装配插件。所以不需要在`.umirc.js`中配置`plugins`和`presets`选项。_
 
 **在 RN 中集成其他[umi](https://umijs.org/)插件需要开发者自行斟酌。**
 

packages/preset/src/plugins/generateFiles/haulConfig.ts

@@ -13,7 +13,7 @@ const transform = ({ config }) => {
 export default makeConfig({
   bundles: {
     index: {
-      entry: withPolyfills('./index.js'),
+      entry: withPolyfills('./index.ts'),
       transform,
     },
   },
@@ -49,7 +49,7 @@ export default (api: IApi) => {
       return bundleConfig.entry?.umi;
     })[0];
 
-    const alias = lodash.omit(config.resolve?.alias, ['react-dom']);
+    const alias = lodash.cloneDeep(config.resolve?.alias);
     Object.assign(alias, {
       // 防止加载umi Common JS格式的代码
       umi: winPath(join(absTmpPath || '', 'rn', 'umi')),

packages/preset/src/plugins/generateFiles/index.ts

@@ -19,7 +19,7 @@ export default (api: IApi) => {
 
   api.onGenerateFiles(async () => {
     api.writeTmpFile({
-      path: 'index.js',
+      path: 'index.ts',
       content: Mustache.render(indexTpl, {
         appKey: api.config?.reactNative?.appKey,
         entryCode: (
@@ -36,6 +36,13 @@ export default (api: IApi) => {
             initialValue: [],
           })
         ).join('\r\n'),
+        polyfillImports: importsToStr(
+          await api.applyPlugins({
+            key: 'addPolyfillImports',
+            type: api.ApplyPluginsType.add,
+            initialValue: [],
+          }),
+        ).join('\r\n'),
         importsAhead: importsToStr(
           await api.applyPlugins({
             key: 'addEntryImportsAhead',

packages/preset/src/plugins/generateFiles/indexTpl.ts

@@ -1,25 +1,27 @@
-export default `
+export default `// @ts-ignore
 if (global.window === undefined) {
+  // @ts-ignore
   global.window = global;
 }
-
+{{{ polyfillImports }}}
 {{{ importsAhead }}}
 import {ApplyPluginsType} from 'umi-react-native-runtime';
 import {renderClient} from 'umi-react-native-renderer';
-import {plugin, history} from './core/umiExports';
+import {plugin} from './core/umiExports';
+import {createHistory} from './core/history';
 import {routes} from './core/routes';
 {{{ imports }}}
 
 {{{ entryCodeAhead }}}
 
-const getClientRender = (args = {}) => plugin.applyPlugins({
+const getClientRender = (args: { hot?: boolean } = {}) => plugin.applyPlugins({
   key: 'render',
   type: ApplyPluginsType.compose,
   initialValue: () => {
     return renderClient({
       routes,
       plugin,
-      history,
+      history: createHistory(args.hot),
       appKey: '{{{ appKey }}}',
     });
   },
@@ -32,4 +34,13 @@ export default clientRender();
 
 {{{ entryCode }}}
 
+// hot module replacement
+// @ts-ignore
+if (module.hot) {
+  // @ts-ignore
+  module.hot.accept(() => {
+    getClientRender({ hot: true })();
+  });
+}
+
 `;

packages/preset/src/plugins/generateFiles/rn/umi.ts

@@ -14,7 +14,7 @@ export * from '../core/umiExports';
 export default (api: IApi) => {
   api.onGenerateFiles(async () => {
     api.writeTmpFile({
-      path: 'rn/umi.js',
+      path: 'rn/umi.ts',
       content: CONTENT,
     });
   });