From 69ec774611474255ba618212f385ce5ca002c9b5 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 16 Apr 2024 16:30:52 +0800 Subject: [PATCH 1/6] test(#111): add a test case --- test/cli.test.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 test/cli.test.ts diff --git a/test/cli.test.ts b/test/cli.test.ts new file mode 100644 index 0000000..79c60dc --- /dev/null +++ b/test/cli.test.ts @@ -0,0 +1,11 @@ +import path from 'node:path' +import { expect, it } from 'vitest' +import { execa } from 'execa' + +it('taze cli should just works', async () => { + const binPath = path.resolve(__dirname, '../bin/taze.mjs') + + const proc = await execa(process.execPath, [binPath], { stdio: 'pipe' }) + + expect(proc.stderr).toBe('') +}) From 2b2012cf7838873bddc306475987fce366820128 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 16 Apr 2024 17:18:29 +0800 Subject: [PATCH 2/6] fix(#111): fix how unbuild bundles json --- build.config.ts | 5 +++++ src/cli.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.config.ts b/build.config.ts index 2294c2f..9ba940c 100644 --- a/build.config.ts +++ b/build.config.ts @@ -7,6 +7,11 @@ export default defineBuildConfig({ ], rollup: { inlineDependencies: true, + json: { + compact: true, + namedExports: false, + preferConst: true, + }, }, clean: true, declaration: true, diff --git a/src/cli.ts b/src/cli.ts index 59bd8ed..1f99d21 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -3,7 +3,7 @@ import type { Argv } from 'yargs' import yargs from 'yargs' import { hideBin } from 'yargs/helpers' import c from 'picocolors' -import { version } from '../package.json' +import pkgJson from '../package.json' import { check } from './commands/check' import { usage } from './commands/usage' import { resolveConfig } from './config' @@ -142,7 +142,7 @@ yargs(hideBin(process.argv)) ) .showHelpOnFail(false) .alias('h', 'help') - .version('version', version) + .version('version', pkgJson.version) .alias('v', 'version') .help() .argv From 109a70b6b79cdeb080a9194601b814f77e90aa5c Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 16 Apr 2024 17:32:37 +0800 Subject: [PATCH 3/6] chore: run build before test --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ccb3308..6563b87 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "typecheck": "tsc", "prepublishOnly": "nr build", "release": "bumpp && pnpm publish --no-git-checks", - "test": "vitest" + "test": "unbuild && vitest" }, "dependencies": { "@antfu/ni": "^0.21.12", From a9b084bd0b31c5a711a7e7fc85fe5a7cbefc42c4 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 16 Apr 2024 17:47:05 +0800 Subject: [PATCH 4/6] chore: fix `esmExternal` issue by also bundling `semver` --- build.config.ts | 3 +++ package.json | 2 +- pnpm-lock.yaml | 9 ++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build.config.ts b/build.config.ts index 9ba940c..749e375 100644 --- a/build.config.ts +++ b/build.config.ts @@ -12,6 +12,9 @@ export default defineBuildConfig({ namedExports: false, preferConst: true, }, + dts: { + respectExternal: false, + }, }, clean: true, declaration: true, diff --git a/package.json b/package.json index 6563b87..88e7391 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,6 @@ "execa": "^8.0.1", "picocolors": "^1.0.0", "prompts": "^2.4.2", - "semver": "^7.6.0", "ufo": "^1.5.3", "unconfig": "^0.3.13", "yargs": "^17.7.2" @@ -67,6 +66,7 @@ "npm-package-arg": "^11.0.2", "npm-registry-fetch": "^16.2.1", "rimraf": "^5.0.5", + "semver": "^7.6.0", "taze": "workspace:*", "typescript": "^5.4.5", "unbuild": "^2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 27f9299..4a294d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,9 +29,6 @@ importers: prompts: specifier: ^2.4.2 version: 2.4.2 - semver: - specifier: ^7.6.0 - version: 7.6.0 ufo: specifier: ^1.5.3 version: 1.5.3 @@ -102,6 +99,9 @@ importers: rimraf: specifier: ^5.0.5 version: 5.0.5 + semver: + specifier: ^7.6.0 + version: 7.6.0 taze: specifier: workspace:* version: 'link:' @@ -3447,6 +3447,7 @@ packages: engines: {node: '>=10'} dependencies: yallist: 4.0.0 + dev: true /magic-string@0.30.5: resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} @@ -4539,6 +4540,7 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 + dev: true /shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} @@ -5185,6 +5187,7 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + dev: true /yaml-eslint-parser@1.2.2: resolution: {integrity: sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==} From 97ed2befb9c8dd5d324c7396b5fc190a226dbaac Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 16 Apr 2024 17:58:47 +0800 Subject: [PATCH 5/6] chore: fix commonjs option --- build.config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.config.ts b/build.config.ts index 749e375..ff066a8 100644 --- a/build.config.ts +++ b/build.config.ts @@ -9,9 +9,12 @@ export default defineBuildConfig({ inlineDependencies: true, json: { compact: true, - namedExports: false, + namedExports: true, preferConst: true, }, + commonjs: { + requireReturnsDefault: 'auto', + }, dts: { respectExternal: false, }, From ed6c34aaf0513602cf8bafedda3b3596475919c6 Mon Sep 17 00:00:00 2001 From: SukkaW Date: Tue, 16 Apr 2024 18:03:52 +0800 Subject: [PATCH 6/6] chore: fix package.json bundling --- build.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.config.ts b/build.config.ts index ff066a8..e50e927 100644 --- a/build.config.ts +++ b/build.config.ts @@ -9,8 +9,8 @@ export default defineBuildConfig({ inlineDependencies: true, json: { compact: true, - namedExports: true, - preferConst: true, + namedExports: false, + preferConst: false, }, commonjs: { requireReturnsDefault: 'auto',