diff --git a/.env.predev.one b/.env.predev.one new file mode 100644 index 00000000..95c6e5ef --- /dev/null +++ b/.env.predev.one @@ -0,0 +1,16 @@ +### + # @Description: + # @Version: 1.668 + # @Autor: 地虎降天龙 + # @Date: 2025-03-18 10:44:21 + # @LastEditors: 地虎降天龙 + # @LastEditTime: 2025-03-18 10:46:29 +### +# 自动增加插件里面pages的页面路由 +FES_APP_PLUGINS=true + +# 自动替换默认目录为插件的preview.vue +FES_APP_PREINDEX=true + +# 只打包某个插件 +FES_APP_PLSNAME='uniAppView' diff --git a/.fes.predev.one.js b/.fes.predev.one.js new file mode 100644 index 00000000..f1d8af3d --- /dev/null +++ b/.fes.predev.one.js @@ -0,0 +1,115 @@ +/* + * @Description: + * @Version: 1.668 + * @Autor: 地虎降天龙 + * @Date: 2023-10-16 10:53:09 + * @LastEditors: 地虎降天龙 + * @LastEditTime: 2025-03-18 12:43:07 + */ +import { defineBuildConfig } from '@fesjs/fes' +import copyPublicWithPluginExclusion from './src/common/copySelectedPublicDirsPlugin' + +export default defineBuildConfig({ + layout: { + title: 'TvT.js', + navigation: 'top', + multiTabs: false, + isFixedHeader: true, + logo: 'logo.png', + menus: [ + { + name: 'preview', + path: '/', + title: '📀 预览演示', + }, + { + path: 'https://gitee.com/ice-gl/icegl-three-vue-tres', + title: '📜 源码地址', + }, + { + title: '📚 说明文档', + children: [ + { + path: 'http://docs.icegl.cn', + title: '🧊 TvT框架文档', + }, + { + path: 'https://threejs.org/docs/index.html#manual/zh/introduction/Creating-a-scene', + title: '🎲 three.js', + }, + { + path: 'https://tresjs.org/guide/', + title: '⚡ tres.js', + }, + { + path: 'https://fesjs.mumblefe.cn/', + title: '💠 fes.js', + }, + ], + }, + { + path: 'https://www.bilibili.com/video/BV1LH4y1p7Yn', + title: '📀 TvT视频教程', + }, + { + path: 'https://www.icegl.cn/tvtstore', + title: '🧩 插件市场', + }, + { + path: 'https://www.icegl.cn/', + title: '🧊 ICEGL官网', + }, + { + title: '👨‍🏫 课程中心', + children: [ + { + path: 'https://icegl.cn/courses', + title: '🌁 WebGL初/中/高级教程', + }, + { + path: 'https://www.bilibili.com/video/BV1iR4y1C7LQ/', + title: '🏙 WebGL Shader初级教程', + }, + { + path: 'http://m.study.163.com/provider/480000002303414/index.htm?share=2&shareId=480000002303414', + title: '🌇 WebGL Shader中级教程', + }, + ], + }, + { + path: 'https://www.icegl.cn/ask', + title: '🙋‍♀️ 社区问答', + }, + { + path: 'https://www.icegl.cn/tvtstore/uniAppView', + title: '🪅 小程序生态', + }, + { + path: 'https://www.icegl.cn/d/demand/post', + title: '🪢 定制开发', + }, + { + path: 'https://www.icegl.cn/p/aboutus', + title: '💫 关于我们', + }, + ], + }, + viteOption: { + build: { + copyPublicDir: false, // 禁止 Vite 默认复制 public 目录 + }, + plugins: [ + copyPublicWithPluginExclusion(), // 不用传值，内部自动处理 + ], + server: { + proxy: { + // 开发代理服务器配置 + '/api.icegl': { + target: 'https://www.icegl.cn/', + changeOrigin: true, + rewrite: (path) => path.replace(/^\/api.icegl/, ''), + }, + }, + }, + }, +}) diff --git a/package.json b/package.json index b3bc7eb1..46894018 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,12 @@ "dev": "fes dev", "build": "fes build", "pre.dev": "cross-env FES_ENV=predev fes dev", + "pre.dev.one": "cross-env FES_ENV=predev.one fes dev", "pre.build": "cross-env NODE_OPTIONS=--max-old-space-size=8088 FES_ENV=predev fes build", - "pre.build.icegl": "cross-env NODE_OPTIONS=--max-old-space-size=8088 FES_ENV=predev FES_APP_ONLINE_API=true fes build", + "pre.build.one": "cross-env NODE_OPTIONS=--max-old-space-size=8088 FES_ENV=predev.one fes build", "both": "concurrently \"npm run dev\" \"npm run pre.dev\" ", "plugin.marker": "node pluginMaker/index.js", + "pre.build.icegl": "cross-env NODE_OPTIONS=--max-old-space-size=8088 FES_ENV=predev FES_APP_ONLINE_API=true fes build", "analyze": "cross-env ANALYZE=1 fes build", "test:unit": "fes test:unit", "postinstall": "patch-package" diff --git a/src/app.jsx b/src/app.jsx index e65393dc..9575480a 100644 --- a/src/app.jsx +++ b/src/app.jsx @@ -4,7 +4,7 @@ * @Autor: 地虎降天龙 * @Date: 2023-10-16 10:53:09 * @LastEditors: 地虎降天龙 - * @LastEditTime: 2025-02-14 09:02:35 + * @LastEditTime: 2025-03-18 10:49:19 */ import { defineRuntimeConfig, useModel } from '@fesjs/fes' import { FMenu } from '@fesjs/fes-design' @@ -99,7 +99,13 @@ export function patchRoutes ({ routes }) { } // 自动读取plugins目录下所有插件的pages的目录下的*.vue 并加入路由 - const viteModules = import.meta.glob('./plugins/**/pages/**/*.vue') + let viteModules = import.meta.glob('./plugins/**/pages/**/*.vue') + if (process.env.FES_APP_PLSNAME !== undefined) { + const filteredModules = Object.fromEntries( + Object.entries(viteModules).filter(([path]) => path.startsWith(`./plugins/${process.env.FES_APP_PLSNAME}/pages/`)) + ) + viteModules = filteredModules + } const needAddRouter = { path: '/plugins', component: () => import("./components/forPreview/suspenseLayout.vue"), diff --git a/src/common/copySelectedPublicDirsPlugin.js b/src/common/copySelectedPublicDirsPlugin.js new file mode 100644 index 00000000..63cf4f77 --- /dev/null +++ b/src/common/copySelectedPublicDirsPlugin.js @@ -0,0 +1,97 @@ +import fs from 'fs' +// import path from 'path' +// const fs = require('fs').promises +const path = require('path') +const glob = require('glob') + +/** + * 递归拷贝目录或单个文件，自动判断类型 + * @param {string} src 源路径（文件或目录） + * @param {string} dest 目标路径 + */ +async function copy(src, dest) { + if (!fs.existsSync(src)) return + + const stat = await fs.promises.stat(src) + + if (stat.isDirectory()) { + await fs.promises.mkdir(dest, { recursive: true }) + const entries = await fs.promises.readdir(src, { withFileTypes: true }) + + for (const entry of entries) { + if (entry.name.startsWith('.')) continue // 跳过隐藏文件 + + const srcPath = path.join(src, entry.name) + const destPath = path.join(dest, entry.name) + + await copy(srcPath, destPath) + } + } else { + await fs.promises.copyFile(src, dest) + } +} + +const makeAllowPluginDirs = () => { + const onePLAname = process.env.FES_APP_PLSNAME + if (!onePLAname) { + console.error('未设置插件名称') + } + const configFile = glob.sync(`../plugins/${onePLAname}/config.js`, { cwd: __dirname }) + const require2 = require('esm')(module) + const requireConfig = require2(path.join(__dirname, configFile[0])).default + // console.log(requireConfig) + const allowPluginDirs = requireConfig.require + allowPluginDirs.push(onePLAname) + console.log(allowPluginDirs) + return allowPluginDirs +} + +/** + * Vite 插件：拷贝 `public` 目录，排除 `plugins` 目录，但允许其中部分目录 + * @param {string[]} allowPluginDirs 允许从 `plugins` 目录拷贝的子目录 + * @param {string} publicDir 默认 public 目录路径 + * @param {string} outputDir 目标 dist 目录路径 + * @returns Vite 插件对象 + */ +export default function copyPublicWithPluginExclusion (allowPluginDirs, publicDir = 'public', outputDir = 'dist') { + + return { + name: 'vite-plugin-copy-public', + apply: 'build', + async closeBundle() { + if (!fs.existsSync(publicDir)) return + allowPluginDirs = makeAllowPluginDirs() + + const items = await fs.promises.readdir(publicDir, { withFileTypes: true }) + + for (const item of items) { + if (item.name.startsWith('.')) continue // 跳过隐藏文件 + if (item.name === 'plugins') continue // 跳过 plugins 目录 + + const srcPath = path.join(publicDir, item.name) + const destPath = path.join(outputDir, item.name) + + await copy(srcPath, destPath) + console.log(`✔ Copied: ${srcPath} → ${destPath}`) + } + + // 复制 `public/plugins/` 目录下允许的子目录 + const pluginsDir = path.join(publicDir, 'plugins') + const pluginsDest = path.join(outputDir, 'plugins') + + if (fs.existsSync(pluginsDir)) { + for (const plugin of allowPluginDirs) { + const pluginSrc = path.join(pluginsDir, plugin) + const pluginDest = path.join(pluginsDest, plugin) + + if (fs.existsSync(pluginSrc)) { + await copy(pluginSrc, pluginDest) + console.log(`✔ Copied: ${pluginSrc} → ${pluginDest}`) + } else { + console.warn(`⚠ Warning: ${pluginSrc} does not exist, skipping...`) + } + } + } + }, + } +} diff --git a/src/common/utils.js b/src/common/utils.js index 06c6850a..4a41cb93 100644 --- a/src/common/utils.js +++ b/src/common/utils.js @@ -4,7 +4,7 @@ * @Autor: 地虎降天龙 * @Date: 2023-10-16 10:53:09 * @LastEditors: 地虎降天龙 - * @LastEditTime: 2025-03-17 13:55:58 + * @LastEditTime: 2025-03-18 10:54:33 */ // 放工具函数 import { request } from '@fesjs/fes' @@ -22,7 +22,13 @@ const findStringBetween = (str) => { export const getPluginsConfig = () => { // 获得插件列表 根据插件目录 if (!window.pluginsConfig) { - const modulePaths = import.meta.glob('PLS/*/config.js', { eager: true }) + let modulePaths = import.meta.glob('PLS/*/config.js', { eager: true }) + if (process.env.FES_APP_PLSNAME !== undefined) { + const filteredModules = Object.fromEntries( + Object.entries(modulePaths).filter(([path]) => path.startsWith(`/src/plugins/${process.env.FES_APP_PLSNAME}/config.js`)), + ) + modulePaths = filteredModules + } const config = {} for (const path of Object.keys(modulePaths)) { const name = findStringBetween(path) @@ -34,23 +40,25 @@ export const getPluginsConfig = () => { window.pluginsConfig = config } //检查插件依赖关系 - for (const name of Object.keys(window.pluginsConfig)) { - if (window.pluginsConfig[name].require) { - window.pluginsConfig[name].require.forEach((req) => { - // eslint-disable-next-line no-undefined - const re = window.pluginsConfig[req] !== undefined - if (!re) { - console.error(`${req}插件_未安装，请到插件市场下载安装:https://icegl.cn/tvtstore/${req}`) - // window.open(`https://icegl.cn/tvtstore/${req}`, '_blank') - const features = 'width=600,height=350' - window.open(`https://icegl.cn/tvtstore/${req}`, req, features) - // FMessage.warning?.({ - // content: `${req}插件_未安装，请到插件市场下载安装:https://icegl.cn/tvtstore/${req}`, - // colorful: true, - // duration: 10, - // }) - } - }) + if(process.env.FES_APP_PLSNAME === undefined) { + for (const name of Object.keys(window.pluginsConfig)) { + if (window.pluginsConfig[name].require) { + window.pluginsConfig[name].require.forEach((req) => { + // eslint-disable-next-line no-undefined + const re = window.pluginsConfig[req] !== undefined + if (!re) { + console.error(`${req}插件_未安装，请到插件市场下载安装:https://icegl.cn/tvtstore/${req}`) + // window.open(`https://icegl.cn/tvtstore/${req}`, '_blank') + const features = 'width=600,height=350' + window.open(`https://icegl.cn/tvtstore/${req}`, req, features) + // FMessage.warning?.({ + // content: `${req}插件_未安装，请到插件市场下载安装:https://icegl.cn/tvtstore/${req}`, + // colorful: true, + // duration: 10, + // }) + } + }) + } } } return window.pluginsConfig diff --git a/src/plugins/preview.vue b/src/plugins/preview.vue index a7180293..f748b076 100644 --- a/src/plugins/preview.vue +++ b/src/plugins/preview.vue @@ -4,7 +4,7 @@ * @Autor: 地虎降天龙 * @Date: 2023-11-18 22:17:49 * @LastEditors: 地虎降天龙 - * @LastEditTime: 2025-03-18 10:22:20 + * @LastEditTime: 2025-03-18 10:58:57 -->