feat: support ssr

feat: support ssr

package.json

@@ -50,7 +50,6 @@
     "npm-run-all": "^4.1.5",
     "open": "^8.0.2",
     "prettier": "2.2.1",
-    "umi": "3.4.15",
     "husky": "6.0.0",
     "yorkie": "^2.0.0"
   }

packages/aconsole/package.json

@@ -24,9 +24,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "peerDependencies": {
-    "umi": "3.x"
-  },
   "dependencies": {
     "@alitajs/inspx": "0.0.2",
     "vconsole": "3.5.2"

packages/alita/.fatherrc.ts

@@ -0,0 +1,6 @@
+export default {
+  cjs: { type: 'babel', lazy: true },
+  esm: { type: 'rollup' },
+  disableTypeCheck: false,
+  extraExternals: ['@@/core/umiExports'],
+};

packages/alita/package.json

@@ -2,19 +2,17 @@
   "name": "alita",
   "version": "2.8.15",
   "description": "alita",
-  "main": "index.js",
-  "module": "index.esm.js",
+  "main": "lib/index.js",
+  "module": "dist/index.esm.js",
   "types": "types.d.ts",
   "bin": {
     "alita": "./bin/alita.js"
   },
   "files": [
     "bin",
     "lib",
-    "src",
     "dist",
-    "types.d.ts",
-    "index.esm.js"
+    "types.d.ts"
   ],
   "repository": {
     "type": "git",
@@ -35,6 +33,6 @@
   },
   "dependencies": {
     "@alitajs/umi-presets-alita": "2.8.15",
-    "umi": "3.4.15"
+    "umi": "3.5.17"
   }
 }

packages/alita/src/index.ts

@@ -0,0 +1,3 @@
+export * from 'umi';
+// @ts-ignore
+export * from '@@/core/umiExports';

packages/alita/tsconfig.json

@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "esnext",
+    "moduleResolution": "node",
+    "jsx": "preserve",
+    "skipLibCheck": true,
+    "allowJs": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "declaration": true
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "**/*.spec.ts",
+    "lib",
+    "fixtures",
+    "bin",
+    "examples"
+  ]
+}

packages/hd/package.json

@@ -21,9 +21,6 @@
   "license": "MIT",
   "bugs": "http://github.com/alitajs/alita/issues",
   "homepage": "https://github.com/alitajs/alita/tree/master/packages/hd#readme",
-  "peerDependencies": {
-    "umi": "3.x"
-  },
   "publishConfig": {
     "access": "public"
   },

packages/keep-alive/src/index.ts

@@ -54,11 +54,11 @@ export default (api: IApi) => {
 
   api.addUmiExports(() => [
     {
-      exportAll: true,
+      specifiers: ['KeepAliveLayout'],
       source: `../${RELATIVE_MODEL}`,
     },
     {
-      exportAll: true,
+      specifiers: ['setLayoutInstance', 'getLayoutInstance', 'dropByCacheKey'],
       source: `../${join(DIR_NAME, 'KeepAliveModel')}`,
     },
   ]);

packages/layout/package.json

@@ -25,6 +25,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@alitajs/alita-layout": "2.4.7"
+    "@alitajs/alita-layout": "2.4.8"
   }
 }

packages/layout/src/exports.tpl

@@ -0,0 +1 @@
+export { getPageNavBar, setPageNavBar, setTabBarList, getTabBarList, layoutEmitter } from './layoutState';

packages/layout/src/index.ts

@@ -1,7 +1,10 @@
 import { IApi, utils } from 'umi';
 import { join } from 'path';
+import { readFileSync } from 'fs';
 import getLayoutContent from './utils/getLayoutContent';
+import getLayout from './utils/getLayout';
 import getModelContent from './utils/getModelContent';
+const { Mustache } = utils;
 
 const DIR_NAME = 'alita-layout';
 const MODEL_NAME = 'layoutState';
@@ -27,10 +30,16 @@ export default (api: IApi) => {
   api.addRuntimePluginKey(() => 'mobileLayout');
 
   api.onGenerateFiles(() => {
+    api.writeTmpFile({
+      path: join(DIR_NAME, 'Layout.tsx'),
+      content: getLayout(),
+    });
     api.writeTmpFile({
       path: join(DIR_NAME, 'AlitaLayout.tsx'),
       content: getLayoutContent(
-        utils.winPath(join(__dirname, './layout/index.js')),
+        utils.winPath(
+          join(api.paths.absTmpPath || '', DIR_NAME, 'Layout.tsx'),
+        ),
         !!api.userConfig.keepalive,
         isMicroApp
       ),
@@ -39,6 +48,12 @@ export default (api: IApi) => {
       path: RELATIVE_MODEL_PATH,
       content: getModelContent(),
     });
+    const exportsTpl = readFileSync(join(__dirname, 'exports.tpl'), 'utf-8');
+
+    api.writeTmpFile({
+      path: 'alita-layout/exports.ts',
+      content: exportsTpl,
+    });
   });
 
   api.modifyRoutes((routes) => [
@@ -54,7 +69,7 @@ export default (api: IApi) => {
   api.addUmiExports(() => [
     {
       exportAll: true,
-      source: `../${RELATIVE_MODEL}`,
+      source: '../alita-layout/exports',
     },
     {
       exportAll: true,

packages/layout/src/layout/index.tsx → packages/layout/src/utils/getLayout.tsx

@@ -1,14 +1,15 @@
-import React, { useEffect, useState } from 'react';
+export default (
+) => `import React, { useEffect, useState } from 'react';
 import { Location, LocationState } from 'history';
-// @ts-ignore
+// eslint-disable-next-line
 import {
   getPageNavBar,
   KeepAliveLayout,
   getTabBarList,
   layoutEmitter,
   request,
   RequestMethodInUmi
-} from 'umi';
+} from '@@/core/umiExports';
 
 import AlitaLayout, {
   AlitaLayoutProps,
@@ -93,7 +94,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
       prevPathName = props.location.pathname;
     }, 10);
   }, [props.location.pathname]);
-  layoutEmitter.useSubscription(() => {
+  layoutEmitter?.useSubscription?.(() => {
     setPageNavBar(getPageNavBar());
     setTabBarList(getTabBarList());
   });
@@ -117,3 +118,4 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
 };
 
 export default BasicLayout;
+`;

packages/plugin-dva/package.json

@@ -21,9 +21,6 @@
   "license": "MIT",
   "bugs": "http://github.com/umijs/plugins/issues",
   "homepage": "https://github.com/umijs/plugins/tree/master/packages/plugin-dva#readme",
-  "peerDependencies": {
-    "umi": "3.x"
-  },
   "publishConfig": {
     "access": "public"
   },

packages/plugin-dva/src/index.ts

@@ -185,11 +185,12 @@ app.model({ namespace: '${basename(path, extname(path))}', ...Model${lodash.uppe
           dvaHeadExport: api.config.dva?.disableModelsReExport
             ? ``
             : models
-                .map((path) => {
-                  // prettier-ignore
-                  return `export * from '${winPath(path)}';`;
-                })
-                .join('\r\n'),
+              .map((path) => {
+                // prettier-ignore
+                // export type { IndexModelState } from '/Users/xiaohuoni/next-alita-app/src/models';
+                return `export type { ${basename(path, extname(path)).toLowerCase().replace(/( |^)[a-z]/g, (L) => L.toUpperCase())}ModelState } from '${winPath(path)}';`;
+              })
+              .join('\r\n'),
           dvaLoadingModels: models
             .map((path) => {
               // prettier-ignore
@@ -236,15 +237,15 @@ app.model({ namespace: '${basename(path, extname(path))}', ...Model${lodash.uppe
   api.addUmiExports(() =>
     hasModels
       ? [
-          {
-            exportAll: true,
-            source: '../plugin-dva/exports',
-          },
-          {
-            exportAll: true,
-            source: '../plugin-dva/connect',
-          },
-        ]
+        {
+          exportAll: true,
+          source: '../plugin-dva/exports',
+        },
+        {
+          exportAll: true,
+          source: '../plugin-dva/connect',
+        },
+      ]
       : [],
   );
 

packages/plugin-layout/package.json

@@ -29,8 +29,7 @@
     "@ant-design/pro-layout": "^5.0.0",
     "@umijs/plugin-initial-state": "2.x",
     "@umijs/plugin-locale": "0.x",
-    "@umijs/plugin-model": "2.x",
-    "umi": "3.x"
+    "@umijs/plugin-model": "2.x"
   },
   "publishConfig": {
     "access": "public"