feat: support haul

Author: 徐远翔

packages/umi-preset-react-native/android/build.gradle packages/umi-plugin-react-native-multibundle/android/build.gradle

@@ -112,18 +112,23 @@ export default (api: IApi) => {
       throw new TypeError('"history.type" 配置错误');
     }
 
-    if (api.config.haul) {
-      if (api.config.dynamicImport && !api.config.dynamicImport.loading) {
-        api.logger.error(
-          `在 RN 环境中启用"dynamicImport"功能时，必须实现自定义的"loading"！${EOL}因为 umi 默认 loading 使用了 HTML 标签，在 RN 中运行会报错！${EOL}查看如何配置自定义 loading：https://umijs.org/config#dynamicimport`,
-        );
-        throw new TypeError('"dynamicImport.loading" 未配置');
-      }
-    } else {
-      if (api.config.dynamicImport) {
-        api.logger.error('在 RN 环境中暂不支持："dynamicImport"功能。');
-        throw new TypeError('在 RN 环境中暂不支持："dynamicImport"功能。');
-      }
+    if (api.config.dynamicImport) {
+      api.logger.error('在 RN 环境中暂不支持："dynamicImport"功能。');
+      throw new TypeError('在 RN 环境中暂不支持："dynamicImport"功能。');
     }
+
+    // if (api.config.haul) {
+    //   if (api.config.dynamicImport && !api.config.dynamicImport.loading) {
+    //     api.logger.error(
+    //       `在 RN 环境中启用"dynamicImport"功能时，必须实现自定义的"loading"！${EOL}因为 umi 默认 loading 使用了 HTML 标签，在 RN 中运行会报错！${EOL}查看如何配置自定义 loading：https://umijs.org/config#dynamicimport`,
+    //     );
+    //     throw new TypeError('"dynamicImport.loading" 未配置');
+    //   }
+    // } else {
+    //   if (api.config.dynamicImport) {
+    //     api.logger.error('在 RN 环境中暂不支持："dynamicImport"功能。');
+    //     throw new TypeError('在 RN 环境中暂不支持："dynamicImport"功能。');
+    //   }
+    // }
   });
 };

packages/umi-preset-react-native/android/gradle/wrapper/gradle-wrapper.jar packages/umi-plugin-react-native-multibundle/android/gradle/wrapper/gradle-wrapper.jar

@@ -1,21 +1,83 @@
 import { IApi } from 'umi';
-import { asyncClean, generateConfigFiles, generateFiles } from '../../utils';
+import { join } from 'path';
+import { asyncClean, generateConfigFiles } from '../../utils';
 
 interface IRNGeneratorArguments {
   dev?: boolean;
 }
 
 export default (api: IApi) => {
+  const {
+    utils: { lodash, winPath, chokidar },
+    paths,
+  } = api;
+  async function generateFiles() {
+    await api.applyPlugins({
+      key: 'onGenerateFiles',
+      type: api.ApplyPluginsType.event,
+    });
+  }
+
   async function handler(watch?: boolean): Promise<void> {
     const start = Date.now();
     api.logger.info(`Starting react-native generator in ${process.env.NODE_ENV} mode.`);
 
     await asyncClean(api, '.cache', 'node_modules');
-    const unwatch = await generateFiles(api, watch);
+    await generateFiles();
     await generateConfigFiles(api);
 
+    const unwatches: ((() => void) | { close: () => void })[] = [];
+
+    if (watch) {
+      const watcherPaths = await api.applyPlugins({
+        key: 'addTmpGenerateWatcherPaths',
+        type: api.ApplyPluginsType.add,
+        initialValue: [
+          paths.absPagesPath!,
+          join(paths.absSrcPath!, api.config?.singular ? 'layout' : 'layouts'),
+          join(paths.absSrcPath!, 'app.tsx'),
+          join(paths.absSrcPath!, 'app.ts'),
+          join(paths.absSrcPath!, 'app.jsx'),
+          join(paths.absSrcPath!, 'app.js'),
+        ],
+      });
+      lodash.uniq<string>(watcherPaths.map((p: string) => winPath(p))).forEach((p: string) => {
+        createWatcher(p);
+      });
+    }
+
+    function unwatchAll() {
+      while (unwatches.length) {
+        const unwatch = unwatches.pop();
+        try {
+          if (typeof unwatch === 'function') {
+            unwatch();
+          } else if (unwatch && typeof unwatch.close === 'function') {
+            unwatch.close();
+          }
+        } catch (ignored) {}
+      }
+    }
+
+    function createWatcher(path: string) {
+      const watcher = chokidar.watch(path, {
+        // ignore .dotfiles and _mock.js
+        // eslint-disable-next-line no-useless-escape
+        ignored: /(^|[\/\\])(_mock.js$|\..)/,
+        ignoreInitial: true,
+      });
+      watcher.on(
+        'all',
+        lodash.throttle(async () => {
+          api.logger.info('File change detected. Starting regenerate...');
+          await generateFiles();
+        }, 500),
+      );
+      unwatches.push(watcher);
+    }
+
     process.on('exit', () => {
-      unwatch();
+      unwatchAll();
       if (!watch) {
         api.logger.info(`Successfully completed in ${Date.now() - start}ms.`);
       }

packages/umi-preset-react-native/android/gradle/wrapper/gradle-wrapper.properties packages/umi-plugin-react-native-multibundle/android/gradle/wrapper/gradle-wrapper.properties

@@ -5,6 +5,7 @@ const transform = ({ config }) => {
   return _.defaultsDeep({{{ webpackConfig }}}, config);
 };
 
+{{#bundles}}
 export default makeConfig({
   templates: {
     filename: {
@@ -35,5 +36,21 @@ export default makeConfig({
     ...{{{ bundles }}},
   },
 });
+{{/bundles}}
+{{^bundles}}
+export default makeConfig({
+  bundles: {
+    index: {
+      entry: withPolyfills(
+        '@/index',
+        {
+          additionalSetupFiles: ['@@/react-native/polyfill', '@@/core/plugin'],
+        }
+      ),
+      transform,
+    },
+  },
+});
+{{/bundles}}
 
 `;

packages/umi-preset-react-native/android/src/main/AndroidManifest.xml packages/umi-plugin-react-native-multibundle/android/src/main/AndroidManifest.xml

@@ -322,16 +322,14 @@ export async function generateConfigFiles(api: IApi): Promise<void> {
     presets.push('module:metro-react-native-babel-preset');
   }
 
-  if (!api.config.haul) {
-    plugins.push([
-      require.resolve('babel-plugin-module-resolver'),
-      {
-        root: [paths.absSrcPath],
-        extensions: ['.ts', '.tsx', '.native.js', '.native.jsx', '.esm.js', '.js', '.jsx', '.json'],
-        alias: config.resolve.alias,
-      },
-    ]);
-  }
+  plugins.push([
+    require.resolve('babel-plugin-module-resolver'),
+    {
+      root: [paths.absSrcPath],
+      extensions: ['.ts', '.tsx', '.native.js', '.native.jsx', '.esm.js', '.js', '.jsx', '.json'],
+      alias: config.resolve.alias,
+    },
+  ]);
 
   const presetOpts = await api.applyPlugins({
     type: api.ApplyPluginsType.modify,
@@ -401,61 +399,63 @@ export async function generateConfigFiles(api: IApi): Promise<void> {
         isExpo,
       }),
     ),
+    asyncWriteTmpFile(
+      api,
+      join(cwd, 'metro.config.js'),
+      Mustache.render(METRO_CONFIG_TPL, {
+        watchFolders: [paths.absTmpPath],
+        userConfigFile: winPath(userConfigFile),
+        useUserConfig: existsSync(userConfigFile),
+      }),
+    ),
     asyncWriteTmpFile(api, join(cwd, 'index.js'), INDEX_TPL),
   ];
 
   if (api.config.haul) {
-    const routes = await api.getRoutes();
-    tasks.push(
-      asyncWriteTmpFile(
-        api,
-        join(cwd, 'haul.config.js'),
-        Mustache.render(HAUL_CONFIG_TPL, {
-          haulPresetPath: winPath(detectHaulPresetPath()),
-          webpackConfig: JSON.stringify(config, null, 2),
-          dependencies: JSON.stringify(
-            lodash.keys(
-              lodash.omit(config.resolve.alias, [
-                '@',
-                '@@',
-                'react-dom',
-                'react-router-dom',
-                'regenerator-runtime',
-                './core/polyfill',
-                './core/routes',
-                '@@/core/routes',
-              ]),
+    if (api.config.dynamicImport && api.config.dynamicImport.loading) {
+      const routes = await api.getRoutes();
+      tasks.push(
+        asyncWriteTmpFile(
+          api,
+          join(cwd, 'haul.config.js'),
+          Mustache.render(HAUL_CONFIG_TPL, {
+            haulPresetPath: winPath(detectHaulPresetPath()),
+            webpackConfig: JSON.stringify(config, null, 2),
+            dependencies: JSON.stringify(
+              lodash.keys(
+                lodash.omit(config.resolve.alias, [
+                  '@',
+                  '@@',
+                  'react-dom',
+                  'react-router-dom',
+                  'regenerator-runtime',
+                  './core/polyfill',
+                  './core/routes',
+                  '@@/core/routes',
+                ]),
+              ),
             ),
-          ),
-          bundles: bundlesToJSON(api, transformRoutesToBundle(routes)),
-        }),
-      ),
-    );
-  } else {
-    tasks.push(
-      asyncWriteTmpFile(
-        api,
-        join(cwd, 'metro.config.js'),
-        Mustache.render(METRO_CONFIG_TPL, {
-          watchFolders: [paths.absTmpPath],
-          userConfigFile: winPath(userConfigFile),
-          useUserConfig: existsSync(userConfigFile),
-        }),
-      ),
-    );
+            bundles: bundlesToJSON(api, transformRoutesToBundle(routes)),
+          }),
+        ),
+      );
+    } else {
+      tasks.push(
+        asyncWriteTmpFile(
+          api,
+          join(cwd, 'haul.config.js'),
+          Mustache.render(HAUL_CONFIG_TPL, {
+            haulPresetPath: winPath(detectHaulPresetPath()),
+            webpackConfig: JSON.stringify(config, null, 2),
+          }),
+        ),
+      );
+    }
   }
 
   await Promise.all(tasks);
 }
 
-export async function generateFiles(api: IApi, watch?: boolean): Promise<() => void> {
-  const generateFiles = require(api.utils.resolve.sync('@umijs/preset-built-in/lib/plugins/commands/generateFiles', {
-    basedir: process.env.UMI_DIR,
-  })).default;
-
-  return generateFiles({ api, watch });
-}
-
 interface IGetUserLibDirOptions {
   api: IApi;
   /**