mirror of
https://gitee.com/niucloud-team/niucloud.git
synced 2026-11-18 16:30:47 +00:00
1. 云编译任务系统的全面升级。 整个云编译服务器使用高性能开发语言GO全面重建整个的任务,排队体系。框架的用户,全面引入了任务管理系统设计架构。把云编译,在线升级,插件打包,构建发布版本,小程序一键上传同步等流程,高度抽象为任务系统。整个任务的执行过程会详细记录下来,支持每个过程的原始执行情况回溯。每个步骤,执行错误,加入重试与取消机制。对于网络拥堵,网络暂时断开造成的上传下载过程中不可预测的中断开始支持断点续传重续。同时,云编译支持前端驱动,与后端Redis队列驱动两种模式。前端驱动模式为轻量模式,需要页面的持续保持任务的进行。Redis队列驱动模式,支持任务后台运行,在任务后台运行的同时,同步进行业务系统的正常使用 2. 多端口,自定义扩展端口的真正支持。历史版本中,在addon.info中,已经设计有自定义端口功能,但是在整个的云编译服务器,没有真正支持自定义端口的编译与部署。在本次版本中,服务器端,以及框架已经全部支持自定义端口使能。addon.info 文件中定义的端口,会在编译端口自动枚举展示。云编译过程,会按照设定的命令自动执行,并完成部署。同时,云编译支持框架独立编译,插件组合编译等,方便开发者使用。 3. 环境检测与数据库修复,在本版本中全面引入。数据库修复,支持全量比对,表比对,插件比对,字符集编码比对,数据库修复功能,可以按照插件比对出缺失字段,并通过一键修复按钮完成数据库的修复。对于第三方插件中数据库表与框架自身不同的情况,系统会自动修正并正确执行SQL脚本。 4. 补丁管理也在本版本中实现,对于小问题,及时问题的处理,会发布小版本补丁。用户可以及时下载补丁,实时完成系统缺漏的修复。 5. 菜单系统,加入了导入菜单,导出菜单功能。niucloud开发团队全力为开发者考虑,本版本导入导出菜单可以按照插件,或者整个框架把菜单结构导出为json格式。 6. 构建版本在本次升级新加入。构建版本可以把云编译及版本构建的版本发布过程保留下来。 7. 插件校验和框架系统校验。在本版本中全面引入。支持对插件和框架进行全面校验比对。支持一键修复二开或者异常代码修复。 8. 存储设置在本版本全面优化,支持新增多种不同存储厂商的配置,并支持在不同配置中切换使用。 9. 运营面板在本次升级中植入。运营面板相当于为应用和插件加入了admin端的管理入口。本次版本开放此功能,为开发者开发admin端口功能提供了基础。我们官方在本次版本中同步发布官方客服插件,在admin端加入了平台客服的演示案例,供大家感受学习。 10. 全面优化了admin端的界面风格,加入了新的站点端默认风格。框架内置Vben Admin 前端框架。其实niucloud优秀的架构设计,运行速度并不慢,加入Vben Admin后,页面的切换效果会让用户感受到更加的丝滑与现代。 11. 前端顶部轮播组件,加入了返回首页按钮。 装修后,完美支持美团,饿了么那种模块与主模块的完美切换。 12. 小程序编译结构进行了优化,整个运行的速度更加快速。
316 lines
12 KiB
JavaScript
316 lines
12 KiB
JavaScript
/**
|
||
* 在框架小程序目录内执行,自动扫描 mp-addons/ 并合并插件分包
|
||
* 纯拷贝 + router 补丁,无需 uni 源码与编译(支持 mp-core 独立分发)
|
||
*
|
||
* 用法(在 dist/build/mp-core/ 目录下):
|
||
* node merge-mp-addon.cjs
|
||
* node merge-mp-addon.cjs shop pintuan
|
||
*/
|
||
const fs = require('fs')
|
||
const path = require('path')
|
||
|
||
function resolveFrameworkDir() {
|
||
const cwd = process.cwd()
|
||
if (fs.existsSync(path.join(cwd, 'app.json'))) {
|
||
return cwd
|
||
}
|
||
const arg = process.argv[2]
|
||
if (arg && !arg.startsWith('-') && fs.existsSync(path.join(path.resolve(arg), 'app.json'))) {
|
||
return path.resolve(arg)
|
||
}
|
||
return null
|
||
}
|
||
|
||
function loadMergeDeps(scriptDir) {
|
||
const libDir = path.join(scriptDir, 'lib')
|
||
if (fs.existsSync(path.join(libDir, 'mp-utils.cjs'))) {
|
||
return {
|
||
libDir,
|
||
utils: require(path.join(libDir, 'mp-utils.cjs')),
|
||
bridge: require(path.join(libDir, 'mp-diy-bridge-merge.cjs')),
|
||
validateRequires: require(path.join(libDir, 'scan-mp-requires.cjs')).validateRequires,
|
||
applyMpWeixinPost: require(path.join(libDir, 'mp-weixin-post.cjs')).applyMpWeixinPost,
|
||
scanAllDiyComponents: null
|
||
}
|
||
}
|
||
|
||
let dir = path.resolve(scriptDir)
|
||
while (true) {
|
||
if (
|
||
fs.existsSync(path.join(dir, 'package.json')) &&
|
||
fs.existsSync(path.join(dir, 'scripts', 'mp-utils.cjs'))
|
||
) {
|
||
return {
|
||
libDir: path.join(dir, 'scripts'),
|
||
utils: require(path.join(dir, 'scripts/mp-utils.cjs')),
|
||
bridge: require(path.join(dir, 'scripts/mp-diy-bridge-merge.cjs')),
|
||
validateRequires: require(path.join(dir, 'scripts/scan-mp-requires.cjs')).validateRequires,
|
||
applyMpWeixinPost: require(path.join(dir, 'scripts/mp-weixin-post.cjs')).applyMpWeixinPost,
|
||
scanAllDiyComponents: require(path.join(dir, 'scripts/diy-component-scan.cjs'))
|
||
.scanAllDiyComponents
|
||
}
|
||
}
|
||
const parent = path.dirname(dir)
|
||
if (parent === dir) break
|
||
dir = parent
|
||
}
|
||
return null
|
||
}
|
||
|
||
function listAddonPackages(frameworkDir) {
|
||
const pkgRoot = path.join(frameworkDir, 'mp-addons')
|
||
if (!fs.existsSync(pkgRoot)) return []
|
||
return fs
|
||
.readdirSync(pkgRoot, { withFileTypes: true })
|
||
.filter((d) => d.isDirectory())
|
||
.map((d) => d.name)
|
||
.filter((key) => fs.existsSync(path.join(pkgRoot, key, 'manifest.json')))
|
||
.sort()
|
||
}
|
||
|
||
function main() {
|
||
const deps = loadMergeDeps(__dirname)
|
||
if (!deps) {
|
||
console.error('[merge-mp-addon] 缺少 lib/ 合并工具,请重新 build:mp-weixin:framework')
|
||
process.exit(1)
|
||
}
|
||
|
||
const {
|
||
utils,
|
||
bridge,
|
||
validateRequires,
|
||
applyMpWeixinPost,
|
||
scanAllDiyComponents
|
||
} = deps
|
||
|
||
// build:mp-weixin:core 场景(SKIP_ADDONS=1):仅产出框架包,不合并已编译插件分包
|
||
if (process.env.SKIP_ADDONS === '1') {
|
||
console.log('[merge-mp-addon] SKIP_ADDONS set, skipping addon merge (core build)')
|
||
process.exit(0)
|
||
}
|
||
const {
|
||
MP_OUT_BUILD,
|
||
MP_CORE_DIR,
|
||
readJson,
|
||
writeJson,
|
||
readAppJson,
|
||
rmDir,
|
||
copyDir,
|
||
mergeSubPackagesIntoApp,
|
||
mergeCommonDir,
|
||
mergeNodeModulesDir,
|
||
mergeOverlayDir,
|
||
patchVendorPropsStubs,
|
||
copyMpRelativeFiles,
|
||
getAppSubPackages,
|
||
loadFrameworkNonAddonSubPackages,
|
||
collectPreservedSubPackages,
|
||
mergeMainComponentsDir,
|
||
listMergedAddonKeysFromFramework
|
||
} = utils
|
||
|
||
const frameworkDir = resolveFrameworkDir()
|
||
if (!frameworkDir) {
|
||
console.error('[merge-mp-addon] 请在框架小程序目录执行(含 app.json),例如:')
|
||
console.error(' cd dist/build/mp-core')
|
||
console.error(' node merge-mp-addon.cjs')
|
||
process.exit(1)
|
||
}
|
||
|
||
const pkgRoot = path.join(frameworkDir, 'mp-addons')
|
||
const available = listAddonPackages(frameworkDir)
|
||
const argvKeys = process.argv.slice(2).filter((a) => !a.startsWith('-'))
|
||
const keys =
|
||
argvKeys.length > 0 ? argvKeys.filter((k) => available.includes(k)) : available
|
||
|
||
if (!available.length) {
|
||
console.log('[merge-mp-addon] mp-addons/ 下未发现插件包(需含 manifest.json)')
|
||
console.log(`[merge-mp-addon] 请将插件包放入: ${pkgRoot}/{key}/`)
|
||
process.exit(0)
|
||
}
|
||
|
||
if (!keys.length) {
|
||
console.error('[merge-mp-addon] 指定的插件不存在于 mp-addons/:', argvKeys.join(', '))
|
||
console.error('[merge-mp-addon] 可用插件:', available.join(', '))
|
||
process.exit(1)
|
||
}
|
||
|
||
console.log(`[merge-mp-addon] framework: ${frameworkDir}`)
|
||
console.log(`[merge-mp-addon] merge keys: ${keys.join(', ')}`)
|
||
console.log('[merge-mp-addon] mode: copy-only (no uni build)')
|
||
|
||
function loadManifest(key) {
|
||
return readJson(path.join(pkgRoot, key, 'manifest.json'))
|
||
}
|
||
|
||
function mergeOneAddon(key) {
|
||
const pkgDir = path.join(pkgRoot, key)
|
||
const manifest = loadManifest(key)
|
||
|
||
for (const root of manifest.roots) {
|
||
const src = path.join(pkgDir, root)
|
||
const dest = path.join(frameworkDir, root)
|
||
if (!fs.existsSync(src)) {
|
||
console.error(`[merge-mp-addon] missing ${root} in ${key}`)
|
||
process.exit(1)
|
||
}
|
||
rmDir(dest)
|
||
copyDir(src, dest)
|
||
console.log(`[merge-mp-addon] copied ${root}`)
|
||
}
|
||
|
||
const commonSrc = path.join(pkgDir, 'common')
|
||
const mergedCommon = mergeCommonDir(frameworkDir, commonSrc)
|
||
if (mergedCommon) {
|
||
console.log(`[merge-mp-addon] merged ${mergedCommon} common file(s) from ${key}`)
|
||
}
|
||
|
||
const nodeModulesSrc = path.join(pkgDir, 'node-modules')
|
||
const mergedNodeModules = mergeNodeModulesDir(frameworkDir, nodeModulesSrc, key)
|
||
if (mergedNodeModules) {
|
||
console.log(`[merge-mp-addon] merged ${mergedNodeModules} node-modules file(s) from ${key}`)
|
||
}
|
||
|
||
if (manifest.deps?.requirePaths?.length) {
|
||
const mergedDeps = copyMpRelativeFiles(
|
||
pkgDir,
|
||
frameworkDir,
|
||
manifest.deps.requirePaths,
|
||
manifest.roots
|
||
)
|
||
if (mergedDeps) {
|
||
console.log(`[merge-mp-addon] merged ${mergedDeps} main-package dep file(s) from ${key}`)
|
||
}
|
||
}
|
||
|
||
for (const comp of manifest.sharedComponents || []) {
|
||
const rel = `addon/components/${comp}`
|
||
const src = path.join(pkgDir, rel)
|
||
if (!fs.existsSync(src)) {
|
||
console.warn(`[merge-mp-addon] missing shared component ${rel} in ${key}`)
|
||
continue
|
||
}
|
||
const merged = mergeOverlayDir(frameworkDir, src, rel)
|
||
if (merged) {
|
||
console.log(`[merge-mp-addon] merged addon/components/${comp} (${merged} file(s))`)
|
||
}
|
||
}
|
||
|
||
for (const dir of manifest.mainComponentDirs || []) {
|
||
const src = path.join(pkgDir, dir)
|
||
if (!fs.existsSync(src)) {
|
||
console.warn(`[merge-mp-addon] missing main component dir ${dir} in ${key}`)
|
||
continue
|
||
}
|
||
const merged = mergeMainComponentsDir(frameworkDir, pkgDir, dir)
|
||
if (merged) {
|
||
console.log(`[merge-mp-addon] merged ${dir} (${merged} file(s)) from ${key}`)
|
||
}
|
||
}
|
||
|
||
return manifest
|
||
}
|
||
|
||
const appPath = path.join(frameworkDir, 'app.json')
|
||
const appJson = readAppJson(frameworkDir)
|
||
const manifests = keys.map((key) => mergeOneAddon(key))
|
||
|
||
const baselineNonAddon = loadFrameworkNonAddonSubPackages(frameworkDir)
|
||
if (baselineNonAddon.length) {
|
||
mergeSubPackagesIntoApp(appJson, baselineNonAddon)
|
||
console.log(`[merge-mp-addon] preserved ${baselineNonAddon.length} framework non-addon subPackage(s)`)
|
||
}
|
||
|
||
const preserved = collectPreservedSubPackages(appJson, frameworkDir, keys, pkgRoot)
|
||
if (preserved.length) {
|
||
mergeSubPackagesIntoApp(appJson, preserved)
|
||
console.log(
|
||
`[merge-mp-addon] preserved ${preserved.length} existing subPackage(s): ${preserved.map((s) => s.root).join(', ')}`
|
||
)
|
||
}
|
||
|
||
for (const m of manifests) {
|
||
mergeSubPackagesIntoApp(appJson, m.subPackages || [])
|
||
}
|
||
writeJson(appPath, appJson)
|
||
console.log(`[merge-mp-addon] app.json subPackages: ${getAppSubPackages(appJson).length}`)
|
||
|
||
// 以下步骤必须在 require 校验之前执行(校验失败 process.exit 会跳过后续逻辑):
|
||
// 1. placeholder 页 + preloadRule + componentPlaceholder
|
||
applyMpWeixinPost(frameworkDir)
|
||
|
||
// 2. vendor.js props$XX stubs 注入
|
||
const propsStubCount = patchVendorPropsStubs(frameworkDir)
|
||
if (propsStubCount) {
|
||
console.log(`[merge-mp-addon] injected ${propsStubCount} props stubs (prevents addon component crashes)`)
|
||
}
|
||
|
||
// 3. DIY bridge router 合并 + diy-group 内联
|
||
const mergedAddonKeys = listMergedAddonKeysFromFramework(frameworkDir)
|
||
try {
|
||
const bridgeResult = bridge.syncMergedDiyBridgeRouter(frameworkDir, pkgRoot, mergedAddonKeys, {
|
||
scanAllDiyComponents: scanAllDiyComponents || undefined
|
||
})
|
||
if (bridgeResult.routerAddons.length) {
|
||
console.log(
|
||
`[merge-mp-addon] diy router patched: app + ${bridgeResult.routerAddons.join(', ')} (${bridgeResult.componentCount} addon diy components)`
|
||
)
|
||
}
|
||
if (bridgeResult.diyGroupInlineCount) {
|
||
console.log(
|
||
`[merge-mp-addon] diy-group inlined ${bridgeResult.diyGroupInlineCount} diy component(s) (app + merged addons)`
|
||
)
|
||
}
|
||
} catch (err) {
|
||
console.error(String(err.message || err))
|
||
process.exit(1)
|
||
}
|
||
|
||
// 4. require 校验(仅警告,不退出;addon 单独合并时通常没有跨插件引用)
|
||
const allRequirePaths = new Set()
|
||
const allForbidden = new Set()
|
||
for (const m of manifests) {
|
||
for (const p of m.deps?.requirePaths || []) allRequirePaths.add(p)
|
||
for (const p of m.deps?.forbiddenPaths || []) allForbidden.add(p)
|
||
}
|
||
|
||
const validation = validateRequires(frameworkDir, [...allRequirePaths], [...allForbidden])
|
||
if (!validation.ok) {
|
||
if (validation.missing.length) {
|
||
console.error('[merge-mp-addon] missing require targets:', validation.missing.slice(0, 20))
|
||
}
|
||
if (validation.forbiddenPaths.length) {
|
||
console.error('[merge-mp-addon] cross-addon requires:', validation.forbiddenPaths)
|
||
}
|
||
// 不 exit:DIY 组件内联、placeholder 等已完成,跨插件引用不影响已合并的 addon
|
||
} else {
|
||
console.log('[merge-mp-addon] require validation OK')
|
||
}
|
||
|
||
writeJson(path.join(frameworkDir, 'mp-merge-meta.json'), {
|
||
time: new Date().toISOString(),
|
||
mergedKeys: mergedAddonKeys,
|
||
subPackageCount: getAppSubPackages(appJson).length,
|
||
mergeMode: 'copy-only'
|
||
})
|
||
|
||
const projectRoot = deps.scanAllDiyComponents
|
||
? path.dirname(path.dirname(deps.libDir === path.join(__dirname, 'lib') ? __dirname : deps.libDir))
|
||
: null
|
||
const defaultMpCore = projectRoot ? MP_CORE_DIR : null
|
||
|
||
if (!defaultMpCore || path.resolve(frameworkDir) !== path.resolve(defaultMpCore) || !MP_OUT_BUILD) {
|
||
console.log('[merge-mp-addon] OK(未同步 dist/build/mp-weixin)')
|
||
console.log('[merge-mp-addon] 导入微信开发者工具:', frameworkDir)
|
||
return
|
||
}
|
||
|
||
rmDir(MP_OUT_BUILD)
|
||
copyDir(frameworkDir, MP_OUT_BUILD)
|
||
applyMpWeixinPost(MP_OUT_BUILD)
|
||
console.log(`[merge-mp-addon] synced -> ${path.relative(projectRoot, MP_OUT_BUILD)}/`)
|
||
console.log('[merge-mp-addon] 导入微信开发者工具: dist/build/mp-core/ 或 dist/build/mp-weixin/')
|
||
}
|
||
|
||
main()
|