open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-06-28 02:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复 deps 目录依赖逻辑

Browse Source
This commit is contained in:
whyour 2026-06-21 12:12:29 +08:00
parent b5a5fb3be6
commit 369dd13212
4 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-docker-image.yml vendored
View File

@ -192,7 +192,7 @@ jobs:
latest=false latest=false
tags: | tags: |
type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }} type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'develop') }}
type=ref,event=branch,enable=${{ github.ref == format('refs/heads/{0}', 'master') }} type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
type=raw,value=${{ steps.version.outputs.version }},enable=${{ github.ref == format('refs/heads/{0}', 'master') }} type=raw,value=${{ steps.version.outputs.version }},enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
type=semver,pattern={{version}} type=semver,pattern={{version}}

26
back/loaders/deps.ts
View File

@ -1,22 +1,9 @@
import path from 'path'; import path from 'path';
import fs from 'fs/promises'; import fs from 'fs/promises';
import os from 'os'; import os from 'os';
import chokidar from 'chokidar';
import config from '../config/index'; import config from '../config/index';
import Logger from './logger'; import Logger from './logger';
async function linkToNodeModule(src: string, dst?: string) {
const target = path.join(config.rootPath, 'node_modules', dst || src);
const source = path.join(config.rootPath, src);
try {
const stats = await fs.lstat(target);
if (!stats) {
await fs.symlink(source, target, 'dir');
}
} catch (error) { }
}
async function linkCommand() { async function linkCommand() {
const homeDir = os.homedir(); const homeDir = os.homedir();
let userBinDir = path.join(homeDir, 'bin'); let userBinDir = path.join(homeDir, 'bin');
@ -59,17 +46,6 @@ async function linkCommandToDir(commandDir: string) {
} }
} }
export default async (src: string = 'deps') => { export default async () => {
await linkCommand(); await linkCommand();
await linkToNodeModule(src);
const source = path.join(config.rootPath, src);
const watcher = chokidar.watch(source, {
ignored: /(^|[\/\\])\../, // ignore dotfiles
persistent: true,
});
watcher
.on('add', () => linkToNodeModule(src))
.on('change', () => linkToNodeModule(src));
}; };

3
shell/otask.sh
View File

@ -92,6 +92,9 @@ clear_non_sh_env() {
append_node_dependency_path() { append_node_dependency_path() {
export PREV_NODE_PATH="${NODE_PATH:=}" export PREV_NODE_PATH="${NODE_PATH:=}"
# 用户依赖目录加入 NODE_PATH，替代 symlink 到 node_modules 的方式
export NODE_PATH="${NODE_PATH:+${NODE_PATH}:}${dir_dep}"
local pnpm_global_path=$(pnpm root -g 2>/dev/null) local pnpm_global_path=$(pnpm root -g 2>/dev/null)
if [[ -n "$pnpm_global_path" ]]; then if [[ -n "$pnpm_global_path" ]]; then
export QL_NODE_GLOBAL_PATH="$pnpm_global_path" export QL_NODE_GLOBAL_PATH="$pnpm_global_path"

16
shell/pub.sh
View File

@ -1,26 +1,26 @@
#!/usr/bin/env bash #!/usr/bin/env bash
echo -e "开始发布" echo -e "开始发布"
echo -e "切换 debian 分支" echo -e "切换master分支"
git branch -D debian git branch -D master
git checkout -b debian git checkout -b master
git push --set-upstream origin debian -f git push --set-upstream origin master -f
echo -e "更新cdn文件" echo -e "更新cdn文件"
ts-node-transpile-only sample/tool.ts ts-node-transpile-only sample/tool.ts
string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*") string=$(cat version.yaml | grep "version" | egrep "[^ ]*" -o | egrep "\d\.*")
version="v$string" version="v$string"
echo -e "当前版本$version-debian" echo -e "当前版本$version"
echo -e "删除已经存在的本地tag" echo -e "删除已经存在的本地tag"
git tag -d "$version-debian" &>/dev/null git tag -d "$version" &>/dev/null
echo -e "删除已经存在的远程tag" echo -e "删除已经存在的远程tag"
git push origin :refs/tags/$version-debian &>/dev/null git push origin :refs/tags/$version &>/dev/null
echo -e "创建新tag" echo -e "创建新tag"
git tag -a "$version-debian" -m "release $version-debian" git tag -a "$version" -m "release $version"
echo -e "提交tag" echo -e "提交tag"
git push --tags git push --tags