diff --git a/apps/stage-tamagotchi/package.json b/apps/stage-tamagotchi/package.json index 5fad3c108..375942c74 100644 --- a/apps/stage-tamagotchi/package.json +++ b/apps/stage-tamagotchi/package.json @@ -144,7 +144,6 @@ "electron": "^38.2.2", "electron-builder": "26.0.20", "electron-vite": "^4.0.1", - "execa": "^9.6.0", "less": "^4.4.2", "unocss-preset-scrollbar": "^3.2.0", "unplugin-info": "^1.2.4", diff --git a/apps/stage-tamagotchi/scripts/utils.ts b/apps/stage-tamagotchi/scripts/utils.ts index c7f74a4bd..e9770dc24 100644 --- a/apps/stage-tamagotchi/scripts/utils.ts +++ b/apps/stage-tamagotchi/scripts/utils.ts @@ -5,7 +5,7 @@ import process from 'node:process' import { readFile } from 'node:fs/promises' import { resolve } from 'node:path' -import { execa } from 'execa' +import { x } from 'tinyexec' import * as yaml from 'yaml' @@ -14,7 +14,7 @@ import packageJSON from '../package.json' assert { type: 'json' } export async function getVersion(options: { release: boolean, autoTag: boolean, tag: string[] }) { if (!options.release || !options.tag) { // Otherwise, fetch from the latest git ref - const res = await execa('git', ['log', '-1', '--pretty=format:"%H"']) + const res = await x('git', ['log', '-1', '--pretty=format:"%H"']) const date = new Date().toISOString().split('T')[0].replace(/-/g, '') return `nightly-${date}-${String(res.stdout.replace(/"/g, '')).trim().substring(0, 7)}` } @@ -43,7 +43,7 @@ export async function getVersion(options: { release: boolean, autoTag: boolean, // Now, only auto-tag & release && non-specific tag is the only possibility, // fetch the latest git ref try { - const res = await execa('git', ['describe', '--tags', '--abbrev=0']) + const res = await x('git', ['describe', '--tags', '--abbrev=0']) return String(res.stdout).replace(/^v/, '').trim() } catch { diff --git a/apps/stage-web/package.json b/apps/stage-web/package.json index 4bd7ed1a7..effc1b9f9 100644 --- a/apps/stage-web/package.json +++ b/apps/stage-web/package.json @@ -116,7 +116,6 @@ "@vue-macros/volar": "^3.1.1", "@vueuse/motion": "^3.0.3", "csstype": "^3.1.3", - "execa": "^9.6.0", "hfup": "^1.0.0", "less": "^4.4.2", "unplugin-info": "^1.2.4", diff --git a/bump.config.ts b/bump.config.ts index 49797f4ab..5d814dcd2 100644 --- a/bump.config.ts +++ b/bump.config.ts @@ -3,8 +3,8 @@ import { join } from 'node:path' import { cwd } from 'node:process' import { defineConfig } from 'bumpp' -import { execa } from 'execa' import { parse, stringify } from 'smol-toml' +import { x } from 'tinyexec' export default defineConfig({ recursive: true, @@ -13,7 +13,7 @@ export default defineConfig({ push: false, all: true, execute: async () => { - await execa('pnpm', ['publish', '-r', '--access', 'public', '--no-git-checks', '--dry-run']) + await x('pnpm', ['publish', '-r', '--access', 'public', '--no-git-checks', '--dry-run']) const cargoTomlFile = await readFile(join(cwd(), 'Cargo.toml')) const cargoToml = parse(cargoTomlFile.toString('utf-8')) as { @@ -41,6 +41,6 @@ export default defineConfig({ console.info(`Bumping Cargo.toml version to ${cargoToml.workspace.package.version} (from package.json, ${packageJSON.version})`) await writeFile(join(cwd(), 'Cargo.toml'), stringify(cargoToml)) - await execa('cargo', ['generate-lockfile']) + await x('cargo', ['generate-lockfile']) }, }) diff --git a/package.json b/package.json index 426abed3f..39cd9f797 100644 --- a/package.json +++ b/package.json @@ -52,13 +52,13 @@ "@vitest/coverage-v8": "^3.2.4", "bumpp": "^10.3.1", "eslint": "^9.37.0", - "execa": "^9.6.0", "lint-staged": "^16.2.4", "publint": "^0.3.14", "rollup": "^4.52.4", "simple-git-hooks": "^2.13.1", "smol-toml": "^1.4.2", "taze": "^19.7.0", + "tinyexec": "^1.0.1", "tsdown": "^0.15.6", "tsx": "^4.20.6", "turbo": "^2.5.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9829b995e..78e21dc74 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -121,9 +121,6 @@ importers: eslint: specifier: ^9.37.0 version: 9.37.0(jiti@2.5.1) - execa: - specifier: ^9.6.0 - version: 9.6.0 lint-staged: specifier: ^16.2.4 version: 16.2.4 @@ -142,6 +139,9 @@ importers: taze: specifier: ^19.7.0 version: 19.7.0 + tinyexec: + specifier: ^1.0.1 + version: 1.0.1 tsdown: specifier: ^0.15.6 version: 0.15.6(@arethetypeswrong/core@0.18.2)(publint@0.3.14)(typescript@5.9.3)(unplugin-lightningcss@0.4.3)(unplugin-unused@0.5.4)(vue-tsc@3.0.8(typescript@5.9.3)) @@ -603,9 +603,6 @@ importers: electron-vite: specifier: ^4.0.1 version: 4.0.1(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1)) - execa: - specifier: ^9.6.0 - version: 9.6.0 less: specifier: ^4.4.2 version: 4.4.2 @@ -937,9 +934,6 @@ importers: csstype: specifier: ^3.1.3 version: 3.1.3 - execa: - specifier: ^9.6.0 - version: 9.6.0 hfup: specifier: ^1.0.0 version: 1.0.0 @@ -1809,7 +1803,7 @@ importers: version: rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1) vite-plugin-vue-devtools: specifier: ^8.0.2 - version: 8.0.2(@nuxt/kit@4.0.3(magicast@0.3.5))(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)) + version: 8.0.2(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)) vue-router: specifier: ^4.5.1 version: 4.5.1(vue@3.5.22(typescript@5.9.3)) @@ -1843,7 +1837,7 @@ importers: version: rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1) vite-plugin-vue-devtools: specifier: ^8.0.2 - version: 8.0.2(@nuxt/kit@4.0.3(magicast@0.3.5))(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)) + version: 8.0.2(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)) vue-router: specifier: ^4.5.1 version: 4.5.1(vue@3.5.22(typescript@5.9.3)) @@ -33086,7 +33080,6 @@ snapshots: '@nuxt/kit': 3.18.1(magicast@0.3.5) transitivePeerDependencies: - supports-color - optional: true vite-plugin-inspect@11.3.3(@nuxt/kit@3.18.1(magicast@0.3.5))(vite@6.3.6(@types/node@24.7.2)(jiti@2.5.1)(less@4.4.2)(lightningcss@1.30.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1)): dependencies: @@ -33166,6 +33159,21 @@ snapshots: - supports-color - vue + vite-plugin-vue-devtools@8.0.2(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)): + dependencies: + '@vue/devtools-core': 8.0.2(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)) + '@vue/devtools-kit': 8.0.2 + '@vue/devtools-shared': 8.0.2 + execa: 9.6.0 + sirv: 3.0.2 + vite: rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1) + vite-plugin-inspect: 11.3.3(@nuxt/kit@3.18.1(magicast@0.3.5))(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1)) + vite-plugin-vue-inspector: 5.3.2(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1)) + transitivePeerDependencies: + - '@nuxt/kit' + - supports-color + - vue + vite-plugin-vue-inspector@5.3.2(rolldown-vite@7.1.16(@types/node@24.7.2)(esbuild@0.25.9)(jiti@2.5.1)(less@4.4.2)(terser@5.43.1)(tsx@4.20.6)(yaml@2.8.1)): dependencies: '@babel/core': 7.28.3