feat: add initState and fix for mfsu

.changeset/config.json

@@ -19,6 +19,7 @@
     "@examples/alita2",
     "@examples/boilerplate",
     "@examples/helmet",
+    "@examples/state",
     "@examples/boilerplate",
     "@example/lint",
     "@examples/helmet",

.changeset/dull-avocados-check.md

@@ -0,0 +1,8 @@
+---
+'alita': patch
+'@alita/native': patch
+'@alita/plugin-lowcode': patch
+'@alita/plugins': patch
+---
+
+chore: update umi

.changeset/perfect-otters-reflect.md

@@ -0,0 +1,5 @@
+---
+'alita': patch
+---
+
+feat: add initialState

.changeset/silver-kangaroos-obey.md

@@ -0,0 +1,5 @@
+---
+'@alita/plugins': patch
+---
+
+fix: plugins no run when mfsu

examples/boilerplate/config/config.cloud.ts

@@ -6,7 +6,5 @@ export default {
   },
   mobileLayout: true,
   polyfill: false,
-  // mainPath:'users',
-  mfsu: {},
   hash: false,
 };

examples/boilerplate/config/config.ts

@@ -7,7 +7,7 @@ export default defineConfig({
   mobileLayout: true,
   legacyBuild: false,
   // mainPath:'users',
-  mfsu: {},
+  mfsu: false,
   hash: false,
   reactRouter5Compat: {},
   exportStatic: {},

examples/boilerplate/src/pages/index/index.less

@@ -1,6 +1,12 @@
 .title {
   font-size: 30px;
+  :global {
+    .adm-button{
+      font-size: 30px
+    }
+  }
 }
+
 .adm-button{
   font-size: 30px
 }

examples/boilerplate/src/pages/index/index.tsx

@@ -1,23 +1,25 @@
 import { Button } from 'antd-mobile';
 import React, { useState } from 'react';
 import styles from './index.less';
-export default (props) => {
-  console.log(props);
+export default () => {
   const [count, setCount] = useState(0);
   return (
-    <div className={styles['adm-button']}>
-      Hello 123
-      {Math.random()}
-      <Button
-        type="button"
-        color="primary"
-        fill="solid"
-        block
-        size="large"
-        onClick={() => setCount(count + 1)}
-      >
-        点我计数加1134 {count}
-      </Button>
-    </div>
+    <>
+      <div className={styles['adm-button']}>antd mobile</div>
+      <div className={styles['title']}>
+        Hello 123
+        {Math.random()}
+        <Button
+          type="button"
+          color="primary"
+          fill="solid"
+          block
+          size="large"
+          onClick={() => setCount(count + 1)}
+        >
+          点我计数加1134 {count}
+        </Button>
+      </div>
+    </>
   );
 };

examples/init-state/config/config.ts

@@ -0,0 +1,5 @@
+import { defineConfig } from 'alita';
+
+export default defineConfig({
+  initialState: {},
+});

examples/init-state/mock/app.ts

@@ -0,0 +1,5 @@
+export default {
+  '/api/hello': {
+    text: 'Alita',
+  },
+};

examples/init-state/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@examples/state",
+  "private": true,
+  "scripts": {
+    "dev": "alita dev",
+    "build": "ANALYZE=1 alita build",
+    "start": "npm run dev"
+  },
+  "dependencies": {
+    "alita": "3.2.6"
+  }
+}

examples/init-state/src/app.ts

@@ -0,0 +1,26 @@
+import { query } from '@/services/api';
+
+const middleware = async (ctx, next: () => void) => {
+  console.log(ctx);
+  // 可以在这写一些请求前做的事情 操作ctx.req
+  await next();
+
+  // 可以在这里对响应数据做一些操作 操作ctx.res
+};
+
+export const request = {
+  prefix: '/api',
+  method: 'get',
+  middlewares: [middleware],
+  errorHandler: (error) => {
+    // 集中处理错误
+    console.log(11111111);
+    console.log(error);
+  },
+};
+
+export async function getInitialState() {
+  const initialData = await query();
+  console.log(initialData);
+  return initialData;
+}

examples/init-state/src/pages/index.tsx

@@ -0,0 +1,7 @@
+import { useModel } from 'alita';
+
+export default () => {
+  const { initialState, loading, error, refresh, setInitialState } =
+    useModel('@@initialState');
+  return <>{JSON.stringify(initialState)}</>;
+};

examples/init-state/src/services/api.ts

@@ -0,0 +1,5 @@
+import { request } from '@@/plugin-request';
+
+export async function query(): Promise<any> {
+  return request('/hello');
+}

examples/init-state/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./src/.umi/tsconfig.json"
+}

examples/init-state/typings.d.ts

@@ -0,0 +1 @@
+import 'umi/typings';

package.json

@@ -52,8 +52,8 @@
     "@types/react-dom": "^18.0.5",
     "@types/resolve": "^1.20.2",
     "@types/rimraf": "3.0.2",
-    "@umijs/plugin-docs": "4.0.32",
-    "@umijs/utils": "4.0.32",
+    "@umijs/plugin-docs": "4.0.34",
+    "@umijs/utils": "4.0.34",
     "@vercel/ncc": "0.33.3",
     "all-contributors-cli": "^6.20.4",
     "core-js": "3.19.2",
@@ -83,7 +83,7 @@
     "turbo": "^1.3.1",
     "typescript": "^4.7.2",
     "uglify-js": "^3.15.4",
-    "umi": "4.0.32",
+    "umi": "4.0.34",
     "umi-scripts": "workspace:*",
     "yorkie": "^2.0.0",
     "zx": "^4.3.0"

packages/alita/package.json

@@ -47,13 +47,13 @@
     "@alita/types": "3.1.0",
     "@alita/native": "3.2.1",
     "@alita/plugins": "3.2.3",
-    "@umijs/core": "4.0.32",
-    "@umijs/bundler-webpack": "4.0.32",
-    "@umijs/babel-preset-umi": "4.0.32",
-    "@umijs/preset-umi": "4.0.32",
-    "@umijs/utils": "4.0.32",
+    "@umijs/core": "4.0.34",
+    "@umijs/bundler-webpack": "4.0.34",
+    "@umijs/babel-preset-umi": "4.0.34",
+    "@umijs/preset-umi": "4.0.34",
+    "@umijs/utils": "4.0.34",
     "qrcode-terminal": "^0.12.0",
-    "umi": "4.0.32",
+    "umi": "4.0.34",
     "v8-compile-cache": "^2.3.0",
     "eslint": "8.15.0",
     "stylelint": "14.8.2"

packages/alita/src/features/config/alitaconfig.ts

@@ -63,6 +63,12 @@ export default (api: IApi) => {
       ],
     };
   }
+  api.modifyAppData((memo) => {
+    memo.umi.name = 'Alita';
+    memo.umi.importSource = 'alita';
+    memo.umi.cliName = 'alita';
+    return memo;
+  });
   api.modifyConfig((memo: any) => {
     memo.alias.alita = 'umi';
     Object.keys(configDefaults).forEach((key) => {

packages/alita/src/preset.ts

@@ -49,7 +49,12 @@ export default (api: IApi) => {
 
   // 增加国际化需求
   if (api.userConfig.locale) {
-    plugins.push(require.resolve('@alita/plugins/dist/locale'));
+    plugins.push(require.resolve('@alita/plugins/dist/max/locale'));
+  }
+  // 增加初始化数据
+  if (api.userConfig.initialState) {
+    // initial-state 需要在 model 之前加载
+    plugins.unshift(require.resolve('@alita/plugins/dist/max/initial-state'));
   }
 
   // 记忆偏差修正，umi 中没有这个功能。

packages/native/package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@alita/types": "3.1.0",
-    "@umijs/utils": "4.0.32"
+    "@umijs/utils": "4.0.34"
   },
   "license": "MIT"
 }

packages/plugin-lowcode/package.json

@@ -28,6 +28,6 @@
   },
   "dependencies": {
     "@alita/types": "3.1.0",
-    "@umijs/utils": "4.0.32"
+    "@umijs/utils": "4.0.34"
   }
 }

packages/plugins/package.json

@@ -33,9 +33,9 @@
     "@alita/inspx": "0.0.2",
     "@alita/request": "3.1.0",
     "@alita/types": "3.1.0",
-    "@umijs/bundler-utils": "4.0.32",
-    "@umijs/plugins": "4.0.32",
-    "@umijs/utils": "4.0.32",
+    "@umijs/bundler-utils": "4.0.34",
+    "@umijs/plugins": "4.0.34",
+    "@umijs/utils": "4.0.34",
     "ahooks": "^3.0.8",
     "antd-mobile-alita": "^2.3.4",
     "antd-mobile-icons": "^0.2.2",

packages/plugins/src/aconsole.ts

@@ -39,7 +39,7 @@ export default (api: AlitaApi) => {
   });
 
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using AConsole Plugin');

packages/plugins/src/antd.ts

@@ -48,7 +48,7 @@ export default (api: AlitaApi) => {
   });
 
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.modifyAppData((memo) => {
     const version = require(`${pkgPath}/package.json`).version;

packages/plugins/src/antdmobile.ts

@@ -12,7 +12,7 @@ import { checkAntdMobile } from './utils/checkAntdMobile';
  */
 export default (api: AlitaApi) => {
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using Antd Mobile Plugin');

packages/plugins/src/classnames.ts

@@ -5,7 +5,7 @@ import { dirname } from 'path';
 
 export default (api: AlitaApi) => {
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using ClassNames Plugin');

packages/plugins/src/dva.ts

@@ -33,7 +33,7 @@ export default (api: AlitaApi) => {
   api.addRuntimePluginKey(() => ['dva']);
 
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using Dva Plugin');

packages/plugins/src/hd.ts

@@ -26,7 +26,7 @@ export default (api: AlitaApi) => {
     enableBy,
   });
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using HD Plugin');
@@ -44,7 +44,7 @@ export default (api: AlitaApi) => {
       px2rem({
         rootValue: 100,
         minPixelValue: 2,
-        selectorDoubleRemList: [/.adm-/, /.ant-/, /\:root/],
+        selectorDoubleRemList: [/^.adm-/, /^.ant-/, /^\:root/],
         ...(configPx2rem || {}),
       }),
     ];

packages/plugins/src/keepalive.ts

@@ -26,7 +26,7 @@ export default (api: AlitaApi) => {
   api.addRuntimePluginKey(() => 'getKeepAlive');
 
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using KeepAlive Plugin');

packages/plugins/src/mainpath.ts

@@ -14,7 +14,7 @@ export default (api: AlitaApi) => {
     enableBy: api.EnableBy.config,
   });
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using Main Path Plugin');

packages/plugins/src/max/initial-state.ts

@@ -0,0 +1,12 @@
+import type { AlitaApi } from '@alita/types';
+import statePlugin from '@umijs/plugins/dist/initial-state';
+import { logger } from '@umijs/utils';
+
+export default (api: AlitaApi) => {
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
+
+  api.onStart(() => {
+    logger.info('Using Initial State Plugin');
+  });
+  statePlugin(api);
+};

packages/plugins/src/max/locale.ts

@@ -0,0 +1,13 @@
+import type { AlitaApi } from '@alita/types';
+import localePlugin from '@umijs/plugins/dist/locale';
+import { logger } from '@umijs/utils';
+
+export default (api: AlitaApi) => {
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
+
+  api.onStart(() => {
+    logger.info('Using Locale Plugin');
+  });
+
+  localePlugin(api);
+};

packages/plugins/src/mobile-layout.ts

@@ -25,7 +25,7 @@ export default (api: AlitaApi) => {
   // 注册runtime配置
   api.addRuntimePluginKey(() => ['mobileLayout']);
   // only dev or build running
-  if (!['dev', 'build'].includes(api.name)) return;
+  if (!['dev', 'build', 'dev-config'].includes(api.name)) return;
 
   api.onStart(() => {
     logger.info('Using Mobile Layout Plugin');