refactor(project): @vben/vite-connect is reconfigured to support synchronization

anncwb · anncwb · commit e441d14fa29c · 2024-07-13T21:13:42.000+08:00
diff --git a/apps/backend-mock/package.json b/apps/backend-mock/package.json
@@ -26,6 +26,7 @@
     "cross-env": "^7.0.3",
     "joi": "^17.13.3",
     "js-yaml": "^4.1.0",
+    "mockjs": "^1.1.0",
     "passport": "^0.7.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
@@ -36,6 +37,7 @@
     "@nestjs/cli": "^10.4.2",
     "@nestjs/schematics": "^10.1.2",
     "@types/express": "^4.17.21",
+    "@types/mockjs": "^1.0.10",
     "@types/node": "^20.14.10",
     "nodemon": "^3.1.4",
     "ts-node": "^10.9.2",
diff --git a/apps/web-antd/.env b/apps/web-antd/.env
@@ -1,3 +1,5 @@
+VITE_PORT = 5555
+
 # spa-title
 VITE_GLOB_APP_TITLE = Vben Admin Pro
 
diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@vben/web-antd",
   "version": "5.0.0",
-  "homepage": "https://github.com/vbenjs/vue-vben-admin",
+  "homepage": "https://vben.pro",
   "bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vbenjs/vue-vben-admin.git",
-    "directory": "apps/vben-admin"
+    "directory": "apps/web-antd"
   },
   "license": "MIT",
   "author": {
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
@@ -1,59 +1,33 @@
-import { defineConfig, loadAndConvertEnv } from '@vben/vite-config';
+import {
+  defaultImportmapOptions,
+  defineConfig,
+  getDefaultPwaOptions,
+  loadAndConvertEnv,
+} from '@vben/vite-config';
 
-export default defineConfig({
-  application: async ({ mode }) => {
-    const envConfig = await loadAndConvertEnv();
-
-    return {
+export default defineConfig(async () => {
+  const { appTitle, port, ...envConfig } = await loadAndConvertEnv();
+  return {
+    application: {
       ...envConfig,
       importmap: false,
-      importmapOptions: {
-        // 通过 Importmap CDN 方式引入,
-        // 目前只有esm.sh源兼容性好一点，jspm.io对于 esm 入口要求高
-        defaultProvider: 'esm.sh',
-        importmap: [
-          { name: 'vue' },
-          { name: 'pinia' },
-          { name: 'vue-router' },
-          { name: 'vue-i18n' },
-          { name: 'dayjs' },
-          { name: 'vue-demi' },
-        ],
-      },
+      importmapOptions: defaultImportmapOptions,
       pwa: false,
-      pwaOptions: {
-        manifest: {
-          description:
-            'Vben Admin Pro is a modern admin dashboard template based on Vue 3. ',
-          icons: [
-            {
-              sizes: '192x192',
-              src: 'https://cdn.jsdelivr.net/npm/@vbenjs/static-source@0.1.3/source/pwa-icon-192.png',
-              type: 'image/png',
-            },
-            {
-              sizes: '512x512',
-              src: 'https://cdn.jsdelivr.net/npm/@vbenjs/static-source@0.1.3/source/pwa-icon-512.png',
-              type: 'image/png',
-            },
-          ],
-          name: `Vben Admin Pro ${mode}`,
-          short_name: `Vben Admin Pro ${mode}`,
-        },
-      },
-    };
-  },
-  vite: {
-    server: {
-      proxy: {
-        '/api': {
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/api/, ''),
-          // 代理目标地址 - backend-mock 项目
-          target: 'http://localhost:5320/api',
-          ws: true,
+      pwaOptions: getDefaultPwaOptions(appTitle),
+    },
+    vite: {
+      server: {
+        port,
+        proxy: {
+          '/api': {
+            changeOrigin: true,
+            rewrite: (path) => path.replace(/^\/api/, ''),
+            // 代理目标地址 - backend-mock 项目
+            target: 'http://localhost:5320/api',
+            ws: true,
+          },
         },
       },
     },
-  },
+  };
 });
diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts
@@ -7,10 +7,11 @@ import { defineConfig, loadEnv, mergeConfig } from 'vite';
 import { loadApplicationPlugins } from '../plugins';
 import { getCommonConfig } from './common';
 
-function defineApplicationConfig(options: DefineApplicationOptions = {}) {
+function defineApplicationConfig(userConfigPromise: DefineApplicationOptions) {
   return defineConfig(async (config) => {
+    const options = await userConfigPromise?.(config);
     const { command, mode } = config;
-    const { application = {}, vite = {} } = options;
+    const { application = {}, vite = {} } = options || {};
     const root = process.cwd();
     const isBuild = command === 'build';
     const env = loadEnv(mode, root);
@@ -30,9 +31,7 @@ function defineApplicationConfig(options: DefineApplicationOptions = {}) {
       mode,
       pwa: true,
       turboConsole: false,
-      ...(typeof application === 'function'
-        ? await application(config)
-        : application),
+      ...application,
     });
 
     const applicationConfig: UserConfig = {
@@ -69,10 +68,7 @@ function defineApplicationConfig(options: DefineApplicationOptions = {}) {
       await getCommonConfig(),
       applicationConfig,
     );
-    return mergeConfig(
-      mergedConfig,
-      typeof vite === 'function' ? await vite(config) : vite,
-    );
+    return mergeConfig(mergedConfig, vite);
   });
 }
 
diff --git a/internal/vite-config/src/config/index.ts b/internal/vite-config/src/config/index.ts
@@ -9,9 +9,10 @@ import { defineLibraryConfig } from './library';
 export * from './application';
 export * from './library';
 
-function defineConfig(options: DefineConfig = {}) {
-  const { type = 'auto', ...defineOptions } = options;
-
+function defineConfig(
+  userConfigPromise?: DefineConfig,
+  type: 'application' | 'auto' | 'library' = 'auto',
+) {
   let projectType = type;
 
   // 根据包是否存在 index.html,自动判断类型
@@ -22,10 +23,10 @@ function defineConfig(options: DefineConfig = {}) {
 
   switch (projectType) {
     case 'application': {
-      return defineApplicationConfig(defineOptions);
+      return defineApplicationConfig(userConfigPromise);
     }
     case 'library': {
-      return defineLibraryConfig(defineOptions);
+      return defineLibraryConfig(userConfigPromise);
     }
     default: {
       throw new Error(`Unsupported project type: ${projectType}`);
diff --git a/internal/vite-config/src/config/library.ts b/internal/vite-config/src/config/library.ts
@@ -1,4 +1,4 @@
-import type { UserConfig } from 'vite';
+import type { ConfigEnv, UserConfig } from 'vite';
 
 import type { DefineLibraryOptions } from '../typing';
 
@@ -9,11 +9,12 @@ import { defineConfig, mergeConfig } from 'vite';
 import { loadLibraryPlugins } from '../plugins';
 import { getCommonConfig } from './common';
 
-function defineLibraryConfig(options: DefineLibraryOptions = {}) {
-  return defineConfig(async (config) => {
+function defineLibraryConfig(userConfigPromise: DefineLibraryOptions) {
+  return defineConfig(async (config: ConfigEnv) => {
+    const options = await userConfigPromise?.(config);
     const { command, mode } = config;
     const root = process.cwd();
-    const { library = {}, vite = {} } = options;
+    const { library = {}, vite = {} } = options || {};
     const isBuild = command === 'build';
 
     const plugins = await loadLibraryPlugins({
@@ -22,7 +23,7 @@ function defineLibraryConfig(options: DefineLibraryOptions = {}) {
       injectMetadata: true,
       isBuild,
       mode,
-      ...(typeof library === 'function' ? await library(config) : library),
+      ...library,
     });
 
     const { dependencies = {}, peerDependencies = {} } =
@@ -52,10 +53,7 @@ function defineLibraryConfig(options: DefineLibraryOptions = {}) {
     };
     const commonConfig = await getCommonConfig();
     const mergedConfig = mergeConfig(commonConfig, packageConfig);
-    return mergeConfig(
-      mergedConfig,
-      typeof vite === 'function' ? await vite(config) : vite,
-    );
+    return mergeConfig(mergedConfig, vite);
   });
 }
 
diff --git a/internal/vite-config/src/index.ts b/internal/vite-config/src/index.ts
@@ -1,3 +1,4 @@
 export * from './config';
+export * from './options';
 export * from './plugins';
 export { loadAndConvertEnv } from './utils/env';
diff --git a/internal/vite-config/src/options.ts b/internal/vite-config/src/options.ts
@@ -0,0 +1,42 @@
+import type { Options as PwaPluginOptions } from 'vite-plugin-pwa';
+
+import type { ImportmapPluginOptions } from './typing';
+
+const isDevelopment = process.env.NODE_ENV === 'development';
+
+const getDefaultPwaOptions = (name: string): Partial<PwaPluginOptions> => ({
+  manifest: {
+    description:
+      'Vben Admin Pro is a modern admin dashboard template based on Vue 3. ',
+    icons: [
+      {
+        sizes: '192x192',
+        src: 'https://cdn.jsdelivr.net/npm/@vbenjs/static-source@0.1.3/source/pwa-icon-192.png',
+        type: 'image/png',
+      },
+      {
+        sizes: '512x512',
+        src: 'https://cdn.jsdelivr.net/npm/@vbenjs/static-source@0.1.3/source/pwa-icon-512.png',
+        type: 'image/png',
+      },
+    ],
+    name: `${name}o${isDevelopment ? ' dev' : ''}`,
+    short_name: `${name}${isDevelopment ? ' dev' : ''}`,
+  },
+});
+
+const defaultImportmapOptions: ImportmapPluginOptions = {
+  // 通过 Importmap CDN 方式引入,
+  // 目前只有esm.sh源兼容性好一点，jspm.io对于 esm 入口要求高
+  defaultProvider: 'esm.sh',
+  importmap: [
+    { name: 'vue' },
+    { name: 'pinia' },
+    { name: 'vue-router' },
+    { name: 'vue-i18n' },
+    { name: 'dayjs' },
+    { name: 'vue-demi' },
+  ],
+};
+
+export { defaultImportmapOptions, getDefaultPwaOptions };
diff --git a/internal/vite-config/src/plugins/inject-metadata.ts b/internal/vite-config/src/plugins/inject-metadata.ts
@@ -44,7 +44,7 @@ async function resolveMonorepoDependencies() {
 async function viteMetadataPlugin(
   root = process.cwd(),
 ): Promise<PluginOption | undefined> {
-  const { author, description, homepage, license, repository, version } =
+  const { author, description, homepage, license, version } =
     await readPackageJSON(root);
 
   const buildTime = dateUtil().format('YYYY-MM-DD HH:mm:ss');
@@ -53,8 +53,6 @@ async function viteMetadataPlugin(
     async config() {
       const { dependencies, devDependencies } =
         await resolveMonorepoDependencies();
-      const repositoryUrl =
-        typeof repository === 'object' ? repository.url : repository;
 
       const isAuthorObject = typeof author === 'object';
       const authorName = isAuthorObject ? author.name : author;
@@ -73,7 +71,6 @@ async function viteMetadataPlugin(
             devDependencies,
             homepage,
             license,
-            repositoryUrl,
             version,
           }),
         },
diff --git a/internal/vite-config/src/typing.ts b/internal/vite-config/src/typing.ts
@@ -91,22 +91,17 @@ interface ApplicationOptions extends ApplicationPluginOptions {}
 
 interface LibraryOptions extends LibraryPluginOptions {}
 
-interface DefineApplicationOptions {
-  application?:
-    | ((config: ConfigEnv) => Promise<ApplicationOptions>)
-    | ApplicationOptions;
-  vite?: ((config: ConfigEnv) => Promise<UserConfig>) | UserConfig;
-}
+type DefineApplicationOptions = (config?: ConfigEnv) => Promise<{
+  application?: ApplicationOptions;
+  vite?: UserConfig;
+}>;
 
-interface DefineLibraryOptions {
-  library?: ((config: ConfigEnv) => Promise<LibraryOptions>) | LibraryOptions;
-  vite?: ((config: ConfigEnv) => Promise<UserConfig>) | UserConfig;
-}
+type DefineLibraryOptions = (config?: ConfigEnv) => Promise<{
+  library?: LibraryOptions;
+  vite?: UserConfig;
+}>;
 
-type DefineConfig = {
-  type?: 'application' | 'auto' | 'library';
-} & DefineApplicationOptions &
-  DefineLibraryOptions;
+type DefineConfig = DefineApplicationOptions | DefineLibraryOptions;
 
 export type {
   ApplicationPluginOptions,
diff --git a/internal/vite-config/src/utils/env.ts b/internal/vite-config/src/utils/env.ts
@@ -54,7 +54,9 @@ async function loadEnv<T = Record<string, string>>(
 async function loadAndConvertEnv(
   match = 'VITE_',
   confFiles = getConfFiles(),
-): Promise<Partial<ApplicationPluginOptions>> {
+): Promise<
+  { appTitle: string; port: number } & Partial<ApplicationPluginOptions>
+> {
   const envConfig = await loadEnv(match, confFiles);
   const visualizer = envConfig.visualizer || '';
   const pwa = envConfig.pwa || '';
@@ -63,8 +65,10 @@ async function loadAndConvertEnv(
     .split(',')
     .filter((item) => ['brotli', 'gzip'].includes(item));
   return {
+    appTitle: envConfig?.VITE_GLOB_APP_TITLE ?? 'Vben Admin Pro',
     compress: !!compress,
     compressTypes: compressTypes as ('brotli' | 'gzip')[],
+    port: Number(envConfig.VITE_PORT) || 5173,
     pwa: !!pwa,
     visualizer: !!visualizer,
   };
diff --git a/packages/@core/forward/README.md b/packages/@core/forward/README.md
@@ -1,3 +1,7 @@
 # @vben-core/forward
 
-该目录内的包，可直接被app所引用
+该目录内的包，可直接被app所引用，其是项目基础功能的一层抽象。允许轻微的副作用耦合，如`locales`的集成。
+
+## 注意事项
+
+- `forward` 内的包不允许相互引用，有相互引用的情况请考虑是否放到`packages/effects`下
diff --git a/packages/@core/forward/request/src/request-client/modules/interceptor.ts b/packages/@core/forward/request/src/request-client/modules/interceptor.ts
@@ -4,6 +4,8 @@ import {
   type InternalAxiosRequestConfig,
 } from 'axios';
 
+const errorHandler = (res: Error) => Promise.reject(res);
+
 class InterceptorManager {
   private axiosInstance: AxiosInstance;
 
@@ -19,7 +21,7 @@ class InterceptorManager {
   ) {
     this.axiosInstance.interceptors.request.use(
       fulfilled,
-      rejected || ((res) => Promise.reject(res)),
+      rejected || errorHandler,
     );
   }
 
@@ -31,7 +33,7 @@ class InterceptorManager {
   ) {
     this.axiosInstance.interceptors.response.use(
       fulfilled,
-      rejected || ((res) => Promise.reject(res)),
+      rejected || errorHandler,
     );
   }
 }
diff --git a/packages/@core/shared/constants/src/index.ts b/packages/@core/shared/constants/src/index.ts
diff --git a/packages/@core/shared/design/vite.config.mts b/packages/@core/shared/design/vite.config.mts
diff --git a/packages/effects/README.md b/packages/effects/README.md
diff --git a/packages/effects/common-ui/src/about/about.vue b/packages/effects/common-ui/src/about/about.vue
diff --git a/packages/styles/vite.config.mts b/packages/styles/vite.config.mts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+VITE_PORT = 5555`
	`2`	`+`
`1`	`3`	`# spa-title`
`2`	`4`	`VITE_GLOB_APP_TITLE = Vben Admin Pro`
`3`	`5`