From 0f121fa7a703cc20dab789acc5f6ba0b2a29732f Mon Sep 17 00:00:00 2001 From: Craig Morten Date: Mon, 15 Jan 2024 10:58:22 +0000 Subject: [PATCH] feat: allow custom nvda install directory (#26) --- .github/CODEOWNERS.md | 1 + .github/CONTRIBUTING.md | 41 +++++++ .github/ISSUE_TEMPLATE.md | 11 ++ .github/PULL_REQUEST_TEMPLATE.md | 11 ++ .github/workflows/test.yml | 19 +++ CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++ README.md | 82 +++++++------ SECURITY.md | 43 +++++++ package.json | 2 + src/macOS/enableDoNotDisturb.ts | 50 ++++---- src/macOS/record.ts | 32 ------ src/macOS/runAppleScript.ts | 6 +- src/macOS/setup.ts | 10 +- src/windows/getNvdaRegistryData.ts | 2 +- src/windows/installNvda.ts | 15 ++- src/windows/isNvdaInstalled.ts | 19 ++- src/windows/setup.ts | 15 ++- yarn.lock | 179 ++++++++++++++++++++++++++++- 18 files changed, 564 insertions(+), 102 deletions(-) create mode 100644 .github/CODEOWNERS.md create mode 100644 .github/CONTRIBUTING.md create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 CODE_OF_CONDUCT.md create mode 100644 SECURITY.md delete mode 100644 src/macOS/record.ts diff --git a/.github/CODEOWNERS.md b/.github/CODEOWNERS.md new file mode 100644 index 0000000..b71c6aa --- /dev/null +++ b/.github/CODEOWNERS.md @@ -0,0 +1 @@ +* @cmorten diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..c2c149a --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,41 @@ +# Contributing to this repository + +First of all, thanks for taking the time to read this document and contributing to our codebase! + +## Getting started + +If you're working on an existing issue then awesome! Let us know by dropping a comment in the issue. + +If it's a new bug fix or feature that you would like to contribute, then please raise an issue so it can be tracked (and to help out others who are experiencing the same issue / want the new thing know that it's being looked at!). Be sure to check for existing issues before raising your own! + +## Working on your feature + +### Branching + +On this project we follow mainline development (or trunk based development), and our default branch is `main`. + +Therefore you need to branch from `main` and merge into `main`. + +### Coding style + +Generally try to match the style and conventions of the code around your changes. Ultimately we want code that is clear, concise, consistent and easy to read. + +We use `eslint` and `prettier` for linting. You can check and correct the code style using the following commands: + +```console +# Check linting +yarn lint + +# Fix linting +yarn lint:fix +``` + +## Opening a PR + +Once you're confident your branch is ready to review, open a PR against `main` on this repo. + +Please use the PR template as a guide, but if your change doesn't quite fit it, feel free to customize. + +## Merging and publishing + +When your feature branch / PR has been tested and has an approval, it is then ready to merge. Please contact a maintainer to action the merge. diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2c0b1bb --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,11 @@ +# Issue + +Setup: + +- NPM version: +- OS Platform: +- OS Release: + +## Details + +> Please replace this quote block with the details of the feature / bug you wish to be addressed. If it is a bug please do your best to add steps to reproduce. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..e28ba30 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,11 @@ +# Issue + +Fixes #. + +## Details + +> Please replace this quote block with a brief summary of PR purpose and code changes. + +## CheckList + +- [ ] Has been tested (where required). diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6a7ed99..1402527 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,3 +27,22 @@ jobs: name: artifacts path: | **/recordings/**/* + test-nvda-install-dir: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-2019, windows-2022] + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 18 + - run: yarn install --frozen-lockfile + - run: yarn ci:nvda-install-dir + - run: Get-ChildItem $env:USERPROFILE\nvda + - uses: actions/upload-artifact@v3 + if: always() + with: + name: artifacts + path: | + **/recordings/**/* diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..7c174dd --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +- Demonstrating empathy and kindness toward other people +- Being respectful of differing opinions, viewpoints, and experiences +- Giving and gracefully accepting constructive feedback +- Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +- Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +- The use of sexualized language or imagery, and sexual attention or + advances of any kind +- Trolling, insulting or derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or email + address, without their explicit permission +- Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +. All complaints will be reviewed and investigated promptly +and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +. Translations are available at +. diff --git a/README.md b/README.md index 2ef22b9..80465d4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,21 @@ -

Guidepup Setup

-

- Setup your environment for screen reader test automation. -

-

- Guidepup Setup available on NPM - Guidepup available on NPM - Guidepup Setup test workflows - Guidepup Setup uses the MIT license -

+# Guidepup Setup + +Guidepup Setup available on NPM +Guidepup Setup test workflows +Guidepup Setup uses the MIT license + +## [Documentation](https://www.guidepup.dev/docs/guides/automated-environment-setup) + +[![MacOS Big Sur Support](https://img.shields.io/badge/macos-Big_Sur-blue.svg?logo=apple)](https://apps.apple.com/id/app/macos-big-sur/id1526878132) +[![MacOS Monetary Support](https://img.shields.io/badge/macos-Monetary-blue.svg?logo=apple)](https://apps.apple.com/us/app/macos-monterey/id1576738294) +[![MacOS Ventura Support](https://img.shields.io/badge/macos-Ventura-blue.svg?logo=apple)](https://apps.apple.com/us/app/macos-ventura/id1638787999) +[![Windows 10 Support](https://img.shields.io/badge/windows-10-blue.svg?logo=windows10)](https://www.microsoft.com/en-gb/software-download/windows10ISO) +[![Windows Server 2019 Support](https://img.shields.io/badge/windows_server-2019-blue.svg?logo=windows)](https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2019) +[![Windows Server 2022 Support](https://img.shields.io/badge/windows_server-2022-blue.svg?logo=windows)](https://www.microsoft.com/en-us/evalcenter/evaluate-windows-server-2022) + +This package sets up your environment for screen reader automation. + +It enables automation for VoiceOver on MacOS and NVDA on Windows. ## Getting Started @@ -17,17 +25,11 @@ Run this command: npx @guidepup/setup ``` -And get cracking with your screen reader test automation code! +And get cracking with your screen reader automation code! ## Usage -If you are running this command locally, you might find it prompts you to pass in credentials so that it can using UI automation to change a checkbox value which enables the automation of VoiceOver. If you are uncomfortable with providing your credentials you can manually achieve these steps by following the [manual VoiceOver setup documentation](https://www.guidepup.dev/docs/guides/manual-voiceover-setup). - -If you are running this command in CI/CD, it is recommended to add the `--ci` flag to prevent interactive prompts: - -```console -npx @guidepup/setup --ci -``` +### GitHub Actions If you are using GitHub Actions, check out the dedicated [`guidepup/setup-action`](https://github.com/marketplace/actions/guidepup-setup): @@ -36,21 +38,35 @@ If you are using GitHub Actions, check out the dedicated [`guidepup/setup-action uses: guidepup/setup-action ``` +### MacOS + +If you are running this command locally, you might find it prompts you to pass in credentials so that it can using UI automation to change a checkbox value which enables the automation of VoiceOver. If you are uncomfortable with providing your credentials you can manually achieve these steps by following the [manual VoiceOver setup documentation](https://www.guidepup.dev/docs/guides/manual-voiceover-setup). + +If you are running this command in CI/CD, it is recommended to add the `--ci` flag to prevent interactive prompts: + +```console +npx @guidepup/setup --ci +``` + If you are encountering errors in CI for MacOS you can pass a `--record` flag to the command which will output a screen-recording of the setup to a `./recordings/` directory: ```console npx @guidepup/setup --ci --record ``` -Check out the [Documentation Website](https://www.guidepup.dev/docs/guides/environment) for more information. +### Windows -## Windows - -### NVDA Installation +#### NVDA Installation When running on windows a portable NVDA instance compatible with Guidepup will be installed to a temporary directory. The location of this installation directory is stored in the Windows registry under the key `HKCU\Software\Guidepup\Nvda`. -### Foreground Timeout Lock +If you want to specify the directory that NVDA is installed to you can pass a `--nvda-install-dir` flag to the command: + +```console +npx @guidepup/setup --nvda-install-dir +``` + +#### Foreground Timeout Lock Modern versions of Windows have a setting which prevents new application instances launching in front of other applications in quick succession, requiring over 3 minutes between activations before it will actually show the window - in the interim it launches the window minimized. @@ -63,18 +79,18 @@ To mitigate this the setup script updates two keys in the Windows registry under Both of these are set to `0` by the setup script. -## See Also +## Powerful Tooling Check out some of the other Guidepup modules: -- [`@guidepup/guidepup`](https://github.com/guidepup/guidepup/) -- [`@guidepup/playwright`](https://github.com/guidepup/guidepup-playwright/) - -## Support - -- VoiceOver on MacOS -- NVDA on Windows +- [`@guidepup/guidepup`](https://github.com/guidepup/guidepup/) - Reliable automation for your screen reader a11y workflows through JavaScript supporting VoiceOver and NVDA. +- [`@guidepup/playwright`](https://github.com/guidepup/guidepup-playwright/) - Seemless integration of Guidepup with Playwright. +- [`@guidepup/virtual-screen-reader`](https://github.com/guidepup/virtual-screen-reader/) - Reliable unit testing for your screen reader a11y workflows. +- [`@guidepup/jest`](https://github.com/guidepup/jest/) - Jest matchers for reliable unit testing of your screen reader a11y workflows. -## License +## Resources -[MIT](https://github.com/guidepup/setup/blob/main/LICENSE) +- [Documentation](https://www.guidepup.dev/docs/guides/automated-environment-setup) +- [Contributing](.github/CONTRIBUTING.md) +- [Changelog](https://github.com/guidepup/setup/releases) +- [MIT License](https://github.com/guidepup/setup/blob/main/LICENSE) diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..3885474 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,43 @@ +# Security Policies and Procedures + +This document outlines security procedures and general policies for the Guidepup +project. + +- [Reporting a Bug](#reporting-a-bug) +- [Disclosure Policy](#disclosure-policy) +- [Comments on this Policy](#comments-on-this-policy) + +## Reporting a Bug + +The Guidepup maintainers and community take all security bugs in Guidepup seriously. +Thank you for improving the security of Guidepup. We appreciate your efforts and +responsible disclosure and will make every effort to acknowledge your +contributions. + +Report security bugs by emailing the lead maintainer in the +[CODEOWNERS](.github/CODEOWNERS.md) file. + +The lead maintainer will acknowledge your email, and will send a response +indicating the next steps in handling your report. After the initial reply +to your report, the maintainer team will endeavor to keep you informed of the +progress towards a fix and full announcement, and may ask for additional +information or guidance. + +Report security bugs in third-party modules to the person or team maintaining +the module. + +## Disclosure Policy + +When the maintainer team receives a security bug report, they will assign it to a +primary handler. This person will coordinate the fix and release process, +involving the following steps: + +- Confirm the problem and determine the affected versions. +- Audit code to find any potential similar problems. +- Prepare fixes for all releases still under maintenance. These fixes will be + released as fast as possible to GitHub. + +## Comments on this Policy + +If you have suggestions on how this process could be improved please submit a +pull request. diff --git a/package.json b/package.json index 11bd18f..c31f6d9 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "scripts": { "build": "yarn clean && yarn compile", "ci": "yarn clean && yarn lint && yarn build && yarn resolutionFix && yarn start --ci --record", + "ci:nvda-install-dir": "yarn clean && yarn lint && yarn build && yarn resolutionFix && yarn start --ci --record --nvda-install-dir %userprofile%\\nvda", "clean": "rimraf lib", "compile": "tsc", "dev": "ts-node ./src/index.ts", @@ -47,6 +48,7 @@ "typescript": "^4.9.4" }, "dependencies": { + "@guidepup/guidepup": "^0.22.0", "chalk": "^4.0.0", "decompress": "^4.2.1", "inquirer": "^8.2.0", diff --git a/src/macOS/enableDoNotDisturb.ts b/src/macOS/enableDoNotDisturb.ts index 2adb728..97ade93 100644 --- a/src/macOS/enableDoNotDisturb.ts +++ b/src/macOS/enableDoNotDisturb.ts @@ -48,33 +48,39 @@ delay 1 set timeoutSeconds to 30.0 set command to " + -- Open Control Center drop down tell application \\"System Events\\" - tell its application process \\"Control ${center}\\" - -- Click on and open Control ${center} drop down - tell its menu bar 1 - tell (UI elements whose description is \\"Control ${center}\\") - click - end tell - end tell - - -- Check if Do Not Disturb already enabled - set doNotDisturbCheckbox to checkbox 2 of group 1 of window \\"Control ${center}\\" - set doNotDisturbCheckboxStatus to value of doNotDisturbCheckbox as boolean - - tell doNotDisturbCheckbox - if doNotDisturbCheckboxStatus is false then - perform action 1 of doNotDisturbCheckbox - end if - end tell + key down 63 + key down \\"c\\" + delay 0.5 + key up \\"c\\" + key up 63 + end tell - -- Click on and close Control ${center} drop down - tell its menu bar 1 - tell (UI elements whose description is \\"Control ${center}\\") - click - end tell + tell application \\"System Events\\" + tell its application process \\"Control ${center}\\" + tell its window 1 + -- Check if Do Not Disturb already enabled + set doNotDisturbCheckbox to checkbox 2 of group 1 + set doNotDisturbCheckboxStatus to value of doNotDisturbCheckbox as boolean + + tell doNotDisturbCheckbox + if doNotDisturbCheckboxStatus is false then + perform action 1 of doNotDisturbCheckbox + end if + end tell end tell end tell end tell + + -- Close Control Center drop down + tell application \\"System Events\\" + key down 63 + key down \\"c\\" + delay 0.5 + key up \\"c\\" + key up 63 + end tell " my withTimeout(command, timeoutSeconds) diff --git a/src/macOS/record.ts b/src/macOS/record.ts deleted file mode 100644 index e4abf9b..0000000 --- a/src/macOS/record.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { mkdirSync, unlinkSync } from "fs"; -import { dirname } from "path"; -import { spawn } from "child_process"; - -/** - * Start a screen recording. - * - * @param {string} filepath The file path to save the screen recording to. - * @returns {Function} A function to stop the screen recording. - */ -export function record(filepath: string): () => void { - mkdirSync(dirname(filepath), { recursive: true }); - - try { - unlinkSync(filepath); - } catch (_) { - // file doesn't exist. - } - - const screencapture = spawn("/usr/sbin/screencapture", [ - "-v", - "-C", - "-k", - "-T0", - "-g", - filepath, - ]); - - return () => { - screencapture.stdin.write("q"); - }; -} diff --git a/src/macOS/runAppleScript.ts b/src/macOS/runAppleScript.ts index 3521124..8792e17 100644 --- a/src/macOS/runAppleScript.ts +++ b/src/macOS/runAppleScript.ts @@ -38,9 +38,9 @@ end doWithTimeout { maxBuffer: DEFAULT_MAX_BUFFER, }, - (e, stdout) => { - if (e) { - return reject(e); + (error, stdout) => { + if (error) { + return reject(error); } if (!stdout) { diff --git a/src/macOS/setup.ts b/src/macOS/setup.ts index ae31d38..3212323 100644 --- a/src/macOS/setup.ts +++ b/src/macOS/setup.ts @@ -1,3 +1,5 @@ +import { platform, release } from "os"; +import { macOSRecord } from "@guidepup/guidepup"; import { checkVersion } from "./checkVersion"; import { enableAppleScriptControlSystemDefaults } from "./enableAppleScriptControlSystemDefaults"; import { disableSplashScreenSystemDefaults } from "./disableSplashScreenSystemDefaults"; @@ -11,7 +13,6 @@ import { setVoiceOverEnabledViaUi } from "./setVoiceOverEnabledViaUi"; import { logInfo } from "../logging"; import { ERR_MACOS_REQUIRES_MANUAL_USER_INTERACTION } from "../errors"; import { enableDoNotDisturb } from "./enableDoNotDisturb"; -import { record } from "./record"; import { enabledDbFile } from "./isAppleScriptControlEnabled/enabledDbFile"; const isCi = process.argv.includes("--ci"); @@ -32,8 +33,13 @@ export async function setup(): Promise { // Swallow error - most CI don't allow system configuration } + const osName = platform(); + const osVersion = release(); + const stopRecording = isRecorded - ? record(`./recordings/macos-setup-${+new Date()}.mov`) + ? macOSRecord( + `./recordings/macos-guidepup-setup-${osName}-${osVersion}-${+new Date()}.mov` + ) : () => null; try { diff --git a/src/windows/getNvdaRegistryData.ts b/src/windows/getNvdaRegistryData.ts index 7ce5368..533f4be 100644 --- a/src/windows/getNvdaRegistryData.ts +++ b/src/windows/getNvdaRegistryData.ts @@ -12,4 +12,4 @@ export async function getNvdaRegistryData() { } catch (e) { throw new Error(`${ERR_WINDOWS_UNABLE_TO_ACCESS_REGISTRY}\n\n${e.message}`); } -} \ No newline at end of file +} diff --git a/src/windows/installNvda.ts b/src/windows/installNvda.ts index c0e4284..e46e751 100644 --- a/src/windows/installNvda.ts +++ b/src/windows/installNvda.ts @@ -1,6 +1,6 @@ import decompress from "decompress"; import { get } from "https"; -import { createWriteStream, mkdtempSync, rmSync } from "fs"; +import { createWriteStream, mkdirSync, mkdtempSync, rmSync } from "fs"; import { join } from "path"; import { tmpdir } from "os"; import { ERR_WINDOWS_FAILED_TO_INSTALL_NVDA } from "../errors"; @@ -9,8 +9,17 @@ import { GUIDEPUP_NVDA_VERSION } from "./constants"; const appName = "guidepup_nvda"; const sourceUrl = `https://codeload.github.com/guidepup/nvda/zip/refs/tags/${GUIDEPUP_NVDA_VERSION}`; -export async function installNvda(): Promise { - const destinationBaseDirectory = mkdtempSync(join(tmpdir(), `${appName}_`)); +export async function installNvda({ + userProvidedInstallDirectory, +}: { + userProvidedInstallDirectory: string; +}): Promise { + if (userProvidedInstallDirectory) { + mkdirSync(userProvidedInstallDirectory, { recursive: true }); + } + + const destinationBaseDirectory = + userProvidedInstallDirectory ?? mkdtempSync(join(tmpdir(), `${appName}_`)); const destinationZip = join(destinationBaseDirectory, `${appName}.zip`); const fileZip = createWriteStream(destinationZip); diff --git a/src/windows/isNvdaInstalled.ts b/src/windows/isNvdaInstalled.ts index ec048e9..c2b67a6 100644 --- a/src/windows/isNvdaInstalled.ts +++ b/src/windows/isNvdaInstalled.ts @@ -1,16 +1,31 @@ import { existsSync } from "fs"; import { VERSIONED_KEY } from "./constants"; +import { RegistryItemValue } from "regedit"; -export function isNvdaInstalled({ exists, values }) { +export function isNvdaInstalled({ + exists, + userProvidedInstallDirectory, + values, +}: { + exists: boolean; + userProvidedInstallDirectory: string | null; + values: { + [name: string]: RegistryItemValue; + }; +}) { if (!exists) { return false; } - const path = values[VERSIONED_KEY]?.value; + const path = values[VERSIONED_KEY]?.value as string; if (!path) { return false; } + if (userProvidedInstallDirectory !== path) { + return false; + } + return existsSync(path); } diff --git a/src/windows/setup.ts b/src/windows/setup.ts index 295c8db..f4cb484 100644 --- a/src/windows/setup.ts +++ b/src/windows/setup.ts @@ -5,11 +5,22 @@ import { installNvda } from "./installNvda"; import { updateNvdaRegistryData } from "./updateNvdaRegistryData"; import { removeForegroundLock } from "./removeForegroundLock"; import { restartExplorer } from "./restartExplorer"; +import { resolve } from "path"; export async function setup(): Promise { + const userProvidedInstallDirectoryFlagIndex = + process.argv.indexOf("--nvda-install-dir"); + const userProvidedInstallDirectoryRaw = + userProvidedInstallDirectoryFlagIndex > -1 + ? process.argv.at(userProvidedInstallDirectoryFlagIndex + 1) ?? null + : null; + const userProvidedInstallDirectory = userProvidedInstallDirectoryRaw + ? resolve(userProvidedInstallDirectoryRaw) + : null; + const { exists, values } = await getNvdaRegistryData(); - if (isNvdaInstalled({ exists, values })) { + if (isNvdaInstalled({ exists, userProvidedInstallDirectory, values })) { return; } @@ -17,7 +28,7 @@ export async function setup(): Promise { await createNvdaRegistryKey(); } - const nvdaDirectory = await installNvda(); + const nvdaDirectory = await installNvda({ userProvidedInstallDirectory }); await updateNvdaRegistryData({ nvdaDirectory }); await removeForegroundLock(); diff --git a/yarn.lock b/yarn.lock index 6a64aa1..cfde9d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,6 +9,16 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" +"@derhuerst/http-basic@^8.2.0": + version "8.2.4" + resolved "https://registry.yarnpkg.com/@derhuerst/http-basic/-/http-basic-8.2.4.tgz#d021ebb8f65d54bea681ae6f4a8733ce89e7f59b" + integrity sha512-F9rL9k9Xjf5blCz8HsJRO4diy111cayL2vkY2XE4r4t3n0yPXVYy3KD3nJ1qbrSn9743UWSXH4IwuCa/HWlGFw== + dependencies: + caseless "^0.12.0" + concat-stream "^2.0.0" + http-response-object "^3.0.1" + parse-cache-control "^1.0.1" + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -41,6 +51,16 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b" integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng== +"@guidepup/guidepup@^0.22.0": + version "0.22.0" + resolved "https://registry.yarnpkg.com/@guidepup/guidepup/-/guidepup-0.22.0.tgz#f3fc757c1f40dcf8920027c5dfeff2486a589686" + integrity sha512-AOXe7WaFdeY3Dwr/CKrq0aS6TAor9Jq8nz550i740z9yD3DqpJkEW4hYoU5HinbsMNGK2Iqzv5AcFfJixEiPoQ== + dependencies: + ffmpeg-static "^5.2.0" + regedit "5.1.2" + semver "^7.3.8" + shelljs "^0.8.5" + "@humanwhocodes/config-array@^0.11.8": version "0.11.8" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" @@ -124,6 +144,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== +"@types/node@^10.0.3": + version "10.17.60" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b" + integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw== + "@types/node@^18.11.18": version "18.16.3" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.3.tgz#6bda7819aae6ea0b386ebc5b24bdf602f1b42b01" @@ -238,6 +263,13 @@ acorn@^8.8.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -354,6 +386,11 @@ buffer-fill@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + buffer@^5.2.1, buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -367,6 +404,11 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +caseless@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== + chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -424,6 +466,16 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concat-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" + integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.0.2" + typedarray "^0.0.6" + core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -443,7 +495,7 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -546,6 +598,11 @@ end-of-stream@^1.0.0: dependencies: once "^1.4.0" +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -715,6 +772,16 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +ffmpeg-static@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/ffmpeg-static/-/ffmpeg-static-5.2.0.tgz#6ca64a5ed6e69ec4896d175c1f69dd575db7c5ef" + integrity sha512-WrM7kLW+do9HLr+H6tk7LzQ7kPqbAgLjdzNE32+u3Ff11gXt9Kkkd2nusGFrlWMIe+XaA97t+I8JS7sZIrvRgA== + dependencies: + "@derhuerst/http-basic" "^8.2.0" + env-paths "^2.2.0" + https-proxy-agent "^5.0.0" + progress "^2.0.3" + figures@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -782,6 +849,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + get-stream@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" @@ -804,7 +876,7 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^7.1.3: +glob@^7.0.0, glob@^7.1.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -860,6 +932,28 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +hasown@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" + integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== + dependencies: + function-bind "^1.1.2" + +http-response-object@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/http-response-object/-/http-response-object-3.0.2.tgz#7f435bb210454e4360d074ef1f989d5ea8aa9810" + integrity sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA== + dependencies: + "@types/node" "^10.0.3" + +https-proxy-agent@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -929,6 +1023,18 @@ inquirer@^8.2.0: through "^2.3.6" wrap-ansi "^7.0.0" +interpret@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== + +is-core-module@^2.13.0: + version "2.13.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" + integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw== + dependencies: + hasown "^2.0.0" + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -1204,6 +1310,11 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" +parse-cache-control@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz#8eeab3e54fa56920fe16ba38f77fa21aacc2d74e" + integrity sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg== + path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -1219,6 +1330,11 @@ path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + path-scurry@^1.6.1: version "1.7.0" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.7.0.tgz#99c741a2cfbce782294a39994d63748b5a24f6db" @@ -1274,6 +1390,11 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + punycode@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" @@ -1307,6 +1428,15 @@ readable-stream@^2.3.0, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@^3.0.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readable-stream@^3.4.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" @@ -1316,6 +1446,13 @@ readable-stream@^3.4.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +rechoir@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw== + dependencies: + resolve "^1.1.6" + regedit@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/regedit/-/regedit-5.0.1.tgz#e55cf93fc70133d6d4ba849a2d4ead22a5075220" @@ -1326,11 +1463,30 @@ regedit@5.0.1: stream-slicer "0.0.6" through2 "^0.6.3" +regedit@5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/regedit/-/regedit-5.1.2.tgz#51728e0cfd7bbba95d7ab09c227aeb1174abb4e1" + integrity sha512-pQpWqO/I40bMNoMO9kTQx3e5iK542kYcB/Z8X3Y7Hcri6ydc4KZ9ByUsEWFkBRMcwo+2irHuNK5s+pMGPr6VPw== + dependencies: + debug "^4.1.0" + if-async "^3.7.4" + stream-slicer "0.0.6" + through2 "^0.6.3" + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve@^1.1.6: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -1418,6 +1574,15 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +shelljs@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" + integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== + dependencies: + glob "^7.0.0" + interpret "^1.0.0" + rechoir "^0.6.2" + signal-exit@^3.0.2: version "3.0.6" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" @@ -1487,6 +1652,11 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + tar-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" @@ -1590,6 +1760,11 @@ type-fest@^0.21.3: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== + typescript@^4.9.4: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"