diff --git a/.gitignore b/.gitignore index ccf6c39be..90cb38612 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ node_modules/ yarn-error.log /hak/**/*.js /scripts/hak/**/*.js +.DS_Store diff --git a/package.json b/package.json index b7724057d..cfad8f6d3 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ "@types/minimist": "^1.2.1", "@types/node": "18.19.59", "@types/pacote": "^11.1.1", - "@types/tar": "^6.1.3", "@types/yargs": "^17.0.32", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", @@ -113,7 +112,7 @@ "pacote": "^20.0.0", "prettier": "^3.0.0", "rimraf": "^6.0.0", - "tar": "^6.2.1", + "tar": "^7.0.0", "ts-node": "^10.9.1", "typescript": "5.5.4" }, diff --git a/scripts/fetch-package.ts b/scripts/fetch-package.ts index e32dcbba8..087533db8 100644 --- a/scripts/fetch-package.ts +++ b/scripts/fetch-package.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { createWriteStream, promises as fs } from "fs"; import * as childProcess from "child_process"; -import tar from "tar"; +import * as tar from "tar"; import * as asar from "@electron/asar"; import fetch from "node-fetch"; import { promises as stream } from "stream"; diff --git a/yarn.lock b/yarn.lock index 550a4c169..32cc65c82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2124,14 +2124,6 @@ dependencies: "@types/node" "*" -"@types/tar@^6.1.3": - version "6.1.13" - resolved "https://registry.yarnpkg.com/@types/tar/-/tar-6.1.13.tgz#9b5801c02175344101b4b91086ab2bbc8e93a9b6" - integrity sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw== - dependencies: - "@types/node" "*" - minipass "^4.0.0" - "@types/verror@^1.10.3": version "1.10.10" resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.10.tgz#d5a4b56abac169bfbc8b23d291363a682e6fa087" @@ -5327,11 +5319,6 @@ minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.8.tgz#f0010f64393ecfc1d1ccb5f582bcaf45f48e1a3a" - integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== - minipass@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" @@ -6833,7 +6820,7 @@ tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2, tar@^6.2.1: mkdirp "^1.0.3" yallist "^4.0.0" -tar@^7.4.3: +tar@^7.0.0, tar@^7.4.3: version "7.4.3" resolved "https://registry.yarnpkg.com/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==