From 3a99587cc574d8b9838f69c97230f433f783a3bb Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 19 Sep 2026 19:04:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=20npm=20scripts?= =?UTF-8?q?=20=E5=91=BD=E5=90=8D=E5=B9=B6=E6=96=B0=E5=A2=9E=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=89=93=E5=8C=85=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 按前缀归类: dev:*(h5/adb/electron)、build:*(h5/app/exe/apk)、android:*(prepare/pack) - 改名: dev:h5:electron→dev:h5、debug:electron→dev:electron、build:h5:electron→build:h5、build:app-plus→build:app - 新增快捷入口: dev→dev:h5、build→build:h5、build:apk(编译+打包+发布一键) - build:apk 不重复调 prepare.cjs(pack.ps1 内部已注入) - 同步更新所有内部引用(dev-electron/build-exe/dev-adb/pack.ps1 提示)与文档 --- README.md | 2 +- android-offline/README.md | 2 +- android-offline/prepare.cjs | 2 +- config/README.md | 2 +- package.json | 17 ++++++++++------- scripts/build-exe.cjs | 2 +- scripts/dev-adb.cjs | 6 +++--- scripts/dev-electron.js | 2 +- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 0d79354..ebd44bd 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ 1. 自动列出所有 ADB 设备(多台时交互选择,单台自动选中) 2. 进程常驻,监听 `src/` 与原生工程源码(`simpleDemo/src/main/java`、`AndroidManifest.xml`) -3. 保存文件后自动:`build:app-plus` → 离线打包(gradle 增量) → `adb install -r` → 启动应用(约 20 秒/轮) +3. 保存文件后自动:`build:app` → 离线打包(gradle 增量) → `adb install -r` → 启动应用(约 20 秒/轮) 4. **真机 console 实时打印到终端**(含视图层 renderjs) 可选参数: diff --git a/android-offline/README.md b/android-offline/README.md index d4eb8dc..822ffd0 100644 --- a/android-offline/README.md +++ b/android-offline/README.md @@ -47,7 +47,7 @@ android-offline/ ## 3. 离线打包流程(命令打包,无需 Android Studio) -1. 生成 App 资源:`npm run build:app-plus`(或 HBuilderX「发行 → 原生App-本地打包」,产物路径写到 `pack-config.json` 的 `wwwSource`) +1. 生成 App 资源:`npm run build:app`(或 HBuilderX「发行 → 原生App-本地打包」,产物路径写到 `pack-config.json` 的 `wwwSource`) 2. 一条命令注入配置并打包 APK: ``` npm run android:pack diff --git a/android-offline/prepare.cjs b/android-offline/prepare.cjs index 7db766d..4d66a14 100644 --- a/android-offline/prepare.cjs +++ b/android-offline/prepare.cjs @@ -82,7 +82,7 @@ const candidates = [ const wwwSource = candidates.find((dir) => fs.existsSync(dir)) if (!wwwSource) { failed = true - console.error('[prepare][错误] 未找到 App 资源,请先执行 npm run build:app-plus(或 HBuilderX 生成本地打包资源)') + console.error('[prepare][错误] 未找到 App 资源,请先执行 npm run build:app(或 HBuilderX 生成本地打包资源)') } else { fs.rmSync(wwwTarget, { recursive: true, force: true }) fs.cpSync(wwwSource, wwwTarget, { recursive: true }) diff --git a/config/README.md b/config/README.md index eb8ffe7..ab067ed 100644 --- a/config/README.md +++ b/config/README.md @@ -42,4 +42,4 @@ 2. `cp config/deploy.example.json config/deploy.json` 并填写(仅发布 APK 时需要) 3. `cp .env.example .env.local` 并填写接口地址 3. `npm install` -4. 打包:`npm run build:exe`(Windows,发布到 worker_station_windows)、`npm run android:pack`(Android,发布到 worker_station) +4. 打包:`npm run build:apk`(Android 一键打包+发布,或拆分为 `npm run build:app` + `npm run android:pack`)、`npm run build:exe`(Windows,发布到 worker_station_windows) diff --git a/package.json b/package.json index 71aa9a5..562e65d 100644 --- a/package.json +++ b/package.json @@ -5,15 +5,18 @@ "author": "tianbao", "main": "electron/main.js", "scripts": { - "dev:h5:electron": "uni --mode electron", - "debug:electron": "node scripts/dev-electron.js", - "start:electron": "electron electron/main.js", - "build:h5:electron": "uni build --mode electron", - "build:app-plus": "uni build -p app", + "dev": "npm run dev:h5", + "dev:h5": "uni --mode electron", + "dev:adb": "node scripts/dev-adb.cjs", + "dev:electron": "node scripts/dev-electron.js", + "build": "npm run build:h5", + "build:h5": "uni build --mode electron", + "build:app": "uni build -p app", + "build:exe": "node scripts/build-exe.cjs", + "build:apk": "npm run build:app && npm run android:pack", "android:prepare": "node android-offline/prepare.cjs", "android:pack": "powershell -NoProfile -ExecutionPolicy Bypass -File android-offline/pack.ps1", - "dev:adb": "node scripts/dev-adb.cjs", - "build:exe": "node scripts/build-exe.cjs" + "start:electron": "electron electron/main.js" }, "dependencies": {}, "devDependencies": { diff --git a/scripts/build-exe.cjs b/scripts/build-exe.cjs index cec26df..f21f2f4 100644 --- a/scripts/build-exe.cjs +++ b/scripts/build-exe.cjs @@ -27,7 +27,7 @@ function run(cmd, args) { } console.log('[1/2] 编译前端资源 -> dist/build/h5') -run(npmCmd, ['run', 'build:h5:electron']) +run(npmCmd, ['run', 'build:h5']) console.log('\n[2/2] electron-builder 打包 exe -> release/windows/') run(npxCmd, ['electron-builder', '--config', 'electron-builder.config.cjs']) diff --git a/scripts/dev-adb.cjs b/scripts/dev-adb.cjs index 2e94951..81f6ee4 100644 --- a/scripts/dev-adb.cjs +++ b/scripts/dev-adb.cjs @@ -2,7 +2,7 @@ * ADB 真机调试(类热更新): * 1. 列出所有已连接设备,可选择目标设备(多台时交互选择,单台自动选中) * 2. 进程常驻,监听源码变更 - * 3. 变更后自动:build:app-plus → 离线打包(gradle 增量) → adb install -r → 启动应用 + * 3. 变更后自动:build:app → 离线打包(gradle 增量) → adb install -r → 启动应用 * * 用法: * npm run dev:adb # 自动选唯一设备 @@ -209,8 +209,8 @@ async function buildAndInstall(serial, trigger) { const t0 = Date.now() log(`开始构建(触发: ${trigger})`) // 1. uni-app 编译 App 资源 - if (!run('npm', ['run', 'build:app-plus'])) { - log('✗ build:app-plus 失败,跳过安装') + if (!run('npm', ['run', 'build:app'])) { + log('✗ build:app 失败,跳过安装') return false } // 2. 离线打包(prepare + gradle 增量 + 复制 APK),跳过发布上传 diff --git a/scripts/dev-electron.js b/scripts/dev-electron.js index 2335724..93536b0 100644 --- a/scripts/dev-electron.js +++ b/scripts/dev-electron.js @@ -36,7 +36,7 @@ const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm' const npxCmd = process.platform === 'win32' ? 'npx.cmd' : 'npx' const useShell = process.platform === 'win32' -const devProcess = spawn(npmCmd, ['run', 'dev:h5:electron', '--', '--port', rendererPort, '--strictPort'], { +const devProcess = spawn(npmCmd, ['run', 'dev:h5', '--', '--port', rendererPort, '--strictPort'], { stdio: 'inherit', shell: useShell, })