v3.7.2 版本代码合并

jeecgboot-vue3/build/vite/plugin/html.ts

@@ -7,7 +7,7 @@ import { createHtmlPlugin } from 'vite-plugin-html';
 import pkg from '../../../package.json';
 import { GLOB_CONFIG_FILE_NAME } from '../../constant';
 
-export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
+export function configHtmlPlugin(env: ViteEnv, isBuild: boolean, isQiankunMicro: boolean) {
   const { VITE_GLOB_APP_TITLE, VITE_PUBLIC_PATH } = env;
 
   const path = VITE_PUBLIC_PATH.endsWith('/') ? VITE_PUBLIC_PATH : `${VITE_PUBLIC_PATH}/`;
@@ -16,12 +16,17 @@ export function configHtmlPlugin(env: ViteEnv, isBuild: boolean) {
     return `${path || '/'}${GLOB_CONFIG_FILE_NAME}?v=${pkg.version}-${new Date().getTime()}`;
   };
 
+  // 【JEECG作为乾坤子应用】补充静态资源前缀
+  const {VITE_GLOB_QIANKUN_MICRO_APP_ENTRY} = env;
+  const basePublicPath = isQiankunMicro ? VITE_GLOB_QIANKUN_MICRO_APP_ENTRY : '';
+
   const htmlPlugin: PluginOption[] = createHtmlPlugin({
     minify: isBuild,
     inject: {
       // 修改模板html的标题
       data: {
         title: VITE_GLOB_APP_TITLE,
+        basePublicPath: basePublicPath,
       },
       // 将app.config.js文件注入到模板html中
       tags: isBuild

jeecgboot-vue3/build/vite/plugin/index.ts

@@ -15,11 +15,18 @@ import { configCompressPlugin } from './compress';
 import { configVisualizerConfig } from './visualizer';
 import { configThemePlugin } from './theme';
 import { configSvgIconsPlugin } from './svgSprite';
+import { configQiankunMicroPlugin } from './qiankunMicro';
 // //预编译加载插件(不支持vite3作废)
 // import OptimizationPersist from 'vite-plugin-optimize-persist';
 // import PkgConfig from 'vite-plugin-package-config';
 
-export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
+/**
+ *
+ * @param viteEnv
+ * @param isBuild
+ * @param isQiankunMicro 是否【JEECG作为乾坤子应用】
+ */
+export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean, isQiankunMicro: boolean) {
   const { VITE_USE_MOCK, VITE_BUILD_COMPRESS, VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE } = viteEnv;
 
   const vitePlugins: (PluginOption | PluginOption[])[] = [
@@ -38,7 +45,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   vitePlugins.push(UnoCSS({ presets: [presetUno(), presetTypography()] }));
 
   // vite-plugin-html
-  vitePlugins.push(configHtmlPlugin(viteEnv, isBuild));
+  vitePlugins.push(configHtmlPlugin(viteEnv, isBuild, isQiankunMicro));
 
   // vite-plugin-svg-icons
   vitePlugins.push(configSvgIconsPlugin(isBuild));
@@ -55,6 +62,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   // vite-plugin-theme
   vitePlugins.push(configThemePlugin(isBuild));
 
+  // 【JEECG作为乾坤子应用】注册乾坤子应用模式插件
+  if (isQiankunMicro) {
+    // vite-plugin-qiankun
+    vitePlugins.push(...configQiankunMicroPlugin(viteEnv))
+  }
+
   // The following plugins only work in the production environment
   if (isBuild) {
     

jeecgboot-vue3/build/vite/plugin/qiankunMicro.ts

@@ -0,0 +1,16 @@
+import qiankun from 'vite-plugin-qiankun';
+
+/**
+ * 【JEECG作为乾坤子应用】Vite适配乾坤以子应用模式运行
+ * @param env
+ */
+export function configQiankunMicroPlugin(env: ViteEnv) {
+  const {VITE_GLOB_QIANKUN_MICRO_APP_NAME} = env
+
+  return [
+    qiankun(VITE_GLOB_QIANKUN_MICRO_APP_NAME!, {
+      useDevMode: true,
+    })
+  ]
+
+}