@morningfast/create-ui 0.0.8 → 0.0.9

package/dist/index.js

@@ -809,9 +809,9 @@ async function customizeAppTemplate(appRoot, variables) {
   if (!variables.keepDemo) {
     await rm(path.join(appRoot, "src", "pages", "demo"), { recursive: true, force: true });
     await rm(path.join(appRoot, "src", "micro-apps", "demo-apps.ts"), { force: true });
-    await removeDemoRoute(path.join(appRoot, "src", "router", "mock-routes.ts"));
-    await removeSubAppDemoMockRoute(path.join(appRoot, "src", "router", "mock-routes.ts"));
-    await removeSubAppDemoRoute(path.join(appRoot, "src", "router", "index.ts"));
+    await rm(path.join(appRoot, "src", "router", "mock-routes.ts"), { force: true });
+    await removeDemoRoute(path.join(appRoot, "src", "router", "business-routes.ts"));
+    await removeSubAppDemoRedirect(path.join(appRoot, "src", "router", "index.ts"));
     await removeMainAppDemoSetup(path.join(appRoot, "src", "setup.ts"));
   }
 }
@@ -882,9 +882,7 @@ async function removeDemoRoute(filePath) {
     return;
   }
   const source = await readFile(filePath, "utf8");
-  let updated = removeRouteObject(source, "path: 'demo'");
-  updated = removeRouteObject(updated, "path: 'micro'");
-  updated = updated.replace(/\n\s+'demo-user-management': \(\) => import\('@\/pages\/demo\/user-management\/index\.vue'\),/g, "").replace(/\n\s+'demo-mapping-config': \(\) => import\('@\/pages\/demo\/mapping-config\/index\.vue'\),/g, "").replace(/\n\s+'demo-table-page': \(\) => import\('@\/pages\/demo\/table-page-demo\/index\.vue'\),/g, "").replace(/\n\s+'demo-upload': \(\) => import\('@\/pages\/demo\/upload-demo\/index\.vue'\),/g, "");
+  const updated = source.replace(/\nimport \{ mockComponentMap, mockRouteItems \} from '\.\/mock-routes';?\n/, "\n").replace(/\n\s+\.\.\.mockRouteItems,/g, "").replace(/\n\s+\.\.\.mockComponentMap,/g, "").replace(/\n{3,}/g, "\n\n");
   if (updated !== source) {
     await writeFile(filePath, updated, "utf8");
   }
@@ -894,45 +892,15 @@ async function removeMainAppDemoSetup(filePath) {
     return;
   }
   const source = await readFile(filePath, "utf8");
-  const updated = source.replace(/\nimport \{ setDefaultAppConfigs \} from '@morningfast\/platform\/main\/micro-apps\/config';\n/, "\n").replace(/\nimport \{ demoAppConfigs \} from '\.\/micro-apps\/demo-apps';\n/, "\n").replace(/\n\s+setDefaultAppConfigs\(demoAppConfigs\);\n/, "\n").replace(/\n{3,}/g, "\n\n").replace(/\{\n\n\s+\/\//g, "{\n  //");
+  const updated = source.replace(
+    /import \{ setDefaultAppConfigs, type MountMorningfastAppContext \} from '@morningfast\/platform\/main';\n/,
+    "import type { MountMorningfastAppContext } from '@morningfast/platform/main';\n"
+  ).replace(/\nimport \{ setDefaultAppConfigs \} from '@morningfast\/platform\/main\/micro-apps\/config';\n/, "\n").replace(/\nimport \{ demoAppConfigs \} from '\.\/micro-apps\/demo-apps';\n/, "\n").replace(/\n\s+setDefaultAppConfigs\(demoAppConfigs\);\n/, "\n").replace(/\n{3,}/g, "\n\n").replace(/\{\n\n\s+\/\//g, "{\n  //");
   if (updated !== source) {
     await writeFile(filePath, updated, "utf8");
   }
 }
-function removeRouteObject(source, marker) {
-  const markerIndex = source.indexOf(marker);
-  if (markerIndex < 0) {
-    return source;
-  }
-  const objectStart = source.lastIndexOf("  {", markerIndex);
-  if (objectStart < 0) {
-    return source;
-  }
-  let index = objectStart;
-  let depth = 0;
-  let objectEnd = -1;
-  for (; index < source.length; index += 1) {
-    const char = source[index];
-    if (char === "{") {
-      depth += 1;
-    } else if (char === "}") {
-      depth -= 1;
-      if (depth === 0) {
-        objectEnd = index + 1;
-        break;
-      }
-    }
-  }
-  if (objectEnd < 0) {
-    return source;
-  }
-  const trailingCommaEnd = source.slice(objectEnd).match(/^,\n?/)?.[0].length ?? 0;
-  const leadingCommaStart = trailingCommaEnd ? objectStart : source.lastIndexOf(",", objectStart);
-  const removeStart = leadingCommaStart >= 0 && source.slice(leadingCommaStart, objectStart).trim() === "" ? leadingCommaStart : objectStart;
-  const removeEnd = objectEnd + trailingCommaEnd;
-  return source.slice(0, removeStart) + source.slice(removeEnd);
-}
-async function removeSubAppDemoRoute(filePath) {
+async function removeSubAppDemoRedirect(filePath) {
   if (!existsSync(filePath)) {
     return;
   }
@@ -940,25 +908,11 @@ async function removeSubAppDemoRoute(filePath) {
   const updated = source.replace(
     /\n\s+\{\n\s+path: '\/orders',\n\s+redirect: '\/demo\/orders',\n\s+\},/g,
     ""
-  ).replace(
-    /\n\s+\{\n\s+path: '\/demo\/orders',\n\s+name: 'demo-orders',\n\s+component: \(\) => import\('@\/pages\/demo\/orders\/index\.vue'\),\n\s+meta: \{\n\s+title: '订单管理',\n\s+\},\n\s+\},/g,
-    ""
   );
   if (updated !== source) {
     await writeFile(filePath, updated, "utf8");
   }
 }
-async function removeSubAppDemoMockRoute(filePath) {
-  if (!existsSync(filePath)) {
-    return;
-  }
-  const source = await readFile(filePath, "utf8");
-  let updated = removeRouteObject(source, "path: '/demo/orders'");
-  updated = updated.replace(/\n\s+'demo-orders': \(\) => import\('@\/pages\/demo\/orders\/index\.vue'\),/g, "");
-  if (updated !== source) {
-    await writeFile(filePath, updated, "utf8");
-  }
-}
 async function replaceText(filePath, searchValue, replaceValue) {
   if (!existsSync(filePath)) {
     return;

package/dist/templates/main-app/README.md

@@ -82,7 +82,7 @@ pnpm --filter __MORNINGFAST_SUB_APP_DIR__ dev
 4. 保存后刷新主应用。
 5. 通过主应用菜单进入该子应用路径。
 
-子应用菜单路由复用同一个平台承载页，不需要为每个子应用新增 `componentKey` 或组件映射。完全新增一个子应用菜单时，在 `src/router/mock-routes.ts` 里写 `microApp: true` 即可：
+子应用菜单路由复用同一个平台承载页，不需要为每个子应用新增 `componentKey` 或组件映射。完全新增一个子应用菜单时，在 `src/router/business-routes.ts` 里写 `microApp: true` 即可：
 
 ```ts
 {

package/dist/templates/main-app/package.json

@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
-    "@morningfast/platform": "^0.0.8",
+    "@morningfast/platform": "^0.0.9",
     "axios": "^1.16.0",
     "element-plus": "^2.14.0",
     "localforage": "^1.10.0",

package/dist/templates/main-app/src/micro-apps/demo-apps.ts

@@ -1,4 +1,4 @@
-import type { AppConfigItem } from '@morningfast/platform/main/micro-apps/config';
+import type { AppConfigItem } from '@morningfast/platform/main';
 
 export const demoAppConfigs: AppConfigItem[] = [
   {

package/dist/templates/main-app/src/router/business-routes.ts

@@ -1,3 +1,22 @@
-import { createRoutesFromMock } from './mock-routes';
+import type { RouteRecordRaw } from 'vue-router';
+import { createRoutesFromItems, type AppRouteItem } from '@morningfast/platform/main';
 
-export const businessRoutes = createRoutesFromMock();
+import { mockComponentMap, mockRouteItems } from './mock-routes';
+
+export const businessRouteItems: AppRouteItem[] = [
+  {
+    path: 'dashboard',
+    name: 'dashboard',
+    title: '首页',
+    icon: 'House',
+    componentKey: 'dashboard',
+  },
+  ...mockRouteItems,
+];
+
+const componentMap: Record<string, RouteRecordRaw['component']> = {
+  dashboard: () => import('@/pages/dashboard/Workplace.vue'),
+  ...mockComponentMap,
+};
+
+export const businessRoutes = createRoutesFromItems(businessRouteItems, componentMap);

package/dist/templates/main-app/src/router/mock-routes.ts

@@ -1,36 +1,7 @@
 import type { RouteRecordRaw } from 'vue-router';
-import { MicroAppView } from '@morningfast/platform/main';
+import type { AppRouteItem } from '@morningfast/platform/main';
 
-export interface MockRouteItem {
-  path: string;
-  name: string;
-  title: string;
-  icon?: string;
-  permission?: string;
-  hidden?: boolean;
-  redirect?: string;
-  componentKey?: string;
-  microApp?: boolean;
-  children?: MockRouteItem[];
-}
-
-type MutableRouteRecord = {
-  path: string;
-  name: string;
-  redirect?: string;
-  component?: RouteRecordRaw['component'];
-  children?: RouteRecordRaw[];
-  meta: NonNullable<RouteRecordRaw['meta']>;
-};
-
-export const mockRouteItems: MockRouteItem[] = [
-  {
-    path: 'dashboard',
-    name: 'dashboard',
-    title: '首页',
-    icon: 'House',
-    componentKey: 'dashboard',
-  },
+export const mockRouteItems: AppRouteItem[] = [
   {
     path: 'demo',
     name: 'demo',
@@ -87,53 +58,11 @@ export const mockRouteItems: MockRouteItem[] = [
       },
     ],
   },
-      {
-        path: 'micro2/sub-app-2/demo/orders',
-        name: 'micro2-sub-app2-demo-orders',
-        title: '订单管理',
-        microApp: true,
-      },
 ];
 
-const componentMap: Record<string, RouteRecordRaw['component']> = {
-  dashboard: () => import('@/pages/dashboard/Workplace.vue'),
+export const mockComponentMap: Record<string, RouteRecordRaw['component']> = {
   'demo-user-management': () => import('@/pages/demo/user-management/index.vue'),
   'demo-mapping-config': () => import('@/pages/demo/mapping-config/index.vue'),
   'demo-table-page': () => import('@/pages/demo/table-page-demo/index.vue'),
   'demo-upload': () => import('@/pages/demo/upload-demo/index.vue'),
 };
-
-export function createRoutesFromMock(items = mockRouteItems): RouteRecordRaw[] {
-  return items.map(createRouteFromMock);
-}
-
-function createRouteFromMock(item: MockRouteItem): RouteRecordRaw {
-  const route: MutableRouteRecord = {
-    path: item.path,
-    name: item.name,
-    meta: {
-      title: item.title,
-      icon: item.icon,
-      permission: item.permission,
-      hidden: item.hidden,
-    },
-  };
-
-  if (item.redirect) {
-    route.redirect = item.redirect;
-  }
-
-  if (item.componentKey) {
-    route.component = componentMap[item.componentKey];
-  }
-
-  if (item.microApp) {
-    route.component = MicroAppView;
-  }
-
-  if (item.children?.length) {
-    route.children = createRoutesFromMock(item.children);
-  }
-
-  return route as RouteRecordRaw;
-}

package/dist/templates/main-app/src/setup.ts

@@ -1,5 +1,4 @@
-import type { MountMorningfastAppContext } from '@morningfast/platform/main';
-import { setDefaultAppConfigs } from '@morningfast/platform/main/micro-apps/config';
+import { setDefaultAppConfigs, type MountMorningfastAppContext } from '@morningfast/platform/main';
 
 import { demoAppConfigs } from './micro-apps/demo-apps';
 

package/dist/templates/sub-app/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
-    "@morningfast/platform": "^0.0.8",
+    "@morningfast/platform": "^0.0.9",
     "@types/sortablejs": "^1.15.9",
     "@vitejs/plugin-vue": "^6.0.6",
     "element-plus": "^2.14.0",

package/dist/templates/sub-app/src/router/business-routes.ts

@@ -0,0 +1,21 @@
+import type { RouteRecordRaw } from 'vue-router'
+import { createRoutesFromItems, type RouteItem } from '@morningfast/platform/sub'
+
+import { mockComponentMap, mockRouteItems } from './mock-routes'
+
+export const businessRouteItems: RouteItem[] = [
+  {
+    path: '/home',
+    name: 'home',
+    title: '工作台',
+    componentKey: 'home',
+  },
+  ...mockRouteItems,
+]
+
+const componentMap: Record<string, RouteRecordRaw['component']> = {
+  home: () => import('@/pages/home/index.vue'),
+  ...mockComponentMap,
+}
+
+export const businessRoutes = createRoutesFromItems(businessRouteItems, componentMap)

package/dist/templates/sub-app/src/router/index.ts

@@ -1,6 +1,6 @@
 import type { RouteRecordRaw } from 'vue-router'
 
-import { createRoutesFromMock } from './mock-routes'
+import { businessRoutes } from './business-routes'
 
 export const routes: RouteRecordRaw[] = [
   {
@@ -11,7 +11,7 @@ export const routes: RouteRecordRaw[] = [
     path: '/orders',
     redirect: '/demo/orders',
   },
-  ...createRoutesFromMock(),
+  ...businessRoutes,
   {
     path: '/403',
     name: 'forbidden',

package/dist/templates/sub-app/src/router/mock-routes.ts

@@ -1,19 +1,7 @@
 import type { RouteRecordRaw } from 'vue-router'
+import type { RouteItem } from '@morningfast/platform/sub'
 
-export interface MockRouteItem {
-  path: string
-  name: string
-  title: string
-  componentKey: string
-}
-
-export const mockRouteItems: MockRouteItem[] = [
-  {
-    path: '/home',
-    name: 'home',
-    title: '工作台',
-    componentKey: 'home',
-  },
+export const mockRouteItems: RouteItem[] = [
   {
     path: '/demo/orders',
     name: 'demo-orders',
@@ -22,30 +10,6 @@ export const mockRouteItems: MockRouteItem[] = [
   },
 ]
 
-const componentMap: Record<string, RouteRecordRaw['component']> = {
-  home: () => import('@/pages/home/index.vue'),
+export const mockComponentMap: Record<string, RouteRecordRaw['component']> = {
   'demo-orders': () => import('@/pages/demo/orders/index.vue'),
 }
-
-export function createRoutesFromMock(items = mockRouteItems): RouteRecordRaw[] {
-  const routes: RouteRecordRaw[] = []
-
-  items.forEach((item) => {
-    const component = componentMap[item.componentKey]
-
-    if (!component) {
-      return
-    }
-
-    routes.push({
-      path: item.path,
-      name: item.name,
-      component,
-      meta: {
-        title: item.title,
-      },
-    })
-  })
-
-  return routes
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morningfast/create-ui",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Morningfast UI internal system scaffold CLI.",
   "bin": {
     "create-morningfast-ui": "dist/index.js"