From b5e85e2d0a13e150752024ce9f96a68e7a2fd7bd Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Mon, 27 Jan 2025 19:56:01 +0100 Subject: [PATCH] refactor: revert tar upgrade back to v6 (#208) --- package.json | 2 +- pnpm-lock.yaml | 61 ++------------------------------------------------ src/giget.ts | 4 ++-- 3 files changed, 5 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index e7b6458..6b8f18e 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "nypm": "^0.5.0", "ohash": "^1.1.4", "pathe": "^2.0.2", - "tar": "^7.4.3" + "tar": "^6.2.1" }, "devDependencies": { "@types/node": "^22.10.10", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9253624..9ec689c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: ^2.0.2 version: 2.0.2 tar: - specifier: ^7.4.3 - version: 7.4.3 + specifier: ^6.2.1 + version: 6.2.1 devDependencies: '@types/node': specifier: ^22.10.10 @@ -494,10 +494,6 @@ packages: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} - '@isaacs/fs-minipass@4.0.1': - resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} - engines: {node: '>=18.0.0'} - '@istanbuljs/schema@0.1.3': resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==} engines: {node: '>=8'} @@ -933,10 +929,6 @@ packages: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} - chownr@3.0.0: - resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} - engines: {node: '>=18'} - ci-info@4.1.0: resolution: {integrity: sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==} engines: {node: '>=8'} @@ -1598,20 +1590,11 @@ packages: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} - minizlib@3.0.1: - resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} - engines: {node: '>= 18'} - mkdirp@1.0.4: resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} engines: {node: '>=10'} hasBin: true - mkdirp@3.0.1: - resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} - engines: {node: '>=10'} - hasBin: true - mkdist@2.2.0: resolution: {integrity: sha512-GfKwu4A2grXfhj2TZm4ydfzP515NaALqKaPq4WqaZ6NhEnD47BiIQPySoCTTvVqHxYcuqVkNdCXjYf9Bz1Y04Q==} hasBin: true @@ -2023,10 +2006,6 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rimraf@5.0.10: - resolution: {integrity: sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==} - hasBin: true - rollup-plugin-dts@6.1.1: resolution: {integrity: sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA==} engines: {node: '>=16'} @@ -2150,10 +2129,6 @@ packages: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} - tar@7.4.3: - resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} - engines: {node: '>=18'} - test-exclude@7.0.1: resolution: {integrity: sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==} engines: {node: '>=18'} @@ -2343,10 +2318,6 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yallist@5.0.0: - resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} - engines: {node: '>=18'} - yaml@2.7.0: resolution: {integrity: sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==} engines: {node: '>= 14'} @@ -2675,10 +2646,6 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 - '@isaacs/fs-minipass@4.0.1': - dependencies: - minipass: 7.1.2 - '@istanbuljs/schema@0.1.3': {} '@jridgewell/gen-mapping@0.3.8': @@ -3135,8 +3102,6 @@ snapshots: chownr@2.0.0: {} - chownr@3.0.0: {} - ci-info@4.1.0: {} citty@0.1.6: @@ -3845,15 +3810,8 @@ snapshots: minipass: 3.3.6 yallist: 4.0.0 - minizlib@3.0.1: - dependencies: - minipass: 7.1.2 - rimraf: 5.0.10 - mkdirp@1.0.4: {} - mkdirp@3.0.1: {} - mkdist@2.2.0(typescript@5.7.3): dependencies: autoprefixer: 10.4.20(postcss@8.5.1) @@ -4251,10 +4209,6 @@ snapshots: reusify@1.0.4: {} - rimraf@5.0.10: - dependencies: - glob: 10.4.5 - rollup-plugin-dts@6.1.1(rollup@4.31.0)(typescript@5.7.3): dependencies: magic-string: 0.30.17 @@ -4391,15 +4345,6 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 - tar@7.4.3: - dependencies: - '@isaacs/fs-minipass': 4.0.1 - chownr: 3.0.0 - minipass: 7.1.2 - minizlib: 3.0.1 - mkdirp: 3.0.1 - yallist: 5.0.0 - test-exclude@7.0.1: dependencies: '@istanbuljs/schema': 0.1.3 @@ -4609,8 +4554,6 @@ snapshots: yallist@4.0.0: {} - yallist@5.0.0: {} - yaml@2.7.0: {} yocto-queue@0.1.0: {} diff --git a/src/giget.ts b/src/giget.ts index 717e8e2..2c9d080 100644 --- a/src/giget.ts +++ b/src/giget.ts @@ -1,6 +1,6 @@ import { mkdir, rm } from "node:fs/promises"; import { existsSync, readdirSync } from "node:fs"; -import { extract } from "tar/extract"; +import { extract } from "tar"; import { resolve, dirname } from "pathe"; import { defu } from "defu"; import { installDependencies } from "nypm"; @@ -144,7 +144,7 @@ export async function downloadTemplate( await extract({ file: tarPath, cwd: extractPath, - onReadEntry(entry) { + onentry(entry) { entry.path = entry.path.split("/").splice(1).join("/"); if (subdir) { // eslint-disable-next-line unicorn/prefer-ternary