diff --git a/.github/actions/idf/Dockerfile b/.github/actions/idf/Dockerfile deleted file mode 100644 index 6a6de4aa0..000000000 --- a/.github/actions/idf/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM espressif/idf:release-v4.4 - -ARG DEBIAN_FRONTEND=nointeractive - -RUN apt-get update && apt-get install -y \ - curl \ - libasound2 \ - libgbm-dev \ - libgtk-3-0 \ - libnotify4 \ - libnss3 \ - libsecret-1-0 \ - libxss1 \ - libxtst6 \ - gnome-keyring \ - xvfb - -ENV LC_ALL=C.UTF-8 -ENV LANG=C.UTF-8 -ENV DISPLAY=":99" -ENV CODE_TESTS_PATH="out/test" -ENV CODE_VERSION="min" - -ENV NVM_DIR /usr/local/nvm -RUN mkdir -p $NVM_DIR -RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash -ENV NODE_VERSION v18.19.1 -RUN . "${NVM_DIR}/nvm.sh" && nvm install ${NODE_VERSION} && nvm use --delete-prefix ${NODE_VERSION} - -ENV NODE_PATH $NVM_DIR/versions/node/$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/versions/node/$NODE_VERSION/bin:$PATH -RUN node --version -RUN npm --version -RUN npm install --global typescript yarn - -ADD entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ADD ui-entrypoint.sh /ui-entrypoint.sh -RUN chmod +x /ui-entrypoint.sh - - -ENTRYPOINT ["/bin/bash"] -CMD ["/entrypoint.sh"] \ No newline at end of file diff --git a/.github/actions/idf/action.yml b/.github/actions/idf/action.yml deleted file mode 100644 index 778802bba..000000000 --- a/.github/actions/idf/action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: "ESP-IDF" -description: "run tests on ESP-IDF docker image" - -inputs: - run: - description: "command for docker image" - required: true - default: /entrypoint.sh -outputs: - result: - description: "Docker test output" - uiresult: - description: "UI test output" - -runs: - using: "docker" - image: "Dockerfile" - args: - - ${{ inputs.run }} diff --git a/.github/actions/idf/entrypoint.sh b/.github/actions/idf/entrypoint.sh deleted file mode 100644 index 84a59870c..000000000 --- a/.github/actions/idf/entrypoint.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -set -e - -export OLD_PATH=$PATH - -. $IDF_PATH/export.sh - -cd /github/workspace - -pip install --upgrade pip -pip install --constraint espidf.constraints.txt -r esp_debug_adapter/requirements.txt - -export GIT_VERSION=$( echo "$a" | echo $(git --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export IDF_VERSION=$( echo "$a" | echo $(idf.py --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export PY_VERSION=$( echo "$a" | echo $(python --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export PIP_VERSION=$( echo "$a" | echo $(python -m pip --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export PY_PKGS=$(python -m pip list --format json) - -yarn -yarn lint -Xvfb -ac :99 -screen 0 1920x1080x16 & sleep 2 & yarn test -EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) -echo "result<<$EOF" >> $GITHUB_OUTPUT -echo "$(cat ./out/results/test-results.xml)" >> $GITHUB_OUTPUT -echo "$EOF" >> $GITHUB_OUTPUT - -rm -r .vscode-test \ No newline at end of file diff --git a/.github/actions/idf/ui-entrypoint.sh b/.github/actions/idf/ui-entrypoint.sh deleted file mode 100644 index 01b981e33..000000000 --- a/.github/actions/idf/ui-entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -set -e - -export OLD_PATH=$PATH - -. $IDF_PATH/export.sh - -cd /github/workspace - -pip install --upgrade pip -pip install --constraint espidf.constraints.txt -r esp_debug_adapter/requirements.txt - -export GIT_VERSION=$( echo "$a" | echo $(git --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export IDF_VERSION=$( echo "$a" | echo $(idf.py --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export PY_VERSION=$( echo "$a" | echo $(python --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export PIP_VERSION=$( echo "$a" | echo $(python -m pip --version) | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') -export PY_PKGS=$(python -m pip list --format json) - -rm -rf node_modules out test-resources -yarn -yarn lint -Xvfb -ac :99 -screen 0 1920x1080x16 & sleep 2 & yarn ci-test diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 544df910f..7f2a6736f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,29 +16,45 @@ jobs: - uses: actions/checkout@v4 with: submodules: "recursive" - - uses: actions/setup-node@v4 + + - name: Install ESP-IDF + uses: espressif/install-esp-idf-action@v1 with: - node-version: 20 + version: "v5.4.2" - - name: Install Node Dependencies - run: yarn + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: 20 - - name: Lint Check - run: yarn lint + - name: Install Yarn dependencies + run: | + yarn + yarn install - - name: Run test - uses: ./.github/actions/idf - id: idftest + - name: Run Yarn script with xvfb + run: | + export GIT_VERSION=$(git --version | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') + export IDF_VERSION=$(idf.py --version | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') + export PY_VERSION=$(python --version | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') + export PIP_VERSION=$(python -m pip --version | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p') + export PY_PKGS=$(python -m pip list --format json) + xvfb-run --auto-servernum yarn test - - name: Get the test output - run: echo "${{ steps.idftest.outputs.result }}" | tee test-result.xml + - name: Publish Test Report + uses: dorny/test-reporter@v2 + if: always() + with: + name: Mocha Tests + path: ./out/results/test-results.json + reporter: mocha-json - name: Upload if failed test results uses: actions/upload-artifact@v4 if: failure() with: - name: test-result.xml - path: test-result.xml + name: test-result.json + path: ./out/results/test-results.json - name: Package .vsix run: yarn package diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 5d27eb9ea..13cbd2576 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -18,15 +18,9 @@ jobs: submodules: "recursive" - name: Install ESP-IDF - run: | - ESP_IDF_VERSION="v5.3.2" - sudo apt update - sudo apt install -y python3-pip git wget flex bison gperf python3-venv cmake ninja-build ccache libffi-dev libssl-dev dfu-util - wget https://dl.espressif.com/github_assets/espressif/esp-idf/releases/download/${ESP_IDF_VERSION}/esp-idf-${ESP_IDF_VERSION}.zip -O esp-idf.zip - unzip esp-idf.zip -d ~/ - rm esp-idf.zip - mv ~/esp-idf-${ESP_IDF_VERSION} ~/esp-idf - ~/esp-idf/install.sh + uses: espressif/install-esp-idf-action@v1 + with: + version: "v5.4.2" - name: Setup Node.js uses: actions/setup-node@v4 @@ -40,9 +34,92 @@ jobs: - name: Run Yarn script with xvfb run: | - export IDF_TOOLS_PATH=~/.espressif - export IDF_PATH=~/esp-idf - source ~/esp-idf/export.sh && xvfb-run --auto-servernum yarn ci-test + xvfb-run --auto-servernum yarn ci-test 2>&1 | tee test-output.log + + # Extract JSON from the output and save to file + echo "Extracting JSON from test output..." + if grep -q "Extension 'espressif.esp-idf-extension' was successfully uninstalled!" test-output.log; then + sed -n '/Extension '\''espressif.esp-idf-extension'\'' was successfully uninstalled!/,$p' test-output.log > after-uninstall.log + grep -n '{' after-uninstall.log | head -1 | cut -d: -f1 > start-line.txt + grep -n '}' after-uninstall.log | tail -1 | cut -d: -f1 > end-line.txt + if [ -s start-line.txt ] && [ -s end-line.txt ]; then + start_line=$(cat start-line.txt) + end_line=$(cat end-line.txt) + sed -n "${start_line},${end_line}p" after-uninstall.log > ./out/ui-test-results.json + sed 's/}[^,]*$/}/' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/INFO:/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/Screenshots of failures can be found in:/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/\x1b\[/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/\[33m/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/\[0m/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/test-resources\/screenshots\//d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + echo "JSON results extracted and saved to ./out/ui-test-results.json" + echo "Debug: Last 10 lines of the JSON file:" + tail -10 ./out/ui-test-results.json + else + echo "Could not find JSON boundaries" + fi + rm -f after-uninstall.log start-line.txt end-line.txt ./out/temp.json + else + echo "Uninstall message not found, trying to extract JSON from entire output..." + if grep -q '{' test-output.log; then + grep -n '{' test-output.log | head -1 | cut -d: -f1 > start-line.txt + grep -n '}' test-output.log | tail -1 | cut -d: -f1 > end-line.txt + if [ -s start-line.txt ] && [ -s end-line.txt ]; then + start_line=$(cat start-line.txt) + end_line=$(cat end-line.txt) + sed -n "${start_line},${end_line}p" test-output.log > ./out/ui-test-results.json + sed 's/}[^,]*$/}/' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/INFO:/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/Screenshots of failures can be found in:/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/\x1b\[/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/\[33m/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/\[0m/d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + sed '/test-resources\/screenshots\//d' ./out/ui-test-results.json > ./out/temp.json && mv ./out/temp.json ./out/ui-test-results.json + echo "JSON results extracted and saved to ./out/ui-test-results.json" + echo "Debug: Last 10 lines of the JSON file:" + tail -10 ./out/ui-test-results.json + else + echo "Could not find JSON boundaries" + fi + rm -f start-line.txt end-line.txt ./out/temp.json + else + echo "No JSON found in test output" + fi + fi + + - name: Print UI Test Results + run: | + echo "=== UI Test Results ===" + if [ -f "./out/ui-test-results.json" ]; then + echo "UI Test Results:" + cat ./out/ui-test-results.json | jq '.' || echo "Could not parse UI test results" + elif [ -f "./test-results.json" ]; then + echo "UI Test Results:" + cat ./test-results.json | jq '.' || echo "Could not parse UI test results" + else + echo "No UI test results file found" + echo "Checking for other test output files:" + find . -name "*test*results*" -o -name "*ui-test-results.json*" | head -10 + fi + + - name: Publish UI Test Report + uses: dorny/test-reporter@v2 + if: always() + with: + name: UI Tests + path: ./out/ui-test-results.json + reporter: mocha-json + + - name: Upload UI test results + uses: actions/upload-artifact@v4 + if: always() + with: + name: ui-test-results + path: | + ./out/ui-test-results.json + ./test-resources/screenshots/ + test-output.log - name: Upload screenshots uses: actions/upload-artifact@v4 diff --git a/.gitignore b/.gitignore index 258971fdd..ab8685cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ testFiles/blink !testFiles/dist testFiles/tools testFiles/testWorkspace/build -testFiles/testWorkspace/sdkconfig.* +testFiles/testWorkspace/sdkconfig* *.log .DS_Store bandit_output.txt diff --git a/README.md b/README.md index d5fea4b95..32e1e60b4 100644 --- a/README.md +++ b/README.md @@ -39,31 +39,19 @@ Make sure to review our [Espressif documentation](https://docs.espressif.com/pro Commands list

-6. From the command list, select **Configure ESP-IDF Extension** or press F1 and type `Configure ESP-IDF Extension`. After, choose the **ESP-IDF: Configure ESP-IDF Extension** option. +6. From the command list, select **ESP-IDF: Open ESP-IDF Install Manager** or press F1 and type `Open ESP-IDF Install Manager`. After, choose the **ESP-IDF: ESP-IDF: Open ESP-IDF Install Manager** option. > **NOTE:** For versions of ESP-IDF < 5.0, spaces are not supported inside configured paths. -

- Select ESP-IDF -

- -7. Choose **Express** and select the download server: +7. Alternatively, you can download the ESP-IDF Install Manager from the following link [ESP-IDF Install Manager](https://dl.espressif.com/dl/eim/index.html) among the following options:: - Espressif: Faster speed in China using Espressif download servers links. - Github: Using github releases links. -8. Pick an ESP-IDF version to download or the `Find ESP-IDF in your system` option to search for existing ESP-IDF directory. - -9. Choose the location for ESP-IDF Tools (also known as `IDF_TOOLS_PATH`) which is `$HOME\.espressif` on MacOS/Linux and `%USERPROFILE%\.espressif` on Windows by default. - -10. If your operating system is MacOS/Linux, choose the system Python executable to create ESP-IDF virtual environment inside ESP-IDF Tools and install ESP-IDF Python package there. - - > **NOTE:** Windows users don't need to select a Python executable since it is going to be installed by this setup. +8. Use the ESP-IDF Install Manager to install the ESP-IDF and tools. If necessary, here is the [ESP-IDF Install Manager Documentation](https://docs.espressif.com/projects/idf-im-ui/en/latest/general_info.html). -11. Make sure that `IDF_TOOLS_PATH` doesn't have any spaces to avoid any build issues. Also make sure that `IDF_TOOLS_PATH` is not the same directory as `IDF_PATH`. +9. In Visual Studio Code, navigate to `View` > `Command Palette` and type `select current esp-idf version` and select **ESP-IDF: Select Current ESP-IDF Version** from the list. The list of available ESP-IDF setups will be shown, select which one you want to use for the current ESP-IDF project. The selected setup will save a **idf.currentSetup** with selected ESP-IDF path and the extension will configure environment variables for the current project saved as workspace folder state. You can review the setup by running the **ESP-IDF: Doctor Command** by navigate to `View` > `Command Palette` and type `doctor command` and select **ESP-IDF: ESP-IDF: Doctor Command** from the list. -12. You will see a page showing the setup progress status, including ESP-IDF download progress, ESP-IDF Tools download and install progress as well as the creation of a Python virtual environment. - -13. If everything is installed correctly, you will see a message that all settings have been configured. You can start using the extension. +10. If everything is installed correctly, you will see a message that all settings have been configured. You can start using the extension. Check the [Troubleshooting](#Troubleshooting) section if you have any issues. @@ -323,7 +311,7 @@ Press F1 or click menu `View` -> `Command Palette...` to show Visual Additional frameworks Install ESP-ADF - Clone ESP-ADF inside the selected directory and set idf.espAdfPath (idf.espAdfPathWin in Windows) configuration setting. + Clone ESP-ADF inside the selected directory and set ADF_PATH in idf.customExtraVars configuration setting. @@ -342,13 +330,13 @@ Press F1 or click menu `View` -> `Command Palette...` to show Visual Install ESP-MDF - Clone ESP-MDF inside the selected directory and set idf.espMdfPath (idf.espMdfPathWin in Windows) configuration setting. + Clone ESP-MDF inside the selected directory and set MDF_PATH in idf.customExtraVars configuration setting. Install ESP-Matter - Clone ESP-Matter and set idf.espMatterPath. ESP-Matter is not supported in Windows. Make sure to install Matter system prerequisites first. + Clone ESP-Matter and set ESP_MATTER_PATH in idf.customExtraVars. ESP-Matter is not supported in Windows. Make sure to install Matter system prerequisites first. @@ -360,13 +348,13 @@ Press F1 or click menu `View` -> `Command Palette...` to show Visual Install ESP-Rainmaker - Clone ESP-Rainmaker and set idf.espRainmakerPath (idf.espRainmakerPathWin in Windows) configuration setting. + Clone ESP-Rainmaker and set RMAKER_PATH in idf.customExtraVars. Install ESP-HomeKit-SDK - Clone ESP-HomeKit-SDK inside the selected directory and set idf.espHomeKitSdkPath (idf.espHomeKitSdkPathWin in Windows) configuration setting. + Clone ESP-HomeKit-SDK inside the selected directory and set HOMEKIT_PATH in idf.customExtraVars configuration setting. @@ -528,12 +516,6 @@ Press F1 or click menu `View` -> `Command Palette...` to show Visual - - Clear Saved ESP-IDF Setups - Clear existing ESP-IDF setups saved by the extension. - - - @@ -604,7 +586,7 @@ This extension uses the ``idf.saveScope`` configuration setting (which can only 7. In some cases, the default shell (Powershell, zsh, sh, .etc) configured in VS Code could affect the behavior of the extension. Make sure that MSYS/MinGW is not set in the environment and the variables don't conflict with terminal behavior. The `ESP-IDF: Doctor Command` shows which shell is detected by the extension when running tasks like building, flashing and monitoring. More information in [here](https://code.visualstudio.com/docs/terminal/profiles). -If there is any Python package error, please try to reinstall the required Python packages with the **ESP-IDF: Install ESP-IDF Python Packages** command or running the setup again with the **ESP-IDF: Configure ESP-IDF Extension** command. +If there is any Python package error, please try to reinstall the required Python packages with the [ESP-IDF Installation Manager](https://docs.espressif.com/projects/idf-im-ui/en/latest/general_info.html). > **NOTE:** When downloading ESP-IDF using git cloning in Windows, if you receive errors like "unable to create symlink", enabling `Developer Mode` while cloning ESP-IDF could help resolve the issue. diff --git a/README_CN.md b/README_CN.md index 6c18da8f8..99d76f812 100644 --- a/README_CN.md +++ b/README_CN.md @@ -323,7 +323,7 @@ ESP-IDF 扩展在 VS Code 底部蓝色窗口的状态栏中提供了一系列命 可集成软件框架 安装 ESP-ADF - 在所选目录中克隆 ESP-ADF，并配置 idf.espAdfPath（Windows 系统中为 idf.espAdfPathWin）。 + 在所选目录中克隆 ESP-ADF，并配置 ADF_PATH 在 idf.customExtraVars。 @@ -342,13 +342,13 @@ ESP-IDF 扩展在 VS Code 底部蓝色窗口的状态栏中提供了一系列命 安装 ESP-MDF - 在所选目录中克隆 ESP-MDF，并配置 idf.espMdfPath（Windows 系统中为 idf.espMdfPathWin）。 + 在所选目录中克隆 ESP-MDF，并配置 MDF_PATH 在 idf.customExtraVars。 安装 ESP-Matter - 克隆 ESP-Matter 并配置 idf.espMatterPath。Windows 系统不支持 ESP-Matter。运行该命令前请确保已安装 Matter 系统依赖项。 + 克隆 ESP-Matter 并配置 ESP_MATTER_PATH 在 idf.customExtraVars。Windows 系统不支持 ESP-Matter。运行该命令前请确保已安装 Matter 系统依赖项。 @@ -360,13 +360,13 @@ ESP-IDF 扩展在 VS Code 底部蓝色窗口的状态栏中提供了一系列命 安装 ESP-Rainmaker - 克隆 ESP-Rainmaker，并配置 idf.espRainmakerPath（Windows 系统中为 idf.espRainmakerPathWin）。 + 克隆 ESP-Rainmaker，并配置 RMAKER_PATH 在 idf.customExtraVars。 安装 ESP-HomeKit-SDK - 在所选目录中克隆 ESP-HomeKit-SDK，并配置 idf.espHomeKitSdkPath（Windows 系统中为 idf.espHomeKitSdkPathWin）。 + 在所选目录中克隆 ESP-HomeKit-SDK，并配置 HOMEKIT_PATH 在 idf.customExtraVars。 diff --git a/docs_espressif/en/additionalfeatures/docker-container.rst b/docs_espressif/en/additionalfeatures/docker-container.rst index 21778b240..258962192 100644 --- a/docs_espressif/en/additionalfeatures/docker-container.rst +++ b/docs_espressif/en/additionalfeatures/docker-container.rst @@ -207,8 +207,6 @@ For more information about ``devcontainer.json``, please refer to the comments. */ "settings": { "terminal.integrated.defaultProfile.linux": "bash", - "idf.espIdfPath": "/opt/esp/idf", - "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git" }, /* An array of extensions that should be installed into the container. */ diff --git a/docs_espressif/en/additionalfeatures/multiple-projects.rst b/docs_espressif/en/additionalfeatures/multiple-projects.rst index 8dead8011..1d6e17e72 100644 --- a/docs_espressif/en/additionalfeatures/multiple-projects.rst +++ b/docs_espressif/en/additionalfeatures/multiple-projects.rst @@ -25,20 +25,19 @@ Project folders (known in VS Code as workspace folders) and workspace-level sett .. code-block:: JSON - { - "folders": [ - { - "path": "./project1" - }, - { - "path": "./project2" - } - ], - "settings": { - "idf.port": "/dev/ttyUSB1", - "idf.espIdfPath": "${env:HOME}/esp/esp-idf" - } + { + "folders": [ + { + "path": "./project1" + }, + { + "path": "./project2" + } + ], + "settings": { + "idf.port": "/dev/ttyUSB1", } + } Settings in the root folder's ``.code-workspace`` are used when your ``ESP-IDF: Current Project`` directory lacks a ``.vscode/settings.json`` file. @@ -69,20 +68,19 @@ And ``my-ws.code-workspace``: .. code-block:: JSON - { - "folders": [ - { - "path": "/my-projects-root/project1" - }, - { - "path": "/my-projects-root/project2" - } - ], - "settings": { - "idf.port": "/dev/ttyUSB1", - "idf.espIdfPath": "${env:HOME}/esp/esp-idf" - } + { + "folders": [ + { + "path": "/my-projects-root/project1" + }, + { + "path": "/my-projects-root/project2" + } + ], + "settings": { + "idf.port": "/dev/ttyUSB1", } + } 1. Open Visual Studio Code, go to ``File`` > ``Open Workspace`` and open ``my-ws.code-workspace``, you will see only the folders defined in this workspace (``/my-projects-root/project1`` and ``/my-projects-root/project2``). diff --git a/docs_espressif/en/additionalfeatures/web-extension.rst b/docs_espressif/en/additionalfeatures/web-extension.rst index 2c25e065a..65c0c1fe4 100644 --- a/docs_espressif/en/additionalfeatures/web-extension.rst +++ b/docs_espressif/en/additionalfeatures/web-extension.rst @@ -33,9 +33,6 @@ You can also configure a github ESP-IDF project for Codespaces with the ESP-IDF "vscode": { "settings": { "terminal.integrated.defaultProfile.linux": "bash", - "idf.espIdfPath": "/opt/esp/idf", - "idf.customExtraPaths": "", - "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git", "idf.showOnboardingOnInit": false, "extensions.ignoreRecommendations": true diff --git a/docs_espressif/en/commands.rst b/docs_espressif/en/commands.rst index 92afae9b4..28d7a8e01 100644 --- a/docs_espressif/en/commands.rst +++ b/docs_espressif/en/commands.rst @@ -26,10 +26,6 @@ All commands start with ``ESP-IDF:``. - Clear the eFuse Summary tree from ESP Explorer EFUSEEXPLORER. * - Clear ESP-IDF Search Results - Clear results from ESP Explorer Documentation Search Results. - * - Clear Saved ESP-IDF Setups - - Clear existing ESP-IDF setups saved by the extension. - * - Configure ESP-IDF Extension - - Open a window with a setup wizard to install ESP-IDF, IDF Tools and Python virtual environment. * - Configure Project SDKConfig for Coverage - Set required values in your project SDKConfig to enable code coverage analysis. * - Configure project for ESP-Clang @@ -67,17 +63,17 @@ All commands start with ``ESP-IDF:``. * - Import ESP-IDF Project - Import an existing ESP-IDF project, add .vscode and .devcontainer files to a new location, and optionally rename the project. * - Install ESP-ADF - - Clone ESP-ADF inside the selected directory and set **idf.espAdfPath** (**idf.espAdfPathWin** in Windows) configuration setting. + - Clone ESP-ADF inside the selected directory and set **ADF_PATH** in **idf.customExtraVars** configuration setting. * - Install ESP-IDF Python Packages (DEPRECATION NOTICE) - Install extension Python packages. This command is deprecated and will be removed soon. * - Install ESP-MDF - - Clone ESP-MDF inside the selected directory and set **idf.espMdfPath** (**idf.espMdfPathWin** in Windows) configuration setting. + - Clone ESP-MDF inside the selected directory and set **MDF_PATH** in **idf.customExtraVars** configuration setting. * - Install ESP-Matter - - Clone ESP-Matter and set **idf.espMatterPath**. ESP-Matter is not supported on Windows. + - Clone ESP-Matter and set **ESP_MATTER_PATH** in **idf.customExtraVars**. ESP-Matter is not supported on Windows. * - Install ESP-Rainmaker - - Clone ESP-Rainmaker and set **idf.espRainmakerPath** (**idf.espRainmakerPathWin** in Windows) configuration setting. + - Clone ESP-Rainmaker and set **RMAKER_PATH** in **idf.customExtraVars** configuration setting. * - Install ESP-HomeKit-SDK - - Clone ESP-HomeKit-SDK inside the selected directory and set **idf.espHomeKitSdkPath** (**idf.espHomeKitSdkPathWin** in Windows) configuration setting. + - Clone ESP-HomeKit-SDK inside the selected directory and set **HOMEKIT_PATH** in **idf.customExtraVars** configuration setting. * - Launch IDF Monitor for Core Dump Mode/GDB Stub Mode - Launch ESP-IDF Monitor with WebSocket capabilities. If you have configured the panic handler to gdbstub or core dump, the monitor will launch a post-mortem debug session of the chip. * - Launch QEMU Server @@ -94,6 +90,8 @@ All commands start with ``ESP-IDF:``. - Launch UI to create a CSV file for `ESP-IDF Non-Volatile Storage Library `_. * - Open ESP-IDF Terminal - Open a terminal with IDF_PATH and Python virtual environment activated. + * - Open ESP-IDF Install Manager + - Open the ESP-IDF Install Manager to install and manage ESP-IDF versions and tools. * - Partition Table Editor - Launch UI to manage custom partition table as described in `ESP-IDF Partition Tables `_. * - Pick a Workspace Folder diff --git a/docs_espressif/en/configureproject.rst b/docs_espressif/en/configureproject.rst index 912f9d2bc..134151f6a 100644 --- a/docs_espressif/en/configureproject.rst +++ b/docs_espressif/en/configureproject.rst @@ -55,26 +55,24 @@ The file structure is as follows: .. code-block:: JSON - { - "configurations": [ - { - "name": "ESP-IDF", - "compilerPath": "/path/to/toolchain-gcc", - "compileCommands": "${workspaceFolder}/build/compile_commands.json", - "includePath": [ - "${config:idf.espIdfPath}/components", - "${config:idf.espIdfPathWin}/components/", - "${workspaceFolder}/" - ], - "browse": { - "path": [ - "${config:idf.espIdfPath}/components", - "${config:idf.espIdfPathWin}/components", - "${workspaceFolder}" - ] - } - } - ] - } + { + "configurations": [ + { + "name": "ESP-IDF", + "compilerPath": "/path/to/toolchain-gcc", + "compileCommands": "${workspaceFolder}/build/compile_commands.json", + "includePath": [ + "/path/to/esp-idf/components/**", + "${workspaceFolder}/**" + ], + "browse": { + "path": [ + "/path/to/esp-idf/components", + "${workspaceFolder}" + ] + } + } + ] + } If ``compile_commands.json`` is not defined, Microsoft C/C++ extension will browse the provided ESP-IDF path to resolve code navigation. diff --git a/docs_espressif/en/installation.rst b/docs_espressif/en/installation.rst index d89798e9e..1242668a3 100644 --- a/docs_espressif/en/installation.rst +++ b/docs_espressif/en/installation.rst @@ -15,52 +15,27 @@ After installing Visual Studio Code (VS Code), install the ESP-IDF extension for - Navigate to ``View`` > ``Command Palette``. - - Type ``ESP-IDF: Configure ESP-IDF Extension`` and select the command to launch the setup wizard. A loading notification will appear, followed by the setup wizard. + - Type ``ESP-IDF: Open ESP-IDF Install Manager`` to download and run the ESP-IDF install manager to install the ESP-IDF framework. A loading notification will appear, followed by the execution of the installer. .. note:: For versions of ESP-IDF < 5.0, spaces are not supported in configured paths. - .. image:: ../../media/tutorials/setup/select-mode.png - -2. Choose ``Express`` and select the download server: +2. Alternatively, you can download the ESP-IDF Install Manager from the following link `ESP-IDF Install Manager `_ among the following options: - ``Espressif``: Faster speed in China using Espressif download servers. - ``Github``: Using GitHub release links. -3. Pick an ESP-IDF version to download or use the ``Find ESP-IDF in your system`` option to search for an existing ESP-IDF directory. - - .. image:: ../../media/tutorials/setup/select-esp-idf.png - - Choose the location for ESP-IDF Tools (``IDF_TOOLS_PATH``), which defaults to ``%USERPROFILE%\.espressif`` on Windows and ``$HOME\.espressif`` on macOS/Linux. - - .. note:: - - Make sure that ``IDF_TOOLS_PATH`` does not contain spaces to avoid build issues. Also, ensure that ``IDF_TOOLS_PATH`` is not the same directory as ``IDF_PATH``. - - .. note:: - - For macOS/Linux users, select the Python executable to create the ESP-IDF Python virtual environment. - -4. Click ``Install`` to begin downloading and installing ESP-IDF and ESP-IDF Tools. - -5. A page will appear showing the setup progress status: - - - ESP-IDF download progress - - ESP-IDF Tools download and installation progress - - Creation of a Python virtual environment and installation of ESP-IDF Python requirements +3. Use the ESP-IDF Install Manager to install the ESP-IDF and tools. If necessary, here is the `ESP-IDF Install Manager Documentation `_. - .. image:: ../../media/tutorials/setup/install-status.png - -6. If everything installs correctly, you will see a message indicating that all settings have been configured. - - .. image:: ../../media/tutorials/setup/install-complete.png - - .. note:: +4. In Visual Studio Code, navigate to ``View`` > ``Command Palette`` and type ``select current esp-idf version`` and select **ESP-IDF: Select Current ESP-IDF Version** from the list. + The list of available ESP-IDF setups will be shown, select which one you want to use for the current ESP-IDF project. + + - The selected setup will save a **idf.currentSetup** with selected ESP-IDF path and the extension will configure required environment variables for the current ESP-IDF project saved as workspace folder state. - For Linux users, a message will prompt you to add OpenOCD rules in ``/etc/udev/rules.d``. You need to run this with sudo privileges. + - You can review the setup by running the **ESP-IDF: Doctor Command** by navigate to ``View`` > ``Command Palette`` and type ``doctor command`` and select **ESP-IDF: ESP-IDF: Doctor Command** from the list. -7. The next step is to :ref:`Create an ESP-IDF Project `. +5. The next step is to :ref:`Create an ESP-IDF Project `. .. warning:: @@ -72,7 +47,7 @@ Uninstall ESP-IDF VS Code Extension To uninstall the ESP-IDF VS Code extension, follow these steps: -1. Open Command Palette (press shortcut F1) and type ``ESP-IDF: Clear Saved ESP-IDF Setups``. Select the command to remove all ESP-IDF settings. +1. Open Command Palette (press shortcut F1) and type ``ESP-IDF: Remove ESP-IDF Settings``. Select the command to remove all ESP-IDF settings. 2. Navigate to ``View`` > ``Extensions`` or use the keyboard shortcut :kbd:`Ctrl+Shift+X` in Windows/Linux or :kbd:`Shift+⌘+X` in macOS. diff --git a/docs_espressif/en/settings.rst b/docs_espressif/en/settings.rst index 4592f1ef5..f33622a84 100644 --- a/docs_espressif/en/settings.rst +++ b/docs_espressif/en/settings.rst @@ -25,7 +25,7 @@ This extension contributes the following settings that can be later updated in ` .. note:: - Please note that ``~``, ``%VARNAME%`` and ``$VARNAME`` are not recognized when set on ANY of this extension configuration settings. Instead, you can set any environment variable in the path using ``${env:VARNAME}``, such as ``${env:HOME}``, or refer to other configuration parameter path with ``${config:SETTINGID}``, such as ``${config:idf.espIdfPath}``. + Please note that ``~``, ``%VARNAME%`` and ``$VARNAME`` are not recognized when set on ANY of this extension configuration settings. Instead, you can set any environment variable in the path using ``${env:VARNAME}``, such as ``${env:HOME}``, or refer to other configuration parameter path with ``${config:SETTINGID}``, such as ``${config:idf.buildPath}``. .. note:: @@ -62,26 +62,13 @@ These are the configuration settings that ESP-IDF extension contributes to your - Enable CCache in build task (make sure CCache is in PATH) * - idf.enableIdfComponentManager - Enable IDF Component manager in build command - * - idf.espIdfPath - - Path to locate ESP-IDF framework (IDF_PATH) - * - idf.espIdfPathWin - - Path to locate ESP-IDF framework in Windows (IDF_PATH) * - idf.ninjaArgs - Arguments for Ninja build task - * - idf.pythonInstallPath - - System Python absolute path used to compute ESP-IDF Python virtual environment - * - idf.toolsPath - - Path to locate ESP-IDF Tools (IDF_TOOLS_PATH) - * - idf.toolsPathWin - - Path to locate ESP-IDF Tools in Windows (IDF_TOOLS_PATH) This is how the extension uses them: 1. **idf.customExtraVars** stores any custom environment variable such as OPENOCD_SCRIPTS, which is the openOCD scripts directory used in OpenOCD server startup. These variables are loaded to this extension command's process environment variables, choosing the extension variable if available, else extension commands will try to use what is already in your system PATH. **This doesn't modify your system environment outside Visual Studio Code.** -2. **idf.espIdfPath** (or **idf.espIdfPathWin** in Windows) is used to store ESP-IDF directory path within our extension. We override Visual Studio Code process IDF_PATH if this value is available. **This doesn't modify your system environment outside Visual Studio Code.**. It is also used to compute the list of ESP-IDF tools to add to environment variable PATH and the Python virtual environment path together from **idf.toolsPath** and **idf.pythonInstallPath**. -3. **idf.pythonInstallPath** is the system Python absolute path used to compute ESP-IDF Python virtual environment from **idf.toolsPath** and **idf.espIdfPath** where ESP-IDF Python packages will be installed and used. -4. **idf.gitPath** (or **idf.gitPathWin** in Windows) is used in the extension to clone ESP-IDF master version or the additional supported frameworks such as ESP-ADF, ESP-MDF and Arduino-ESP32. -5. **idf.toolsPath** (or **idf.toolsPathWin** in Windows) is used to compute the list of ESP-IDF tools to add to environment variable PATH and the Python virtual environment path together from **idf.pythonInstallPath** and **idf.espIdfPath**. +2. **idf.gitPath** (or **idf.gitPathWin** in Windows) is used in the extension to clone ESP-IDF master version or the additional supported frameworks such as ESP-ADF, ESP-MDF and Arduino-ESP32. .. note:: @@ -306,20 +293,6 @@ These settings support additional frameworks together with ESP-IDF: * - Setting ID - Description - * - **idf.espAdfPath** - - Path to locate ESP-ADF framework (ADF_PATH) - * - **idf.espAdfPathWin** - - Path to locate ESP-ADF framework in Windows (ADF_PATH) - * - **idf.espMdfPath** - - Path to locate ESP-MDF framework (MDF_PATH) - * - **idf.espMdfPathWin** - - Path to locate ESP-MDF framework in Windows (MDF_PATH) - * - **idf.espMatterPath** - - Path to locate ESP-Matter framework (ESP_MATTER_PATH) - * - **idf.espRainmakerPath** - - Path to locate ESP-Rainmaker framework in Windows (RMAKER_PATH) - * - **idf.espRainmakerPathWin** - - Path to locate ESP-Rainmaker framework in Windows (RMAKER_PATH) * - **idf.sbomFilePath** - Path to create ESP-IDF SBOM report @@ -332,4 +305,4 @@ Environment (env) variables and other ESP-IDF settings (config) can be reference You can also prepend a string to the result of the other ESP-IDF settings (config) by using the syntax ``${config:ESPIDFSETTING:prefix}``. The prefix will be added to the beginning of the variable value. For example ``${config:idf.openOcdConfigs,-f}`` will add ``-f`` to the beginning of the each string value of **idf.openOcdConfigs**. If ``"idf.openOcdConfigs": ["interface/some.cfg", "target/some.cfg"]`` returns ``-f interface/some.cfg -f target/some.cfg``. -For example, to use ``"~/esp/esp-idf"``, set the value of **idf.espIdfPath** to ``"${env:HOME}/esp/esp-idf"``. +For example, to use ``"~/workspace/blink"``, set the value to ``"${env:HOME}/workspace/blink"``. diff --git a/docs_espressif/zh_CN/additionalfeatures/docker-container.rst b/docs_espressif/zh_CN/additionalfeatures/docker-container.rst index b76531d44..657a78380 100644 --- a/docs_espressif/zh_CN/additionalfeatures/docker-container.rst +++ b/docs_espressif/zh_CN/additionalfeatures/docker-container.rst @@ -207,8 +207,6 @@ Docker 中的 ``usbipd-win`` */ "settings": { "terminal.integrated.defaultProfile.linux": "bash", - "idf.espIdfPath": "/opt/esp/idf", - "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git" }, /* 应安装到容器中的一组扩展 */ diff --git a/docs_espressif/zh_CN/additionalfeatures/multiple-projects.rst b/docs_espressif/zh_CN/additionalfeatures/multiple-projects.rst index cdd956576..9de6656a4 100644 --- a/docs_espressif/zh_CN/additionalfeatures/multiple-projects.rst +++ b/docs_espressif/zh_CN/additionalfeatures/multiple-projects.rst @@ -35,8 +35,7 @@ } ], "settings": { - "idf.port": "/dev/ttyUSB1", - "idf.espIdfPath": "${env:HOME}/esp/esp-idf" + "idf.port": "/dev/ttyUSB1" } } @@ -79,8 +78,7 @@ } ], "settings": { - "idf.port": "/dev/ttyUSB1", - "idf.espIdfPath": "${env:HOME}/esp/esp-idf" + "idf.port": "/dev/ttyUSB1" } } diff --git a/docs_espressif/zh_CN/additionalfeatures/web-extension.rst b/docs_espressif/zh_CN/additionalfeatures/web-extension.rst index 2c25e065a..65c0c1fe4 100644 --- a/docs_espressif/zh_CN/additionalfeatures/web-extension.rst +++ b/docs_espressif/zh_CN/additionalfeatures/web-extension.rst @@ -33,9 +33,6 @@ You can also configure a github ESP-IDF project for Codespaces with the ESP-IDF "vscode": { "settings": { "terminal.integrated.defaultProfile.linux": "bash", - "idf.espIdfPath": "/opt/esp/idf", - "idf.customExtraPaths": "", - "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git", "idf.showOnboardingOnInit": false, "extensions.ignoreRecommendations": true diff --git a/docs_espressif/zh_CN/commands.rst b/docs_espressif/zh_CN/commands.rst index 79955af14..75ee6be15 100644 --- a/docs_espressif/zh_CN/commands.rst +++ b/docs_espressif/zh_CN/commands.rst @@ -67,17 +67,17 @@ * - 导入 ESP-IDF 项目 - 导入现有的 ESP-IDF 项目，在新位置添加 .vscode 和 .devcontainer 文件，同时可以重命名项目。 * - 安装 ESP-ADF - - 在所选目录中克隆 ESP-ADF，并配置 **idf.espAdfPath**（Windows 系统中为 **idf.espAdfPathWin**）。 + - 在所选目录中克隆 ESP-ADF，并配置 **ADF_PATH** 在 **idf.customExtraVars**。 * - 安装 ESP-IDF Python 包（已弃用） - 安装扩展 Python 包。本命令已弃用，即将被移除。 * - 安装 ESP-MDF - - 在所选目录中克隆 ESP-MDF，并配置 **idf.espMdfPath**（Windows 系统中为 **idf.espMdfPathWin**）。 + - 在所选目录中克隆 ESP-MDF，并配置 **MDF_PATH** 在 **idf.customExtraVars**。 * - 安装 ESP-Matter - - 克隆 ESP-Matter 并设置 **idf.espMatterPath**。ESP-Matter 不支持 Windows。 + - 克隆 ESP-Matter 并设置 **ESP_MATTER_PATH** 在 **idf.customExtraVars**。ESP-Matter 不支持 Windows。 * - 安装 ESP-Rainmaker - - 克隆 ESP-Rainmaker，并配置 **idf.espRainmakerPath**（Windows 系统中为 **idf.espRainmakerPathWin**）。 + - 克隆 ESP-Rainmaker，并配置 **RMAKER_PATH** 在 **idf.customExtraVars**。 * - 安装 ESP-HomeKit-SDK - - 在所选目录中克隆 ESP-HomeKit-SDK，并配置 **idf.espHomeKitSdkPath**（Windows 系统中为 **idf.espHomeKitSdkPathWin**）。 + - 在所选目录中克隆 ESP-HomeKit-SDK，并配置 **HOMEKIT_PATH** 在 **idf.customExtraVars**。 * - 启动 IDF 监视器以支持 Core Dump 模式/GDB Stub 模式 - 启动支持 WebSocket 的 ESP-IDF 监控器。如果紧急处理程序已经配置为 gdbstub 或核心转储，监控器将启动芯片的事后调试会话。 * - 启动 QEMU 服务器 @@ -127,7 +127,7 @@ * - 设置 ESP-MATTER 设备路径 (ESP_MATTER_DEVICE_PATH) - **ESP-IDF：设置 ESP-MATTER 设备路径 (ESP_MATTER_DEVICE_PATH)** 命令用于定义 ESP-Matter 的设备路径。Windows 系统不支持 ESP-Matter。 * - 展示示例项目 - - 启动 UI 以显示所选框架的示例，可从中创建新项目。此命令将显示扩展中已配置的框架，如果想查看 ESP-Rainmaker 示例，需要先运行 **安装 ESP-Rainmaker** 命令（或设置相应的 idf.espRainmakerPath），然后执行此命令以查看示例。 + - 启动 UI 以显示所选框架的示例，可从中创建新项目。此命令将显示扩展中已配置的框架，如果想查看 ESP-Rainmaker 示例，需要先运行 **安装 ESP-Rainmaker** 命令（或设置相应的 RMAKER_PATH 在 idf.customExtraVars），然后执行此命令以查看示例。 * - 显示 Ninja 构建摘要 - 运行 Chromium ninja-build-summary.py。 * - 二进制文件大小分析 diff --git a/docs_espressif/zh_CN/configureproject.rst b/docs_espressif/zh_CN/configureproject.rst index eeb165442..421f6a8d9 100644 --- a/docs_espressif/zh_CN/configureproject.rst +++ b/docs_espressif/zh_CN/configureproject.rst @@ -45,14 +45,12 @@ LLVM CLangd 扩展只需要用到 ``compile_commands.json`` 文件；而 Microso "compilerPath": "/path/to/toolchain-gcc", "compileCommands": "${workspaceFolder}/build/compile_commands.json", "includePath": [ - "${config:idf.espIdfPath}/components", - "${config:idf.espIdfPathWin}/components/", + "/path/to/esp-idf/components/**", "${workspaceFolder}/" ], "browse": { "path": [ - "${config:idf.espIdfPath}/components", - "${config:idf.espIdfPathWin}/components", + "/path/to/esp-idf/components/**", "${workspaceFolder}" ] } diff --git a/docs_espressif/zh_CN/settings.rst b/docs_espressif/zh_CN/settings.rst index a397b9a39..d4d4adf97 100644 --- a/docs_espressif/zh_CN/settings.rst +++ b/docs_espressif/zh_CN/settings.rst @@ -13,7 +13,7 @@ ESP-IDF 设置 .. note:: - 请注意，配置此扩展时，``~``、``%VARNAME%`` 和 ``$VARNAME`` 都无法被识别。请使用 ``${env:VARNAME}`` 来设置路径中的环境变量，例如 ``${env:HOME}``。也可以通过 ``${config:SETTINGID}`` 来引用其他配置参数，例如 ``${config:idf.espIdfPath}``。 + 请注意，配置此扩展时，``~``、``%VARNAME%`` 和 ``$VARNAME`` 都无法被识别。请使用 ``${env:VARNAME}`` 来设置路径中的环境变量，例如 ``${env:HOME}``。也可以通过 ``${config:SETTINGID}`` 来引用其他配置参数，例如 ``${config:idf.buildPath}``。 在运行 **设置乐鑫设备目标** 等命令时，**idf.saveScope** 可指定保存设置的位置。可选择将设置保存在全局（用户设置）、工作区或工作区文件夹。请使用 **选选择配置存储位置** 命令来选择保存设置的位置。 @@ -52,26 +52,13 @@ ESP-IDF 相关设置 - 在构建任务中启用 CCache（确保 CCache 在 PATH 中） * - idf.enableIdfComponentManager - 在构建命令中启用 IDF 组件管理器 - * - idf.espIdfPath - - ESP-IDF 框架的位置路径 (IDF_PATH) - * - idf.espIdfPathWin - - Windows 系统中 ESP-IDF 框架的位置路径 (IDF_PATH) * - idf.ninjaArgs - Ninja 构建任务的参数 - * - idf.pythonInstallPath - - 用于构建 ESP-IDF Python 虚拟环境的系统 Python 绝对路径 - * - idf.toolsPath - - ESP-IDF 工具的位置路径 (IDF_TOOLS_PATH) - * - idf.toolsPathWin - - Windows 系统中 ESP-IDF 工具的位置路径 (IDF_TOOLS_PATH) 扩展将按照以下方式使用上述设置： 1. **idf.customExtraVars** 用于存储自定义环境变量，例如 OPENOCD_SCRIPTS，用于指定启动 OpenOCD 服务器时所需脚本文件的目录路径。这些变量会加载到扩展命令的进程环境变量中，优先使用扩展变量，如果没有，则扩展命令会尝试使用系统 PATH 中已有的设置。**该配置项不会改变 VS Code 之外的系统环境。** -2. **idf.espIdfPath**（Windows 系统中为 **idf.espIdfPathWin**）用于在扩展中存储 ESP-IDF 目录路径。如果该值已配置，则 VS Code 进程中原有的 IDF_PATH 会被覆盖。**该配置项不会改变 VS Code 之外的系统环境。** 此外，扩展使用 **idf.espIdfPath**，结合 **idf.toolsPath** 和 **idf.pythonInstallPath**，来确定要添加到环境变量 PATH 中的 ESP-IDF 工具路径和 Python 虚拟环境路径。 -3. **idf.pythonInstallPath** 是系统 Python 的绝对路径，基于 **idf.toolsPath** 和 **idf.espIdfPath** 来生成 ESP-IDF Python 虚拟环境路径。创建虚拟环境后，ESP-IDF 的 Python 包将在该环境中安装和使用。 -4. **idf.gitPath**（Windows 系统中为 **idf.gitPathWin**）在扩展中用于克隆 ESP-IDF master 版本及其他支持的框架，如 ESP-ADF、ESP-MDF 和 Arduino-ESP32。 -5. **idf.toolsPath**（Windows 系统中为 **idf.toolsPathWin**）用于结合 **idf.toolsPath** 和 **idf.pythonInstallPath** 来确定要添加到环境变量 PATH 中的 ESP-IDF 工具路径和 Python 虚拟环境路径。 +2. **idf.gitPath**（Windows 系统中为 **idf.gitPathWin**）在扩展中用于克隆 ESP-IDF master 版本及其他支持的框架，如 ESP-ADF、ESP-MDF 和 Arduino-ESP32。 .. note:: @@ -294,20 +281,6 @@ QEMU 相关设置 * - 设置 ID - 描述 - * - **idf.espAdfPath** - - 定位 ESP-ADF 框架的路径 (ADF_PATH) - * - **idf.espAdfPathWin** - - 在 Windows 系统中定位 ESP-ADF 框架的路径 (ADF_PATH) - * - **idf.espMdfPath** - - 定位 ESP-MDF 框架的路径 (MDF_PATH) - * - **idf.espMdfPathWin** - - 在 Windows 系统中定位 ESP-MDF 框架的路径 (MDF_PATH) - * - **idf.espMatterPath** - - 定位 ESP-Matter 框架的路径 (ESP_MATTER_PATH) - * - **idf.espRainmakerPath** - - 定位 ESP-Rainmaker 框架的路径 (RMAKER_PATH) - * - **idf.espRainmakerPathWin** - - 在 Windows 系统中定位 ESP-Rainmaker 框架的路径 (RMAKER_PATH) * - **idf.sbomFilePath** - 创建 ESP-IDF SBOM 报告的路径 @@ -317,4 +290,4 @@ QEMU 相关设置 环境变量 (env) 和其他 ESP-IDF 设置 (config) 可以在 ESP-IDF 设置中通过 ``${env:VARNAME}`` （用于环境变量）和 ``${config:ESPIDFSETTING}`` （用于设置）进行引用。 -例如，如果想要使用 ``"~/esp/esp-idf"``，可以将 **idf.espIdfPath** 设为 ``"${env:HOME}/esp/esp-idf"``。 +例如，如果想要使用 ``"~/esp/esp-idf"`` 设为 ``"${env:HOME}/esp/esp-idf"``。 diff --git a/export.bat b/export.bat deleted file mode 100644 index 9b6fea503..000000000 --- a/export.bat +++ /dev/null @@ -1,7 +0,0 @@ -DOSKEY idf.py=python.exe "%IDF_PATH%\tools\idf.py" $* -DOSKEY esptool.py=python.exe "%IDF_PATH%\components\esptool_py\esptool\esptool.py" $* -DOSKEY espefuse.py=python.exe "%IDF_PATH%\components\esptool_py\esptool\espefuse.py" $* -DOSKEY espsecure.py=python.exe "%IDF_PATH%\components\esptool_py\esptool\espsecure.py" $* -DOSKEY otatool.py=python.exe "%IDF_PATH%\components\app_update\otatool.py" $* -DOSKEY parttool.py=python.exe "%IDF_PATH%\components\partition_table\parttool.py" $* -cls \ No newline at end of file diff --git a/l10n/bundle.l10n.es.json b/l10n/bundle.l10n.es.json index 905d096c4..95b2f2ef4 100644 --- a/l10n/bundle.l10n.es.json +++ b/l10n/bundle.l10n.es.json @@ -48,9 +48,9 @@ "ESP-IDF: SDK Configuration Editor": "ESP-IDF: Editor de configuración del SDK", "ESP-IDF: Save Default Configuration (save-defconfig)": "ESP-IDF: Guardar configuración predeterminada (save-defconfig)", "Enter target name (IDF_TARGET)": "Introduzca el nombre del objetivo (IDF_TARGET)", - "ESP-IDF: Configure ESP-IDF extension": "ESP-IDF: Configurar la extensión ESP-IDF", "No ESP-IDF frameworks found": "No se encontraron marcos ESP-IDF", "Select framework to use": "Seleccione el marco a utilizar", + "Select mirror to use": "Seleccione el enlace a utilizar", "No framework selected to load examples.": "No se seleccionó ningún marco para cargar ejemplos.", "ESP-IDF: Loading examples": "ESP-IDF: Cargando ejemplos", "Cannot call this command directly, right click on any CMakeLists.txt file!": "No se puede llamar a este comando directamente, haga clic derecho en cualquier archivo CMakeLists.txt.", @@ -70,7 +70,7 @@ "Flash binary to this partition": "Flash binario a esta partición", "Open partition table editor": "Abrir editor de tablas de particiones", "Select an action to use": "Seleccione una acción para usar", - "ESP-IDF: Preparing ESP-IDF extension report": "ESP-IDF: Preparando informe de extensión ESP-IDF", + "ESP-IDF Doctor": "ESP-IDF Doctor", "Extension configuration report has been copied to clipboard with errors": "El informe de configuración de la extensión se ha copiado al portapapeles con errores", "No launch.json found.\nUse the 'ESP-IDF: Add vscode Configuration Folder' command.": "No se encontró launch.json.\n", "No gdbtarget configuration found in launch.json.\nDelete launch.json and use the 'ESP-IDF: Add vscode Configuration Folder' command.": "No se encontró ninguna configuración de gdbtarget en launch.json.\n", @@ -151,13 +151,17 @@ "Discarded changes in SDK Configuration editor": "Cambios descartados en el editor de configuración del SDK", "Error encountered while adding dependency {dependency} to the component \"{component}\"": "Se encontró un error al agregar la dependencia {dependency} al componente \"{component}\"", "Error encountered while creating project from example \"{example}\"": "Se encontró un error al crear un proyecto a partir del ejemplo \"{example}\"", + "Open ESP-IDF installation manager": "Abra el administrador de instalación ESP-IDF", + "Choose from existing ESP-IDF setups.": "Elija entre configuraciones ESP-IDF existentes.", + "The extension configuration is not valid. Choose an action:": "La configuración de la extensión no es válida. Elija una opción", + "No ESP-IDF Setups found": "No se encontraron configuraciones ESP-IDF", + "Use docker container configuration": "Usar la configuración del contenedor docker", "Install ESP-ADF": "Instalar ESP-ADF", "Install ESP-MDF": "Instalar ESP-MDF", "Install ESP-Matter": "Instalar ESP-Materia", "Install ESP-Rainmaker": "Instalar ESP-Rainmaker", "Project Configuration editor": "Editor de configuración del proyecto", "Select Project Configuration": "Seleccione Configuración del proyecto", - "Install Extension Python Requirements": "Instalar la extensión Requisitos de Python", "Install ESP-Matter Python Requirements": "Instalar los requisitos de ESP-Matter Python", "Add .vscode subdirectory files": "Agregar archivos de subdirectorio .vscode", "Add .devcontainer subdirectory files": "Agregar archivos de subdirectorio .devcontainer", @@ -166,7 +170,6 @@ "Flash with DFU": "Flashear con DFU", "Launch Websocket server and IDF Monitor": "Inicie el servidor Websocket y el monitor IDF", "Start/Stop QEMU Server": "Iniciar/detener el servidor QEMU", - "Configure ESP-IDF Extension": "Configurar la extensión ESP-IDF", "esp-clang not found in PATH. Make sure esp-clang is installed.": "No se ha encontrado a esp-clang en PATH. Verifique la instalación de esp-clang.", "Select current ESP-IDF version": "Seleccione la versión actual de ESP-IDF", "New Project Wizard": "Asistente para nuevos proyectos", diff --git a/l10n/bundle.l10n.pt.json b/l10n/bundle.l10n.pt.json index 57fd05a21..8628558cf 100644 --- a/l10n/bundle.l10n.pt.json +++ b/l10n/bundle.l10n.pt.json @@ -48,9 +48,9 @@ "ESP-IDF: SDK Configuration Editor": "ESP-IDF: Editor de configuração do SDK", "ESP-IDF: Save Default Configuration (save-defconfig)": "ESP-IDF: Salvar configuração padrão (save-defconfig)", "Enter target name (IDF_TARGET)": "Insira o nome do destino (IDF_TARGET)", - "ESP-IDF: Configure ESP-IDF extension": "ESP-IDF: Configurar extensão ESP-IDF", "No ESP-IDF frameworks found": "Nenhuma estrutura ESP-IDF encontrada", "Select framework to use": "Selecione a estrutura a ser usada", + "Select mirror to use": "Selecione o espelho a usar", "No framework selected to load examples.": "Nenhuma estrutura selecionada para carregar exemplos.", "ESP-IDF: Loading examples": "ESP-IDF: Carregando exemplos", "Cannot call this command directly, right click on any CMakeLists.txt file!": "Não é possível chamar este comando diretamente, clique com o botão direito em qualquer arquivo CMakeLists.txt!", @@ -70,7 +70,7 @@ "Flash binary to this partition": "Flash binário para esta partição", "Open partition table editor": "Abra o editor de tabela de partição", "Select an action to use": "Selecione uma ação para usar", - "ESP-IDF: Preparing ESP-IDF extension report": "ESP-IDF: Preparando relatório de extensão ESP-IDF", + "ESP-IDF Doctor": "ESP-IDF Doctor", "Extension configuration report has been copied to clipboard with errors": "O relatório de configuração da extensão foi copiado para a área de transferência com erros", "No launch.json found.\nUse the 'ESP-IDF: Add vscode Configuration Folder' command.": "Nenhum launch.json encontrado.\n", "No gdbtarget configuration found in launch.json.\nDelete launch.json and use the 'ESP-IDF: Add vscode Configuration Folder' command.": "Nenhuma configuração gdbtarget encontrada em launch.json.\n", @@ -151,13 +151,17 @@ "Discarded changes in SDK Configuration editor": "Alterações descartadas no editor de configuração do SDK", "Error encountered while adding dependency {dependency} to the component \"{component}\"": "Erro encontrado ao adicionar a dependência {dependency} ao componente \"{component}\"", "Error encountered while creating project from example \"{example}\"": "Erro encontrado ao criar o projeto do exemplo \"{example}\"", + "Open ESP-IDF installation manager": "Abra o gerenciador de instalação ESP-IDF", + "Choose from existing ESP-IDF setups.": "Escolha entre as configurações ESP-IDF existentes.", + "The extension configuration is not valid. Choose an action:": "A configuração da extensão não é válida. Escolha uma ação:", + "No ESP-IDF Setups found": "Nenhuma configuração ESP-IDF encontrada", + "Use docker container configuration": "Use a configuração do contêiner do Docker", "Install ESP-ADF": "Instale ESP-ADF", "Install ESP-MDF": "Instale ESP-MDF", "Install ESP-Matter": "Instale ESP-Matter", "Install ESP-Rainmaker": "Instale ESP-Rainmaker", "Project Configuration editor": "Editor de configuração do projeto", "Select Project Configuration": "Selecione Configuração do Projeto", - "Install Extension Python Requirements": "Instalar requisitos de extensão Python", "Install ESP-Matter Python Requirements": "Instale os requisitos do ESP-Matter Python", "Add .vscode subdirectory files": "Adicionar arquivos de subdiretório .vscode", "Add .devcontainer subdirectory files": "Adicionar arquivos de subdiretório .devcontainer", @@ -168,7 +172,6 @@ "Launch Websocket server and IDF Monitor": "Inicie o servidor Websocket e o IDF Monitor", "Start/Stop QEMU Server": "Iniciar/parar servidor QEMU", "esp-clang not found in PATH. Make sure esp-clang is installed.": "esp-clang não encontrado em PATH. Certifique-se de que o esp-clang está instalado.", - "Configure ESP-IDF Extension": "Configurar extensão ESP-IDF", "Select current ESP-IDF version": "Selecione a versão atual do ESP-IDF", "New Project Wizard": "Assistente de Novo Projeto", "Select Current Project workspace folder": "Selecione a pasta do espaço de trabalho do Projeto Atual", diff --git a/l10n/bundle.l10n.ru.json b/l10n/bundle.l10n.ru.json index 814117a41..57ee73e2c 100644 --- a/l10n/bundle.l10n.ru.json +++ b/l10n/bundle.l10n.ru.json @@ -48,9 +48,9 @@ "ESP-IDF: SDK Configuration Editor": "ESP-IDF: Редактор конфигурации SDK", "ESP-IDF: Save Default Configuration (save-defconfig)": "ESP-IDF: сохранить конфигурацию по умолчанию (save-defconfig)", "Enter target name (IDF_TARGET)": "Введите имя цели (IDF_TARGET)", - "ESP-IDF: Configure ESP-IDF extension": "ESP-IDF: настройка расширения ESP-IDF", "No ESP-IDF frameworks found": "Фреймворки ESP-IDF не найдены", "Select framework to use": "Выберите платформу для использования", + "Select mirror to use": "Выберите зеркало для использования", "No framework selected to load examples.": "Для загрузки примеров не выбрана платформа.", "ESP-IDF: Loading examples": "ESP-IDF: Загрузка примеров", "Cannot call this command directly, right click on any CMakeLists.txt file!": "Невозможно вызвать эту команду напрямую. Кликните правой кнопкой мыши любой файл CMakeLists.txt!", @@ -70,7 +70,7 @@ "Flash binary to this partition": "Записать двоичный файл в этот раздел", "Open partition table editor": "Открыть редактор таблицы разделов", "Select an action to use": "Выбор действия для использования", - "ESP-IDF: Preparing ESP-IDF extension report": "ESP-IDF: подготовка отчета о расширении ESP-IDF", + "ESP-IDF Doctor": "ESP-IDF Доктор", "Extension configuration report has been copied to clipboard with errors": "Отчет о конфигурации расширения скопирован в буфер обмена с ошибками", "No launch.json found.\nUse the 'ESP-IDF: Add vscode Configuration Folder' command.": "Файл launch.json не найден.\nИспользуйте команду 'ESP-IDF: Add vscode Configuration Folder'.", "No gdbtarget configuration found in launch.json.\nDelete launch.json and use the 'ESP-IDF: Add vscode Configuration Folder' command.": "В файле launch.json не найдена конфигурация gdbtarget.\nУдалите файл launch.json и используйте команду 'ESP-IDF: Add vscode Configuration Folder'.", @@ -155,6 +155,11 @@ "Install ESP-MDF": "Установка ESP-MDF", "Install ESP-Matter": "Установка ESP-Matter", "Install ESP-Rainmaker": "Установка ESP-Rainmaker", + "Open ESP-IDF installation manager": "Откройте диспетчер установки ESP-IDF.", + "Choose from existing ESP-IDF setups.": "Выбирайте из существующих настроек ESP-IDF.", + "The extension configuration is not valid. Choose an action:": "Недопустимая конфигурация расширения. Выберите действие:", + "No ESP-IDF Setups found": "Настройки ESP-IDF не найдены", + "Use docker container configuration": "Использовать конфигурацию Docker-контейнера", "Project Configuration editor": "Редактор конфигурации проекта", "Select Project Configuration": "Выбор конфигурации проекта", "Install Extension Python Requirements": "Установка требований Python расширения", @@ -168,7 +173,6 @@ "Launch Websocket server and IDF Monitor": "Запуск сервера Websocket и монитора IDF", "Start/Stop QEMU Server": "Запуск/остановка сервера QEMU", "esp-clang not found in PATH. Make sure esp-clang is installed.": "esp-clang не найден в PATH. Убедитесь, что esp-clang установлен.", - "Configure ESP-IDF Extension": "Настройка расширения ESP-IDF", "Select current ESP-IDF version": "Выбор текущей версии ESP-IDF", "New Project Wizard": "Мастер создания нового проекта", "Select Current Project workspace folder": "Выбор папки рабочей области текущего проекта", diff --git a/l10n/bundle.l10n.zh-CN.json b/l10n/bundle.l10n.zh-CN.json index cd6454036..ceea12597 100644 --- a/l10n/bundle.l10n.zh-CN.json +++ b/l10n/bundle.l10n.zh-CN.json @@ -48,9 +48,9 @@ "ESP-IDF: SDK Configuration Editor": "ESP-IDF：SDK 配置编辑器", "ESP-IDF: Save Default Configuration (save-defconfig)": "ESP-IDF：保存默认配置 (save-defconfig)", "Enter target name (IDF_TARGET)": "输入目标名称 (IDF_TARGET)", - "ESP-IDF: Configure ESP-IDF extension": "ESP-IDF：配置 ESP-IDF 扩展", "No ESP-IDF frameworks found": "未找到 ESP-IDF 框架", "Select framework to use": "选择要使用的框架", + "Select mirror to use": "选择要使用的镜像", "No framework selected to load examples.": "未选择任何框架来加载示例。", "ESP-IDF: Loading examples": "ESP-IDF：加载示例", "Cannot call this command directly, right click on any CMakeLists.txt file!": "不能直接调用此命令，需右键单击任意一个 CMakeLists.txt 文件！", @@ -70,7 +70,7 @@ "Flash binary to this partition": "将二进制文件烧录到该分区", "Open partition table editor": "打开分区表编辑器", "Select an action to use": "选择要执行的操作", - "ESP-IDF: Preparing ESP-IDF extension report": "ESP-IDF：正在生成 ESP-IDF 扩展报告", + "ESP-IDF Doctor": "ESP-IDF 诊断工具", "Extension configuration report has been copied to clipboard with errors": "已复制扩展配置报告到剪贴板，但有错误", "No launch.json found.\nUse the 'ESP-IDF: Add vscode Configuration Folder' command.": "未找到 launch.json。\n运行命令 ESP-IDF：添加 VS Code 配置文件夹", "No gdbtarget configuration found in launch.json.\nDelete launch.json and use the 'ESP-IDF: Add vscode Configuration Folder' command.": "launch.json 中未找到 gdbtarget 配置。\n删除 launch.json 并运行命令 ESP-IDF：添加 VS Code 配置文件夹。", @@ -151,13 +151,17 @@ "Discarded changes in SDK Configuration editor": "已放弃 SDK 配置编辑器中的更改", "Error encountered while adding dependency {dependency} to the component \"{component}\"": "将依赖项 {dependency} 添加到组件 \"{component}\" 时出错", "Error encountered while creating project from example \"{example}\"": "基于 \"{example}\" 示例创建项目时出错", + "Open ESP-IDF installation manager": "打开 ESP-IDF 安装管理器", + "Choose from existing ESP-IDF setups.": "从现有 ESP-IDF 设置中进行选择。", + "The extension configuration is not valid. Choose an action:": "扩展配置无效 选择一个操作：", + "No ESP-IDF Setups found": "未找到 ESP-IDF 设置", + "Use docker container configuration": "使用docker容器配置", "Install ESP-ADF": "安装 ESP-ADF", "Install ESP-MDF": "安装 ESP-MDF", "Install ESP-Matter": "安装 ESP-Matter", "Install ESP-Rainmaker": "安装 ESP-Rainmaker", "Project Configuration editor": "项目配置编辑器", "Select Project Configuration": "选择项目配置", - "Install Extension Python Requirements": "为扩展安装 Python 依赖包", "Install ESP-Matter Python Requirements": "为 ESP-Matter 安装 Python 依赖包", "Add .vscode subdirectory files": "添加 .vscode 子目录文件", "Add .devcontainer subdirectory files": "添加 .devcontainer 子目录文件", @@ -168,7 +172,6 @@ "Launch Websocket server and IDF Monitor": "启动 WebSocket 服务器和 IDF 监视器", "Start/Stop QEMU Server": "启动/停止 QEMU 服务器", "esp-clang not found in PATH. Make sure esp-clang is installed.": "在 PATH 中未找到 esp-clang。请确保已安装 esp-clang。", - "Configure ESP-IDF Extension": "配置 ESP-IDF 扩展", "Select current ESP-IDF version": "选择当前的 ESP-IDF 版本", "New Project Wizard": "新项目向导", "Select Current Project workspace folder": "选择当前项目的工作区文件夹", diff --git a/media/walkthrough/express-setup.png b/media/walkthrough/express-setup.png deleted file mode 100644 index a73abfef3..000000000 Binary files a/media/walkthrough/express-setup.png and /dev/null differ diff --git a/media/walkthrough/idf-version.png b/media/walkthrough/idf-version.png deleted file mode 100644 index ea07af008..000000000 Binary files a/media/walkthrough/idf-version.png and /dev/null differ diff --git a/media/walkthrough/install-btn.png b/media/walkthrough/install-btn.png deleted file mode 100644 index 24bac1a41..000000000 Binary files a/media/walkthrough/install-btn.png and /dev/null differ diff --git a/media/walkthrough/python-selection.png b/media/walkthrough/python-selection.png deleted file mode 100644 index 487445722..000000000 Binary files a/media/walkthrough/python-selection.png and /dev/null differ diff --git a/package.json b/package.json index 48cc9abe3..68171ae8c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "esp-idf-extension", "displayName": "ESP-IDF", "description": "Develop and debug applications for Espressif chips with ESP-IDF", - "version": "1.10.3", + "version": "1.10.5", "license": "Apache-2.0", "publisher": "espressif", "icon": "media/espressif_icon.png", @@ -84,7 +84,6 @@ "onCommand:espIdf.partition.table.refresh", "onCommand:espIdf.removeCoverage", "onCommand:espIdf.searchInEspIdfDocs", - "onCommand:espIdf.setup.start", "onCommand:espIdf.welcome.start", "onCommand:esp.rainmaker.backend.connect", "onCommand:esp.rainmaker.backend.sync", @@ -132,7 +131,7 @@ { "id": "extension-configuration", "title": "Configuring the ESP-IDF Extension", - "description": "❗**Linux and MacOS users:** Please install prerequisites first. The process is quick and simple - follow the steps in our [ESP-IDF install documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/linux-macos-setup.html#step-1-install-prerequisites).\n\nOnce ready, let's configure the ESP-IDF extension:\n\n[Configure ESP-IDF Extension](command:espIdf.setup.start)\n\n", + "description": "❗**Linux and MacOS users:** Please install prerequisites first. The process is quick and simple - follow the steps in our [ESP-IDF install documentation](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/linux-macos-setup.html#step-1-install-prerequisites).\n\nOnce ready, let's install ESP-IDF:\n\n[ESP-IDF: Open ESP-IDF Install Manager](command:espIdf.installManager)\n\n\n\nAfter that, run:\n\n[ESP-IDF: Select current ESP-IDF version](command:espIdf.selectCurrentIdfVersion)\n\n", "media": { "markdown": "walkthroughs/basic/configuration.md" } @@ -622,82 +621,22 @@ { "title": "%configuration.title%", "properties": { - "idf.espIdfPath": { + "idf.eimIdfJsonPath": { "type": "string", - "default": "${env:IDF_PATH}", - "description": "%param.espIdfPath%", - "scope": "resource" - }, - "idf.espAdfPath": { - "type": "string", - "default": "${env:ADF_PATH}", - "description": "%param.espAdfPath%", - "scope": "resource" - }, - "idf.espMdfPath": { - "type": "string", - "default": "${env:MDF_PATH}", - "description": "%param.espMdfPath%", - "scope": "resource" - }, - "idf.espMatterPath": { - "type": "string", - "default": "${env:ESP_MATTER_PATH}", - "description": "%param.espMatterPath%", - "scope": "resource" - }, - "idf.espHomeKitSdkPath": { - "type": "string", - "default": "${env:HOMEKIT_PATH}", - "description": "%param.espHomeKitSdkPath%", - "scope": "resource" - }, - "idf.toolsPath": { - "type": "string", - "default": "${env:IDF_TOOLS_PATH}", - "description": "%param.toolsPath%", - "scope": "resource" - }, - "idf.espRainmakerPath": { - "type": "string", - "default": "${env:RMAKER_PATH}", - "description": "%param.espRainmakerPath%", - "scope": "resource" - }, - "idf.espIdfPathWin": { - "type": "string", - "default": "${env:IDF_PATH}", - "description": "%param.espIdfPath%", - "scope": "resource" - }, - "idf.espAdfPathWin": { - "type": "string", - "default": "${env:ADF_PATH}", - "description": "%param.espAdfPath%", - "scope": "resource" - }, - "idf.espMdfPathWin": { - "type": "string", - "default": "${env:MDF_PATH}", - "description": "%param.espMdfPath%", - "scope": "resource" - }, - "idf.toolsPathWin": { - "type": "string", - "default": "${env:IDF_TOOLS_PATH}", - "description": "%param.toolsPath%", - "scope": "resource" + "default": "", + "description": "%param.eimIdfJsonPath%", + "scope": "application" }, - "idf.espRainmakerPathWin": { - "type": "string", - "default": "${env:RMAKER_PATH}", - "description": "%param.espRainmakerPath%", - "scope": "resource" + "idf.eimExecutableArgs": { + "type": "array", + "default": ["gui"], + "description": "%param.eimExecutableArgs%", + "scope": "application" }, - "idf.espHomeKitSdkPathWin": { + "idf.currentSetup": { "type": "string", - "default": "${env:HOMEKIT_PATH}", - "description": "%param.espHomeKitSdkPath%", + "default": "", + "description": "%param.currentSetup%", "scope": "resource" }, "idf.port": { @@ -718,12 +657,6 @@ "description": "%param.port%", "scope": "resource" }, - "idf.pythonInstallPath": { - "type": "string", - "default": "python", - "description": "%param.pythonBinPath%", - "scope": "resource" - }, "idf.flashBaudRate": { "type": "string", "default": "460800", @@ -1358,8 +1291,8 @@ "category": "ESP-IDF" }, { - "command": "espIdf.setup.start", - "title": "%espIdf.setup.title%", + "command": "espIdf.installManager", + "title": "%espIdf.installManager.title%", "category": "ESP-IDF" }, { @@ -1621,11 +1554,6 @@ "title": "%espIdf.installEspMatterPyReqs.title%", "category": "ESP-IDF" }, - { - "command": "espIdf.installPyReqs", - "title": "%espIdf.installPyReqs.title%", - "category": "ESP-IDF" - }, { "command": "esp.webview.open.partition-table", "title": "%esp.webview.open.partition-table.title%", @@ -1756,11 +1684,6 @@ "title": "%espIdf.projectConf.title%", "category": "ESP-IDF" }, - { - "command": "espIdf.clearSavedIdfSetups", - "title": "%espIdf.clearSavedIdfSetups.title%", - "category": "ESP-IDF" - }, { "command": "espIdf.selectNotificationMode", "title": "%espIdf.selectNotificationMode.title%", @@ -2667,7 +2590,7 @@ "genLocalizationBundle": "npx @vscode/l10n-dev export --outDir ./l10n ./src", "webpack": "webpack --mode production", "ui-test": "yarn compile && extest setup-and-run -y -i -u -l DEBUG -o testFiles/testWorkspace/.vscode/settings.json 'out/ui-test/*-test.js'", - "ci-test": "yarn compile && extest setup-and-run './out/ui-test/*-test.js' -u -s test-resources -c min -o testFiles/testWorkspace/.vscode/settings.json -l DEBUG" + "ci-test": "yarn compile && extest setup-and-run './out/ui-test/*-test.js' -u -s test-resources -c min -o testFiles/testWorkspace/.vscode/settings.json -l DEBUG -m src/ui-test/.mocharc-ci.js" }, "devDependencies": { "@babel/types": "^7.23.0", @@ -2698,9 +2621,9 @@ "@vscode/test-electron": "^2.1.2", "@vscode/vsce": "^3.6.0", "@vue/compiler-sfc": "^3.3.4", - "bulma": "^0.9.3", + "bulma": "^1.0.4", "chai": "^4.3.4", - "css-loader": "^3.1.0", + "css-loader": "^6.8.1", "d3-scale": "^4.0.2", "file-loader": "^6.2.0", "filemanager-webpack-plugin": "^8.0.0", @@ -2716,16 +2639,16 @@ "process": "^0.11.10", "reflect-metadata": "^0.1.13", "rimraf": "^5.0.7", - "sass": "^1.49.8", - "sass-loader": "^10", + "sass": "^1.69.0", + "sass-loader": "^16.0.5", "string-replace-loader": "^3.1.0", "style-loader": "^3.3.1", - "ts-loader": "^9.4.4", + "ts-loader": "^9.5.2", "typescript": "^5.2.2", "vite": "^5.4.21", "vscode-extension-tester": "^8.17.0", "vue-hot-reload-api": "^2.3.2", - "vue-loader": "^17.2.2", + "vue-loader": "^17.4.2", "vue-router": "^4.2.4", "vue-style-loader": "^4.1.3", "webpack": "5", diff --git a/package.nls.es.json b/package.nls.es.json index 27ad8a004..93d0eb6db 100644 --- a/package.nls.es.json +++ b/package.nls.es.json @@ -24,7 +24,6 @@ "espIdf.buildFlashMonitor.title": "Construir, Flashear y Arrancar un Monitor en su Dispositivo", "espIdf.buildPartitionTable.title": "Construir tabla de partición", "espIdf.clearDocsSearchResult.title": "Limpiar resultados de búsqueda de ESP-IDF", - "espIdf.clearSavedIdfSetups.title": "Limpiar configuraciones de ESP-IDF guardadas", "espIdf.cmakeListsEditor.start.title": "Editor CMakeLists.txt", "espIdf.createDevContainer.title": "Agregar configuración de contenedor Docker", "espIdf.createIdfTerminal.title": "Abrir terminal ESP-IDF", @@ -58,7 +57,7 @@ "espIdf.idfReconfigureTask.title": "ESP-IDF: Ejecute la tarea de reconfiguración de idf.py", "espIdf.importProject.title": "Importar proyecto ESP-IDF", "espIdf.installEspMatterPyReqs.title": "Instalar paquetes Python de ESP-Matter", - "espIdf.installPyReqs.title": "Instalar paquetes Python de la extensión ESP-IDF", + "espIdf.installManager.title": "Abrir el administrador de instalación ESP-IDF", "espIdf.jtag_flash.title": "Flashear (con JTag)", "espIdf.launchQemu.title": "Iniciar servidor QEMU", "espIdf.launchWSServerAndMonitor.title": "Lanzar monitor IDF para CoreDump / GDB-Stub Mode", @@ -90,7 +89,6 @@ "espIdf.setGcovConfig.title": "Configurar SDKConfig del proyecto para cobertura", "espIdf.setMatterDevicePath.title": "Establecer Ruta del Dispositivo ESP-MATTER (ESP_MATTER_DEVICE_PATH)", "espIdf.setTarget.title": "Establecer Objetivo del Dispositivo Espressif", - "espIdf.setup.title": "Configurar Extensión ESP-IDF", "espIdf.size.title": "Análisis de tamaño de los binarios", "espIdf.unitTest.buildFlashUnitTestApp.title": "Prueba unitaria: Construir y flashear la aplicación de prueba unitaria para pruebas", "espIdf.unitTest.buildUnitTestApp.title": "Prueba unitaria: Construir aplicación de prueba unitaria", @@ -129,12 +127,6 @@ "param.enableStatusBar.title": "Habilitar elementos de la barra de estado de la extensión ESP-IDF", "param.enableUpdateSrcsToCMakeListsFile": "Habilitar actualización de archivos fuente en CMakeLists.txt", "param.esp.rainmaker.oauth.url": "URL del servidor OAuth de ESP-Rainmaker", - "param.espAdfPath": "Ruta para localizar el framework ESP-ADF (ADF_PATH)", - "param.espHomeKitSdkPath": "Ruta para localizar el framework ESP-HomeKit-SDK (HOMEKIT_PATH)", - "param.espIdfPath": "Ruta para localizar el framework ESP-IDF (IDF_PATH)", - "param.espMatterPath": "Ruta para localizar el framework ESP-Matter (ESP_MATTER_PATH)", - "param.espMdfPath": "Ruta para localizar el framework ESP-MDF (MDF_PATH)", - "param.espRainmakerPath": "Ruta para localizar el framework ESP-Rainmaker (RMAKER_PATH)", "param.exportVars": "Variables que se agregarán a las variables de entorno del sistema", "param.flashBaudRate": "Tasa de baudios de flasheo ESP-IDF", "param.flashPartitionToUse": "Especifica la partición a grabar durante el proceso de flasheo.", @@ -162,7 +154,6 @@ "param.postFlashTask": "Tarea personalizada posterior al flasheo", "param.preBuildTask": "Tarea personalizada previa a la construcción", "param.preFlashTask": "Tarea personalizada previa al flasheo", - "param.pythonBinPath": "Ruta absoluta del binario Python utilizado para ejecutar Scripts de Python de ESP-IDF", "param.qemuDebugMonitor": "Habilitar el monitor QEMU en la sesión de depuración", "param.qemuExtraArgs": "Argumentos adicionales QEMU", "param.rainmaker.api.server_url": "URL del servidor en la nube de ESP-Rainmaker", @@ -187,6 +178,9 @@ "param.hasWalkthroughBeenShown": "Indica si se ha mostrado el recorrido de bienvenida", "param.unitTestFilePattern.title": "Patrón glob para descubrir archivos de prueba unitaria", "param.serialPortDetectionTimeout": "Tiempo de espera en segundos para la detección del puerto serie usando esptool.py", + "param.eimIdfJsonPath": "Ruta personalizada de eim_idf.json para encontrar instalaciones de ESP-IDF", + "param.eimExecutableArgs": "Argumentos para pasar al ejecutable eim", + "param.currentSetup": "ESP-IDF setup id a utilizar en el proyecto definido en la ruta eim_idf.json", "trace.poll_period.description": "poll_period se establecerá para el rastreo de la aplicación", "trace.skip_size.description": "skip_size se establecerá para el rastreo de la aplicación", "trace.stop_tmo.description": "stop_tmo se establecerá para el rastreo de la aplicación", diff --git a/package.nls.json b/package.nls.json index f4cd3d9a3..383e5b441 100644 --- a/package.nls.json +++ b/package.nls.json @@ -24,7 +24,6 @@ "espIdf.buildFlashMonitor.title": "Build, Flash and Start a Monitor on Your Device", "espIdf.buildPartitionTable.title": "Build Partition Table", "espIdf.clearDocsSearchResult.title": "Clear ESP-IDF Search Results", - "espIdf.clearSavedIdfSetups.title": "Clear Saved ESP-IDF Setups", "espIdf.cmakeListsEditor.start.title": "CMakeLists.txt Editor", "espIdf.createDevContainer.title": "Add Docker Container Configuration", "espIdf.createIdfTerminal.title": "Open ESP-IDF Terminal", @@ -58,7 +57,7 @@ "espIdf.idfReconfigureTask.title": "ESP-IDF: Run idf.py reconfigure Task", "espIdf.importProject.title": "Import ESP-IDF Project", "espIdf.installEspMatterPyReqs.title": "Install ESP-Matter Python Packages", - "espIdf.installPyReqs.title": "Install ESP-IDF Extension Python Packages", + "espIdf.installManager.title": "Open ESP-IDF Install Manager", "espIdf.jtag_flash.title": "Flash (with JTag)", "espIdf.launchQemu.title": "Launch QEMU Server", "espIdf.launchWSServerAndMonitor.title": "Launch IDF Monitor for Core Dump Mode/GDB Stub Mode", @@ -90,7 +89,6 @@ "espIdf.setGcovConfig.title": "Configure Project SDKConfig for Coverage", "espIdf.setMatterDevicePath.title": "Set ESP-MATTER Device Path (ESP_MATTER_DEVICE_PATH)", "espIdf.setTarget.title": "Set Espressif Device Target", - "espIdf.setup.title": "Configure ESP-IDF Extension", "espIdf.size.title": "Size Analysis of the Binaries", "espIdf.unitTest.buildFlashUnitTestApp.title": "Unit Test: Build and Flash Unit Test App for Testing", "espIdf.unitTest.buildUnitTestApp.title": "Unit Test: Build Unit Test App", @@ -129,12 +127,6 @@ "param.enableStatusBar.title": "Enable ESP-IDF extension status bar items", "param.enableUpdateSrcsToCMakeListsFile": "Enable update source files in CMakeLists.txt", "param.esp.rainmaker.oauth.url": "ESP-Rainmaker OAuth server URL", - "param.espAdfPath": "Path to locate ESP-ADF framework (ADF_PATH)", - "param.espHomeKitSdkPath": "Path to locate ESP-HomeKit-SDK framework (HOMEKIT_PATH)", - "param.espIdfPath": "Path to locate ESP-IDF framework (IDF_PATH)", - "param.espMatterPath": "Path to locate ESP-Matter framework (ESP_MATTER_PATH)", - "param.espMdfPath": "Path to locate ESP-MDF framework (MDF_PATH)", - "param.espRainmakerPath": "Path to locate ESP-Rainmaker framework (RMAKER_PATH)", "param.exportVars": "Variables to be added to system environment variables", "param.flashBaudRate": "ESP-IDF flash baud rate", "param.flashPartitionToUse": "Specifies the partition to flash during the build and flash process.", @@ -162,7 +154,6 @@ "param.postFlashTask": "Post flash custom task", "param.preBuildTask": "Pre build custom task", "param.preFlashTask": "Pre flash custom task", - "param.pythonBinPath": "Python absolute binary path used to execute ESP-IDF Python scripts", "param.qemuDebugMonitor": "Enable QEMU Monitor on debug session", "param.qemuExtraArgs": "QEMU extra arguments", "param.rainmaker.api.server_url": "ESP-Rainmaker cloud server URL", @@ -188,6 +179,9 @@ "param.hasWalkthroughBeenShown": "Has the walkthrough been shown", "param.unitTestFilePattern.title": "Glob pattern for unit test files to discover", "param.serialPortDetectionTimeout": "Timeout in seconds for serial port detection using esptool.py", + "param.eimIdfJsonPath": "Custom path for eim_idf.json to find ESP-IDF installations", + "param.eimExecutableArgs": "Arguments to pass to the eim executable", + "param.currentSetup": "Current ESP-IDF setup id in eim_idf.json path", "trace.poll_period.description": "poll_period will be set for the apptrace", "trace.skip_size.description": "skip_size will be set for the apptrace", "trace.stop_tmo.description": "stop_tmo will be set for the apptrace", diff --git a/package.nls.pt.json b/package.nls.pt.json index 0e3027210..e5b8d3185 100644 --- a/package.nls.pt.json +++ b/package.nls.pt.json @@ -24,7 +24,6 @@ "espIdf.buildFlashMonitor.title": "Crie, atualize e inicie um monitor no seu dispositivo", "espIdf.buildPartitionTable.title": "Tabela de partição de construção", "espIdf.clearDocsSearchResult.title": "Limpar resultados da pesquisa ESP-IDF", - "espIdf.clearSavedIdfSetups.title": "Limpar configurações ESP-IDF salvas", "espIdf.cmakeListsEditor.start.title": "Editor CMakeLists.txt", "espIdf.createDevContainer.title": "Adicionar configuração de contêiner Docker", "espIdf.createIdfTerminal.title": "Abra o terminal ESP-IDF", @@ -58,7 +57,7 @@ "espIdf.idfReconfigureTask.title": "ESP-IDF: Execute a tarefa de reconfiguração idf.py", "espIdf.importProject.title": "Importar projeto ESP-IDF", "espIdf.installEspMatterPyReqs.title": "Instale pacotes ESP-Matter Python", - "espIdf.installPyReqs.title": "Instale pacotes Python de extensão ESP-IDF", + "espIdf.installManager.title": "Abra o gerenciador de instalação ESP-IDF", "espIdf.jtag_flash.title": "Flash (com JTag)", "espIdf.launchQemu.title": "Inicie o servidor QEMU", "espIdf.launchWSServerAndMonitor.title": "Inicie o IDF Monitor para modo CoreDump / GDB-Stub", @@ -90,7 +89,6 @@ "espIdf.setGcovConfig.title": "Configurar o projeto SDKConfig para cobertura", "espIdf.setMatterDevicePath.title": "Definir caminho do dispositivo ESP-MATTER (ESP_MATTER_DEVICE_PATH)", "espIdf.setTarget.title": "Definir destino do dispositivo Espressif", - "espIdf.setup.title": "Configurar extensão ESP-IDF", "espIdf.size.title": "Análise de tamanho dos binários", "espIdf.unitTest.buildFlashUnitTestApp.title": "Teste de unidade: crie e atualize o aplicativo de teste de unidade para teste", "espIdf.unitTest.buildUnitTestApp.title": "Teste de unidade: criar aplicativo de teste de unidade", @@ -129,12 +127,6 @@ "param.enableStatusBar.title": "Habilitar itens da barra de status da extensão ESP-IDF", "param.enableUpdateSrcsToCMakeListsFile": "Habilite a atualização dos arquivos de origem em CMakeLists.txt", "param.esp.rainmaker.oauth.url": "URL do servidor ESP-Rainmaker OAuth", - "param.espAdfPath": "Caminho para localizar a estrutura ESP-ADF (ADF_PATH)", - "param.espHomeKitSdkPath": "Caminho para localizar a estrutura ESP-HomeKit-SDK (HOMEKIT_PATH)", - "param.espIdfPath": "Caminho para localizar a estrutura ESP-IDF (IDF_PATH)", - "param.espMatterPath": "Caminho para localizar a estrutura ESP-Matter (ESP_MATTER_PATH)", - "param.espMdfPath": "Caminho para localizar a estrutura ESP-MDF (MDF_PATH)", - "param.espRainmakerPath": "Caminho para localizar a estrutura ESP-Rainmaker (RMAKER_PATH)", "param.exportVars": "Variáveis ​​a serem adicionadas às variáveis ​​de ambiente do sistema", "param.flashBaudRate": "Taxa de transmissão de flash ESP-IDF", "param.flashPartitionToUse": "Especifica a partição a ser gravada.", @@ -162,7 +154,6 @@ "param.postFlashTask": "Tarefa personalizada pós-flash", "param.preBuildTask": "Tarefa personalizada de pré-construção", "param.preFlashTask": "Tarefa personalizada pré-flash", - "param.pythonBinPath": "Caminho binário absoluto do Python usado para executar scripts Python ESP-IDF", "param.qemuDebugMonitor": "Ativar monitor Qemu na sessão de depuração", "param.qemuExtraArgs": "Qemu argumentos extras", "param.rainmaker.api.server_url": "URL do servidor em nuvem ESP-Rainmaker", @@ -181,11 +172,14 @@ "param.enableSerialPortChipIdRequest.title": "Habilite a detecção do ID do chip e mostre na lista de seleção de porta serial", "param.useSerialPortVendorProductFilter.title": "Use USB productID e vendorID para filtrar dispositivos Espressif conhecidos", "param.usbSerialPortFilters.title": "Lista de productID e vendorID da porta serial USB para filtrar", - "param.usbSerialPortFilters.vendorId": "Número hexadecimal do USB vendorID como string.", - "param.usbSerialPortFilters.productId": "Número hexadecimal de USB productID como string.", + "param.usbSerialPortFilters.vendorId": "Número hexadecimal do USB vendorID como string.", + "param.usbSerialPortFilters.productId": "Número hexadecimal de USB productID como string.", "param.hasWalkthroughBeenShown": "Mostrar o guia de introdução na inicialização da extensão", "param.unitTestFilePattern.title": "Padrão glob para descobrir arquivos de teste unitário", "param.serialPortDetectionTimeout": "Tempo limite em segundos para detecção de porta serial usando esptool.py", + "param.eimIdfJsonPath": "Caminho personalizado do eim_idf.json para encontrar instalações do ESP-IDF", + "param.eimExecutableArgs": "Argumentos para passar para o executável eim", + "param.currentSetup": "ID de configuração do ESP-IDF atual em EIM_IDF.JSON PATH", "trace.poll_period.description": "poll_period será definido para o apptrace", "trace.skip_size.description": "skip_size será definido para o apptrace", "trace.stop_tmo.description": "stop_tmo será definido para o apptrace", diff --git a/package.nls.ru.json b/package.nls.ru.json index 5783e437b..3e844aca6 100644 --- a/package.nls.ru.json +++ b/package.nls.ru.json @@ -24,7 +24,6 @@ "espIdf.buildFlashMonitor.title": "Собрать, прошить устойство и запустить монитор", "espIdf.buildPartitionTable.title": "Построить таблицу перегородков", "espIdf.clearDocsSearchResult.title": "Очистить результаты поиска ESP-IDF", - "espIdf.clearSavedIdfSetups.title": "Очистить сохраненные настройки ESP-IDF", "espIdf.cmakeListsEditor.start.title": "Редактор CMakeLists.txt", "espIdf.createDevContainer.title": "Добавить конфигурацию Docker-контейнера", "espIdf.createIdfTerminal.title": "Открыть терминал ESP-IDF", @@ -62,6 +61,7 @@ "espIdf.jtag_flash.title": "Прошить (через JTAG)", "espIdf.launchQemu.title": "Запуск сервера QEMU", "espIdf.launchWSServerAndMonitor.title": "Запуск IDF Monitor в режиме CoreDump/GDB-Stub.", + "espIdf.installManager.title": "Откройте диспетчер установки ESP-IDF.", "espIdf.menuconfig.start.title": "Редактор конфигурации SDK (Menuconfig)", "espIdf.monitorDevice.title": "Монитор IDF", "espIdf.monitorQemu.title": "Монитор QEMU IDF", @@ -90,7 +90,6 @@ "espIdf.setGcovConfig.title": "Конфигурация Project SDKConfig для покрытия", "espIdf.setMatterDevicePath.title": "Установка пути к устройству ESP-MATTER (ESP_MATTER_DEVICE_PATH)", "espIdf.setTarget.title": "Установка целевого устройства Espressif", - "espIdf.setup.title": "Конфигурация расширения ESP-IDF", "espIdf.size.title": "Анализ размера двоичных файлов", "espIdf.unitTest.buildFlashUnitTestApp.title": "Unit Test: Сборка и прошивка Unit Test App для тестирования", "espIdf.unitTest.buildUnitTestApp.title": "Unit Test: Сборка Unit Test App", @@ -123,22 +122,19 @@ "param.customTerminalExecutable.title": "Абсолютный путь к исполняемому файлу пользовательской оболочки терминала (по умолчанию используется VS Code Terminal)", "param.customTerminalExecutableArgs.title": "Список аргументов для пользовательской оболочки терминала", "param.extraCleanPaths": "Дополнительные пути для очистки во время задачи полной очистки", + "param.deleteComponentsOnFullClean": "Удалять папку managed_components по команде 'Полная очистка проекта'", + "param.eimIdfJsonPath": "Пользовательский путь для eim_idf.json для поиска установок ESP-IDF.", + "param.eimExecutableArgs": "Аргументы, передаваемые исполняемому файлу eim", "param.enableCCache.title": "Включить CCache в задаче сборки", "param.enableIdfComponentManager.title": "Включить Диспетчер Компонентов IDF в задаче сборки.", "param.enableSizeTaskAfterBuildTask.title": "Включить задачу 'Размер IDF' после задачи сборки", "param.enableStatusBar.title": "Включить элементы расширения ESP-IDF в строке состояния", "param.enableUpdateSrcsToCMakeListsFile": "Включить обновление исходных файлов в CMakeLists.txt", "param.esp.rainmaker.oauth.url": "URL-адрес сервера OAuth ESP-Rainmaker", - "param.espAdfPath": "Путь до фреймворка ESP-ADF (ADF_PATH)", - "param.espHomeKitSdkPath": "Путь до фреймворка ESP-HomeKit-SDK (HOMEKIT_PATH)", - "param.espIdfPath": "Путь до фреймворка ESP-IDF (IDF_PATH)", - "param.espMatterPath": "Путь до фреймворка ESP-Matter (ESP_MATTER_PATH)", - "param.espMdfPath": "Путь до фреймворка ESP-MDF (MDF_PATH)", - "param.espRainmakerPath": "Путь до фреймворка ESP-Rainmaker (RMAKER_PATH)", "param.exportVars": "Переменные, добавляемые к переменным системного окружения", "param.flashBaudRate": "Скорость прошивки ESP-IDF", "param.flashPartitionToUse": "Указывает раздел для прошивки.", - "param.jtagFlashCommandExtraArgs.title": "Openocd jtag flash дополнительные аргументы", + "param.jtagFlashCommandExtraArgs.title": "Openocd jtag flash дополнительные аргументы", "param.gitPath.title": "Путь к исполняемому файлу Git", "param.launchMonitorOnDebugSession.title": "Запуск монитора IDF вместе с сессией Адаптера Отладки ESP-IDF", "param.monitorBaudRate": "Скорость передачи данных монитора ESP-IDF", @@ -192,6 +188,7 @@ "trace.stop_tmo.description": "для apptrace будет установлен параметр stop_tmo", "trace.trace_size.description": "для apptrace будет установлен параметр trace_size", "trace.wait4halt.description": "для apptrace будет установлен параметр wait4halt", + "param.currentSetup": "Текущий идентификатор настройки ESP-IDF в пути eim_idf.json", "view.components.name": "Компоненты проекта", "view.debug.peripheral": "ESP-IDF: Обреватель периферии", "view.debug.hexView": "ESP-IDF: Шестнадцатеричный вид", diff --git a/package.nls.zh-CN.json b/package.nls.zh-CN.json index 985d15ff8..9ec28745d 100644 --- a/package.nls.zh-CN.json +++ b/package.nls.zh-CN.json @@ -24,7 +24,6 @@ "espIdf.buildFlashMonitor.title": "构建、烧录项目并监视设备", "espIdf.buildPartitionTable.title": "构建分区表", "espIdf.clearDocsSearchResult.title": "清除 ESP-IDF 搜索结果", - "espIdf.clearSavedIdfSetups.title": "清除已保存的 ESP-IDF 设置", "espIdf.cmakeListsEditor.start.title": "CMakeLists.txt 编辑器", "espIdf.createDevContainer.title": "添加 Docker 容器配置", "espIdf.createIdfTerminal.title": "打开 ESP-IDF 终端", @@ -58,7 +57,7 @@ "espIdf.idfReconfigureTask.title": "ESP-IDF: 运行 idf.py reconfigure 任务", "espIdf.importProject.title": "导入 ESP-IDF 项目", "espIdf.installEspMatterPyReqs.title": "安装 ESP-Matter Python 包", - "espIdf.installPyReqs.title": "安装 ESP-IDF 扩展 Python 包", + "espIdf.installManager.title": "打开 ESP-IDF 安装管理器", "espIdf.jtag_flash.title": "通过 JTAG 接口烧录项目", "espIdf.launchQemu.title": "启动 QEMU 服务器", "espIdf.launchWSServerAndMonitor.title": "启动 IDF 监视器以支持核心转储模式/GDB 存根模式", @@ -90,7 +89,6 @@ "espIdf.setGcovConfig.title": "配置 SDKConfig 文件以启用代码覆盖率", "espIdf.setMatterDevicePath.title": "设置 ESP-MATTER 设备路径 (ESP_MATTER_DEVICE_PATH)", "espIdf.setTarget.title": "设置乐鑫设备目标", - "espIdf.setup.title": "配置 ESP-IDF 扩展", "espIdf.size.title": "二进制文件大小分析", "espIdf.unitTest.buildFlashUnitTestApp.title": "单元测试：构建并烧录单元测试应用程序", "espIdf.unitTest.buildUnitTestApp.title": "单元测试：构建单元测试应用程序", @@ -118,6 +116,7 @@ "param.cmakeCompilerArgs": "用于 CMake 编译任务的参数", "param.coveredDarkTheme": "深色主题下 ESP-IDF 覆盖率报告中覆盖行的背景颜色", "param.coveredLightTheme": "浅色主题下 ESP-IDF 覆盖率报告中覆盖行的背景颜色", + "param.currentSetup": "eim_idf.json路径中的当前ESP-IDF设置ID", "param.customAdapterTargetName": "自定义 ESP-IDF 调试适配器目标的名称", "param.customTask": "自定义任务", "param.customTerminalExecutable.title": "自定义扩展任务的可执行文件", @@ -130,12 +129,6 @@ "param.enableStatusBar.title": "启用 ESP-IDF 扩展状态栏", "param.enableUpdateSrcsToCMakeListsFile": "在 CMakeLists.txt 文件中启用更新源文件的功能", "param.esp.rainmaker.oauth.url": "ESP-Rainmaker OAuth 服务器 URL", - "param.espAdfPath": "指定 ESP-ADF 框架的路径 (ADF_PATH)", - "param.espHomeKitSdkPath": "指定 ESP-HomeKit-SDK 框架的路径 (HOMEKIT_PATH)", - "param.espIdfPath": "指定 ESP-IDF 框架的路径 (IDF_PATH)", - "param.espMatterPath": "指定 ESP-Matter 框架的路径 (ESP_MATTER_PATH)", - "param.espMdfPath": "指定 ESP-MDF 框架的路径 (MDF_PATH)", - "param.espRainmakerPath": "指定 ESP-Rainmaker 框架的路径 (RMAKER_PATH)", "param.exportVars": "要添加到系统环境变量中的变量", "param.flashBaudRate": "ESP-IDF 烧录速率", "param.flashPartitionToUse": "指定要烧录的分区。", @@ -163,7 +156,6 @@ "param.postFlashTask": "烧录后的自定义任务", "param.preBuildTask": "构建前的自定义任务", "param.preFlashTask": "烧录前的自定义任务", - "param.pythonBinPath": "用于执行 ESP-IDF Python 脚本的 Python 绝对路径", "param.qemuDebugMonitor": "在调试会话中启用 QEMU 显示器", "param.qemuExtraArgs": "QEMU 额外的论点", "param.rainmaker.api.server_url": "ESP-Rainmaker 云服务器 URL", @@ -188,6 +180,8 @@ "param.hasWalkthroughBeenShown": "是否已经展示教程", "param.unitTestFilePattern.title": "用于发现单元测试文件的 glob 模式", "param.serialPortDetectionTimeout": "使用 esptool.py 检测串口时的超时时间（秒）", + "param.eimIdfJsonPath": "用于查找 ESP-IDF 安装的 eim_idf.json 的自定义路径", + "param.eimExecutableArgs": "传递给 eim 可执行文件的参数", "trace.poll_period.description": "设置 apptrace 的 poll_period 参数", "trace.skip_size.description": "设置 apptrace 的 skip_size 参数", "trace.stop_tmo.description": "设置 apptrace 的 stop_tmo 参数", diff --git a/src/build/buildTask.ts b/src/build/buildTask.ts index c24c20e28..073411e5c 100644 --- a/src/build/buildTask.ts +++ b/src/build/buildTask.ts @@ -22,7 +22,6 @@ import { Logger } from "../logger/logger"; import * as vscode from "vscode"; import * as idfConf from "../idfConfiguration"; import { - appendIdfAndToolsToPath, getEspIdfFromCMake, getSDKConfigFilePath, isBinInPath, @@ -31,19 +30,14 @@ import { TaskManager } from "../taskManager"; import { selectedDFUAdapterId } from "../flash/dfu"; import { getVirtualEnvPythonPath } from "../pythonManager"; import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; +import { configureEnvVariables } from "../common/prepareEnv"; import { ESP } from "../config"; - -import { - OutputCapturingExecution, - ShellOutputCapturingExecution, -} from "../taskManager/customExecution"; -import { ProcessExecutionOptions } from "vscode"; +import { OutputCapturingExecution } from "../taskManager/customExecution"; export class BuildTask { public static isBuilding: boolean; private buildDirPath: string; private currentWorkspace: vscode.Uri; - private idfPathDir: string; constructor(workspaceUri: vscode.Uri) { this.currentWorkspace = workspaceUri; @@ -76,17 +70,14 @@ export class BuildTask { throw new Error("ALREADY_BUILDING"); } this.building(true); - this.idfPathDir = idfConf.readParameter( - "idf.espIdfPath", - this.currentWorkspace - ) as string; this.buildDirPath = idfConf.readParameter( "idf.buildPath", this.currentWorkspace ) as string; await ensureDir(this.buildDirPath); - const modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace); - const processOptions: ProcessExecutionOptions = { + const modifiedEnv = await configureEnvVariables(this.currentWorkspace); + const idfPathDir = modifiedEnv["IDF_PATH"]; + const processOptions = { cwd: this.buildDirPath, env: modifiedEnv, }; @@ -118,7 +109,7 @@ export class BuildTask { let buildExecution: OutputCapturingExecution; if (!cmakeCacheExists) { - const espIdfVersion = await getEspIdfFromCMake(this.idfPathDir); + const espIdfVersion = await getEspIdfFromCMake(idfPathDir); let defaultCompilerArgs; if (espIdfVersion === "x.x") { Logger.warn( @@ -260,9 +251,10 @@ export class BuildTask { notificationMode === idfConf.NotificationMode.Output ? vscode.TaskRevealKind.Always : vscode.TaskRevealKind.Silent; - + const modifiedEnv = await configureEnvVariables(this.currentWorkspace); + const idfPathDir = modifiedEnv["IDF_PATH"]; const args = [ - join(this.idfPathDir, "tools", "mkdfu.py"), + join(idfPathDir, "tools", "mkdfu.py"), "write", "-o", join(this.buildDirPath, "dfu.bin"), @@ -271,8 +263,7 @@ export class BuildTask { "--pid", selectedDFUAdapterId(adapterTargetName).toString(), ]; - const pythonBinPath = await getVirtualEnvPythonPath(this.currentWorkspace); - const modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace); + const pythonBinPath = await getVirtualEnvPythonPath(); const processOptions = { cwd: this.buildDirPath, env: modifiedEnv, diff --git a/src/checkExtensionSettings.ts b/src/checkExtensionSettings.ts deleted file mode 100644 index 38dad3c12..000000000 --- a/src/checkExtensionSettings.ts +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Sunday, 10th May 2020 11:33:22 pm - * Copyright 2020 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import * as vscode from "vscode"; -import { isCurrentInstallValid } from "./setup/setupInit"; -import { Logger } from "./logger/logger"; -import { readParameter } from "./idfConfiguration"; -import { - checkIdfSetup, - useIdfSetupSettings, -} from "./setup/setupValidation/espIdfSetup"; -import { getIdfMd5sum } from "./setup/espIdfJson"; -import { getEspIdfFromCMake } from "./utils"; -import { IdfSetup } from "./views/setup/types"; - -export async function checkExtensionSettings( - workspace: vscode.Uri, - espIdfStatusBar: vscode.StatusBarItem -) { - const showWelcomePage = readParameter( - "idf.showOnboardingOnInit", - workspace - ) as boolean; - try { - const isExtensionConfigured = await isCurrentInstallValid(workspace); - if (showWelcomePage && isExtensionConfigured) { - vscode.commands.executeCommand("espIdf.welcome.start"); - return; - } - } catch (error) { - const msg = error.message - ? error.message - : "Checking if current install is valid throws an error."; - Logger.error(msg, error, "checkExtensionSettings"); - } - - if (!showWelcomePage) { - return; - } - - const actionItems = [ - "Open Setup wizard", - "Choose from existing ESP-IDF setups.", - ]; - - if (vscode.env.remoteName === "dev-container") { - actionItems.unshift("Use docker container configuration"); - } - - const action = await vscode.window.showInformationMessage( - "The extension configuration is not valid. Choose an action:", - ...actionItems - ); - if (!action) { - return; - } - - if (action === "Use docker container configuration") { - const idfPath = "/opt/esp/idf"; - const idfToolsPath = "/opt/esp"; - const gitPath = "/usr/bin/git"; - const idfSetupId = getIdfMd5sum(idfPath); - const idfVersion = await getEspIdfFromCMake(idfPath); - const containerIdfSetup: IdfSetup = { - id: idfSetupId, - idfPath, - gitPath, - toolsPath: idfToolsPath, - sysPythonPath: "/usr/bin/python3", - version: idfVersion, - isValid: false, - }; - containerIdfSetup.isValid = await checkIdfSetup(containerIdfSetup); - - if (!containerIdfSetup.isValid) { - vscode.window.showInformationMessage( - "The docker container configuration is not valid" - ); - return; - } - - await useIdfSetupSettings( - containerIdfSetup, - vscode.ConfigurationTarget.WorkspaceFolder, - workspace, - espIdfStatusBar - ); - return; - } - - if (action === "Open Setup wizard") { - vscode.commands.executeCommand("espIdf.setup.start"); - return; - } else if (action === "Choose from existing ESP-IDF setups.") { - vscode.commands.executeCommand("espIdf.selectCurrentIdfVersion"); - return; - } -} diff --git a/src/clang/index.ts b/src/clang/index.ts index f29adab58..dd91dceff 100644 --- a/src/clang/index.ts +++ b/src/clang/index.ts @@ -17,16 +17,17 @@ */ import { l10n, Uri, workspace } from "vscode"; -import { appendIdfAndToolsToPath, isBinInPath } from "../utils"; +import { isBinInPath } from "../utils"; import { pathExists, writeJSON, writeFile } from "fs-extra"; import { readParameter } from "../idfConfiguration"; import { join } from "path"; import { Logger } from "../logger/logger"; import { parse } from "jsonc-parser"; import { EOL } from "os"; +import { configureEnvVariables } from "../common/prepareEnv"; export async function validateEspClangExists(workspaceFolder: Uri) { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const modifiedEnv = await configureEnvVariables(workspaceFolder); const espClangdPath = await isBinInPath("clangd", modifiedEnv, ["esp-clang"]); if (espClangdPath && espClangdPath.includes("esp-clang")) { diff --git a/src/cmdTreeView/cmdStore.ts b/src/cmdTreeView/cmdStore.ts index 799d5aca5..f07066313 100644 --- a/src/cmdTreeView/cmdStore.ts +++ b/src/cmdTreeView/cmdStore.ts @@ -53,7 +53,7 @@ export enum CommandKeys { } export enum AdvancedCommandKeys { - Setup = "espIdf.setup.start", + InstallManager = "espIdf.installManager", NewProject = "espIdf.newProject.start", Size = "espIdf.size", EraseFlash = "espIdf.eraseFlash", @@ -63,7 +63,6 @@ export enum AdvancedCommandKeys { GetEspMatter = "espIdf.getEspMatter", GetRainmaker = "espIdf.getEspRainmaker", ProjectConfEditor = "espIdf.projectConfigurationEditor", - InstallIdfPythonReqs = "espIdf.installPyReqs", InstallMatterPythonReqs = "espIdf.installEspMatterPyReqs", CreateVscodeFolder = "espIdf.createVsCodeFolder", CreateDevContainerFolder = "espIdf.createDevContainer", @@ -80,10 +79,10 @@ export function createAdvancedCommandDictionary(): Record< IDFCommandDescription > { return { - [AdvancedCommandKeys.Setup]: { + [AdvancedCommandKeys.InstallManager]: { checkboxState: undefined, - iconId: "extensions", - tooltip: l10n.t("Configure ESP-IDF Extension"), + iconId: "link-external", + tooltip: l10n.t("Open ESP-IDF Installation Manager"), }, [AdvancedCommandKeys.NewProject]: { checkboxState: undefined, @@ -130,11 +129,6 @@ export function createAdvancedCommandDictionary(): Record< iconId: "project", tooltip: l10n.t("Project Configuration editor"), }, - [AdvancedCommandKeys.InstallIdfPythonReqs]: { - checkboxState: undefined, - iconId: "extensions", - tooltip: l10n.t("Install Extension Python Requirements"), - }, [AdvancedCommandKeys.InstallMatterPythonReqs]: { checkboxState: undefined, iconId: "extensions", diff --git a/src/common/abstractCloning.ts b/src/common/abstractCloning.ts index 38a1c1b7d..40896058b 100644 --- a/src/common/abstractCloning.ts +++ b/src/common/abstractCloning.ts @@ -91,7 +91,14 @@ export class AbstractCloning { workspace?: Uri, recursiveDownload?: boolean ) { - const toolsDir = await idfConf.readParameter("idf.toolsPath", workspace); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const customExtraVars = idfConf.readParameter( + "idf.customExtraVars", + workspace + ) as { [key: string]: string }; + const toolsDir = currentEnvVars["IDF_TOOLS_PATH"]; const installDir = await window.showQuickPick( [ { @@ -150,7 +157,12 @@ export class AbstractCloning { if (installDir.target === "existing") { const target = idfConf.readParameter("idf.saveScope"); - await idfConf.writeParameter(configurationId, installDirPath, target); + customExtraVars[configurationId] = installDirPath; + await idfConf.writeParameter( + "idf.customExtraVars", + customExtraVars, + target + ); Logger.infoNotify(`${this.name} has been installed`); return; } @@ -204,11 +216,20 @@ export class AbstractCloning { await this.updateSubmodules(resultingPath, undefined, progress); } const target = idfConf.readParameter("idf.saveScope"); - await idfConf.writeParameter(configurationId, resultingPath, target); + customExtraVars[configurationId] = installDirPath; + await idfConf.writeParameter( + "idf.customExtraVars", + customExtraVars, + target + ); Logger.infoNotify(`${this.name} has been installed`); } catch (error) { OutputChannel.appendLine(error.message); - Logger.errorNotify(error.message, error, "AbstractCloning getRepository"); + Logger.errorNotify( + error.message, + error, + "AbstractCloning getRepository" + ); } } ); @@ -377,7 +398,11 @@ export class AbstractCloning { if (!signal && code !== 0) { const msg = `Submodules clone has exit with ${code}`; OutputChannel.appendLine(msg); - Logger.errorNotify("Submodules cloning error", new Error(msg), "AbstractCloning spawnWithProgress"); + Logger.errorNotify( + "Submodules cloning error", + new Error(msg), + "AbstractCloning spawnWithProgress" + ); return reject(new Error(msg)); } return resolve(); @@ -414,7 +439,11 @@ export class AbstractCloning { Logger.infoNotify(`${repoName} submodules checked out successfully`); } catch (error) { OutputChannel.appendLine(error.message); - Logger.errorNotify(error.message, error, "AbstractCloning getSubmodules"); + Logger.errorNotify( + error.message, + error, + "AbstractCloning getSubmodules" + ); } } ); diff --git a/src/common/prepareEnv.ts b/src/common/prepareEnv.ts new file mode 100644 index 000000000..2697963e8 --- /dev/null +++ b/src/common/prepareEnv.ts @@ -0,0 +1,254 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Tuesday, 25th February 2025 2:10:52 pm + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Uri } from "vscode"; +import { readParameter } from "../idfConfiguration"; +import { Logger } from "../logger/logger"; +import { delimiter, dirname, join } from "path"; +import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; +import { ESP } from "../config"; +import { isBinInPath } from "../utils"; +import { pathExists } from "fs-extra"; + +/** + * Configures and prepares environment variables necessary for executing ESP-IDF tasks. + * + * Merges environment variables from the current process (`process.env`), + * stored project configuration, and relevant VS Code settings (e.g., `idf.customExtraVars`, + * `idf.gitPath`, `idf.sdkconfigFilePath`, `idf.enableIdfComponentManager`). + * + * Key actions include: + * - Setting default `IDF_PATH` and `IDF_TOOLS_PATH` if not already defined. + * - Prepending required toolchain, Python virtual environment, IDF Tools, Git + * and component directories to the system `PATH`. + * - Determining and setting `IDF_TARGET` based on the workspace's sdkconfig. + * - Setting the `IDF_COMPONENT_MANAGER` flag and `SDKCONFIG` path based on settings. + * + * @async + * @param {Uri} curWorkspace - The Uri of the current workspace, used to access settings and sdkconfig. + * @returns {Promise<{[key: string]: string}>} A promise resolving to the configured + * environment variables object, ready for use in ESP-IDF tasks. + */ +export async function configureEnvVariables( + curWorkspace: Uri +): Promise<{ [key: string]: string }> { + const modifiedEnv: { [key: string]: string } = <{ [key: string]: string }>( + Object.assign({}, process.env) + ); + + let pathNameInEnv: string = Object.keys(process.env).find( + (k) => k.toUpperCase() == "PATH" + ); + + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + + if (currentEnvVars) { + try { + for (const envVar in currentEnvVars) { + if (envVar && envVar.toUpperCase() !== "PATH") { + modifiedEnv[envVar] = currentEnvVars[envVar]; + } else if (envVar.toUpperCase() === "PATH") { + modifiedEnv[ + pathNameInEnv + ] = `${currentEnvVars[envVar]}${delimiter}${modifiedEnv[pathNameInEnv]}`; + } + } + } catch (error) { + Logger.errorNotify( + "Invalid project configuration environment variables format", + error, + "configureEnvVariables ProjectConfiguration.CURRENT_IDF_CONFIGURATION" + ); + } + } + + const customExtraVars = readParameter( + "idf.customExtraVars", + curWorkspace + ) as { [key: string]: string }; + if (customExtraVars) { + try { + for (const envVar in customExtraVars) { + if (envVar && envVar.toUpperCase() !== "PATH") { + modifiedEnv[envVar] = customExtraVars[envVar]; + } + } + } catch (error) { + Logger.errorNotify( + "Invalid user environment variables format", + error, + "configureEnvVariables idf.customExtraVars" + ); + } + } + + try { + const openOcdPath = await isBinInPath("openocd", modifiedEnv, [ + "openocd-esp32", + ]); + if (openOcdPath) { + const openOcdDir = dirname(openOcdPath); + const openOcdScriptsPath = join( + openOcdDir, + "..", + "share", + "openocd", + "scripts" + ); + const scriptsExists = await pathExists(openOcdScriptsPath); + if (scriptsExists && modifiedEnv.OPENOCD_SCRIPTS !== openOcdScriptsPath) { + modifiedEnv.OPENOCD_SCRIPTS = openOcdScriptsPath; + } + } + } catch (error) { + Logger.error( + `Error processing OPENOCD_SCRIPTS path: ${error.message}`, + error, + "configureEnvVariables OPENOCD_SCRIPTS" + ); + } + + const containerPath = + process.platform === "win32" ? modifiedEnv.USERPROFILE : modifiedEnv.HOME; + const defaultEspIdfPath = join(containerPath, "esp", "esp-idf"); + + modifiedEnv.IDF_PATH = modifiedEnv.IDF_PATH || defaultEspIdfPath; + + const defaultToolsPath = join(containerPath, ".espressif"); + modifiedEnv.IDF_TOOLS_PATH = modifiedEnv.IDF_TOOLS_PATH || defaultToolsPath; + + let pathToPigweed: string; + + if (modifiedEnv.ESP_MATTER_PATH) { + pathToPigweed = join( + modifiedEnv.ESP_MATTER_PATH, + "connectedhomeip", + "connectedhomeip", + ".environment", + "cipd", + "packages", + "pigweed" + ); + modifiedEnv.ZAP_INSTALL_PATH = join( + modifiedEnv.ESP_MATTER_PATH, + "connectedhomeip", + "connectedhomeip", + ".environment", + "cipd", + "packages", + "zap" + ); + } + + const gitPath = readParameter("idf.gitPath", curWorkspace) as string; + let pathToGitDir; + if (gitPath && gitPath !== "git") { + pathToGitDir = dirname(gitPath); + } + + if ( + pathToGitDir && + !modifiedEnv[pathNameInEnv].split(delimiter).includes(pathToGitDir) + ) { + modifiedEnv[pathNameInEnv] += delimiter + pathToGitDir; + } + if ( + pathToPigweed && + !modifiedEnv[pathNameInEnv].split(delimiter).includes(pathToPigweed) + ) { + modifiedEnv[pathNameInEnv] += delimiter + pathToPigweed; + } + if (currentEnvVars["IDF_PYTHON_ENV_PATH"]) { + const pyDir = process.platform === "win32" ? "Scripts" : "bin"; + const venvPyContainer = join(currentEnvVars["IDF_PYTHON_ENV_PATH"], pyDir); + if ( + modifiedEnv[pathNameInEnv] && + !modifiedEnv[pathNameInEnv].includes(venvPyContainer) + ) { + modifiedEnv[pathNameInEnv] = + venvPyContainer + delimiter + modifiedEnv[pathNameInEnv]; + } + } + if ( + modifiedEnv[pathNameInEnv] && + !modifiedEnv[pathNameInEnv].includes(join(modifiedEnv.IDF_PATH, "tools")) + ) { + modifiedEnv[pathNameInEnv] = + join(modifiedEnv.IDF_PATH, "tools") + + delimiter + + modifiedEnv[pathNameInEnv]; + } + + if ( + currentEnvVars[pathNameInEnv] && + currentEnvVars[pathNameInEnv].length > 0 + ) { + const extraPathsArray = currentEnvVars[pathNameInEnv].split(delimiter); + for (let extraPath of extraPathsArray) { + if ( + modifiedEnv[pathNameInEnv] && + !modifiedEnv[pathNameInEnv].includes(extraPath) + ) { + modifiedEnv[pathNameInEnv] = + extraPath + delimiter + modifiedEnv[pathNameInEnv]; + } + } + } + + let IDF_ADD_PATHS_EXTRAS = join( + modifiedEnv.IDF_PATH, + "components", + "espcoredump" + ); + IDF_ADD_PATHS_EXTRAS = `${IDF_ADD_PATHS_EXTRAS}${delimiter}${join( + modifiedEnv.IDF_PATH, + "components", + "partition_table" + )}`; + + modifiedEnv[ + pathNameInEnv + ] = `${IDF_ADD_PATHS_EXTRAS}${delimiter}${modifiedEnv[pathNameInEnv]}`; + + let idfTarget = await getIdfTargetFromSdkconfig(curWorkspace); + if (idfTarget) { + modifiedEnv.IDF_TARGET = + modifiedEnv.IDF_TARGET || idfTarget || process.env.IDF_TARGET; + } + + let enableComponentManager = readParameter( + "idf.enableIdfComponentManager", + curWorkspace + ) as boolean; + + if (enableComponentManager) { + modifiedEnv.IDF_COMPONENT_MANAGER = "1"; + } + + let sdkconfigFilePath = readParameter( + "idf.sdkconfigFilePath", + curWorkspace + ) as string; + if (sdkconfigFilePath) { + modifiedEnv.SDKCONFIG = sdkconfigFilePath; + } + + return modifiedEnv; +} diff --git a/src/common/store.ts b/src/common/store.ts index 7ab37a522..66bcd5b2d 100644 --- a/src/common/store.ts +++ b/src/common/store.ts @@ -17,7 +17,6 @@ */ import { ExtensionContext } from "vscode"; -import { ESP } from "../config"; export class ExtensionConfigStore { private static self: ExtensionConfigStore; @@ -41,26 +40,4 @@ export class ExtensionConfigStore { public clear(key: string) { return this.set(key, undefined); } - - public clearIdfSetup(key: string) { - this.clear(key); - let currSetups = this.getIdfSetupKeys(); - const idfSetupIndex = currSetups.findIndex((s) => s === key); - if (idfSetupIndex === -1) { - return; - } - currSetups.splice(idfSetupIndex, 1); - this.updateIdfSetupKeys(currSetups); - } - - public getIdfSetupKeys() { - return this.ctx.globalState.get( - ESP.GlobalConfiguration.IDF_SETUPS, - [] - ); - } - - public updateIdfSetupKeys(setupKeys: string[]) { - this.ctx.globalState.update(ESP.GlobalConfiguration.IDF_SETUPS, setupKeys); - } } diff --git a/src/component-manager/utils.ts b/src/component-manager/utils.ts index b40a2e088..6499f5060 100644 --- a/src/component-manager/utils.ts +++ b/src/component-manager/utils.ts @@ -16,12 +16,14 @@ import { existsSync } from "fs"; import { Logger } from "../logger/logger"; -import { spawn, appendIdfAndToolsToPath } from "../utils"; +import { spawn } from "../utils"; import { CancellationToken, Uri, l10n } from "vscode"; import { readParameter } from "../idfConfiguration"; import { join } from "path"; import { getVirtualEnvPythonPath } from "../pythonManager"; import { EOL } from "os"; +import { configureEnvVariables } from "../common/prepareEnv"; +import { ESP } from "../config"; export async function addDependency( workspace: Uri, @@ -30,10 +32,13 @@ export async function addDependency( cancelToken: CancellationToken ) { try { - const idfPathDir = readParameter("idf.espIdfPath", workspace); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPathDir = currentEnvVars["IDF_PATH"]; const idfPy = join(idfPathDir, "tools", "idf.py"); - const modifiedEnv = await appendIdfAndToolsToPath(workspace); - const pythonBinPath = await getVirtualEnvPythonPath(workspace); + const modifiedEnv = await configureEnvVariables(workspace); + const pythonBinPath = await getVirtualEnvPythonPath(); const enableCCache = readParameter( "idf.enableCCache", workspace @@ -78,10 +83,13 @@ export async function createProject( example: string ): Promise { try { - const idfPathDir = readParameter("idf.espIdfPath"); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPathDir = currentEnvVars["IDF_PATH"]; const idfPy = join(idfPathDir, "tools", "idf.py"); - const modifiedEnv = await appendIdfAndToolsToPath(workspace); - const pythonBinPath = await getVirtualEnvPythonPath(workspace); + const modifiedEnv = await configureEnvVariables(workspace); + const pythonBinPath = await getVirtualEnvPythonPath(); if ( !existsSync(idfPathDir) || diff --git a/src/config.ts b/src/config.ts index eec066350..6ebd78399 100644 --- a/src/config.ts +++ b/src/config.ts @@ -30,6 +30,7 @@ export namespace ESP { export namespace ProjectConfiguration { export let store: ProjectConfigStore; export const SELECTED_CONFIG = "SELECTED_PROJECT_CONFIG"; + export const CURRENT_IDF_CONFIGURATION = "CURRENT_IDF_CONFIGURATION"; export const PROJECT_CONFIGURATION_FILENAME = "esp_idf_project_configuration.json"; } @@ -53,21 +54,15 @@ export namespace ESP { export namespace GlobalConfiguration { export let store: ExtensionConfigStore; - export const IDF_SETUPS = "IDF_SETUPS"; export const SELECTED_WORKSPACE_FOLDER = "SELECTED_WORKSPACE_FOLDER"; } export const platformDepConfigurations: string[] = [ - "idf.buildPath", "idf.espIdfPath", - "idf.espAdfPath", - "idf.espMdfPath", - "idf.espRainmakerPath", - "idf.espHomeKitSdkPath", + "idf.toolsPath", + "idf.buildPath", "idf.gitPath", - "idf.pythonBinPath", "idf.port", - "idf.toolsPath", ]; export namespace Rainmaker { @@ -140,6 +135,10 @@ export namespace ESP { export const README = ESP.URL.GithubRepository + "/blob/master/README.md"; export const FLASH_ENCRYPTION = "/security/flash-encryption.html"; } + + export namespace InstallManager { + export const Releases = "https://dl.espressif.com/dl/eim/index.html"; + } } export namespace Webview { diff --git a/src/coverage/configureProject.ts b/src/coverage/configureProject.ts index f7247f34e..5abe01e41 100644 --- a/src/coverage/configureProject.ts +++ b/src/coverage/configureProject.ts @@ -16,7 +16,11 @@ * limitations under the License. */ -import { extensionContext, getConfigValueFromSDKConfig, getEspIdfFromCMake } from "../utils"; +import { + extensionContext, + getConfigValueFromSDKConfig, + getEspIdfFromCMake, +} from "../utils"; import { NotificationMode, readParameter } from "../idfConfiguration"; import { ConfserverProcess } from "../espIdf/menuconfig/confServerProcess"; import { @@ -27,8 +31,12 @@ import { Progress, CancellationToken, } from "vscode"; -import { getDocsLocaleLang, getDocsVersion } from "../espIdf/documentation/getDocsVersion"; +import { + getDocsLocaleLang, + getDocsVersion, +} from "../espIdf/documentation/getDocsVersion"; import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; +import { ESP } from "../config"; export async function configureProjectWithGcov(workspacePath: Uri) { const appTraceDestTrax = await getConfigValueFromSDKConfig( @@ -70,7 +78,9 @@ export async function configureProjectWithGcov(workspacePath: Uri) { appTraceGcovEnable === "y"; if (isGcovEnabled) { - return window.showInformationMessage("Code coverage is already enabled in sdkconfig"); + return window.showInformationMessage( + "Code coverage is already enabled in sdkconfig" + ); } if (!ConfserverProcess.exists()) { @@ -120,13 +130,13 @@ export async function configureProjectWithGcov(workspacePath: Uri) { export async function openCoverageUrl(workspacePath: Uri) { const docsVersions = await getDocsVersion(); - const idfPath = - readParameter("idf.espIdfPath", workspacePath) || process.env.IDF_PATH; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPath = currentEnvVars["IDF_PATH"]; let idfVersion = "v" + (await getEspIdfFromCMake(idfPath)); let idfTarget = await getIdfTargetFromSdkconfig(workspacePath); - let docVersion = docsVersions.find( - (docVer) => docVer.name === idfVersion - ); + let docVersion = docsVersions.find((docVer) => docVer.name === idfVersion); let targetToUse: string = "esp32"; if (!docVersion) { docVersion = docsVersions.find((docVer) => docVer.name === "latest"); diff --git a/src/coverage/gcdaPaths.ts b/src/coverage/gcdaPaths.ts index ace4eb81a..21c45791b 100644 --- a/src/coverage/gcdaPaths.ts +++ b/src/coverage/gcdaPaths.ts @@ -20,12 +20,11 @@ import { readdir, stat } from "fs-extra"; import { extname, join } from "path"; import { Uri } from "vscode"; import { getGcovExecutable } from "./coverageService"; -import { readParameter } from "../idfConfiguration"; import { exec } from "child_process"; -import { appendIdfAndToolsToPath } from "../utils"; import { IGcovOutput } from "./gcovData"; import { Logger } from "../logger/logger"; import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; +import { configureEnvVariables } from "../common/prepareEnv"; export async function getGcdaPaths(workspaceFolder: Uri) { const gcdaPaths: Set = new Set(); @@ -64,7 +63,7 @@ export async function getGcovData(workspaceFolder: Uri) { } return new Promise(async (resolve, reject) => { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const modifiedEnv = await configureEnvVariables(workspaceFolder); exec( command, { diff --git a/src/customTasks/customTaskProvider.ts b/src/customTasks/customTaskProvider.ts index 6456ca0c0..5eb0bf366 100644 --- a/src/customTasks/customTaskProvider.ts +++ b/src/customTasks/customTaskProvider.ts @@ -28,8 +28,8 @@ import { } from "vscode"; import { NotificationMode, readParameter } from "../idfConfiguration"; import { TaskManager } from "../taskManager"; -import { appendIdfAndToolsToPath } from "../utils"; import { ShellOutputCapturingExecution } from "../taskManager/customExecution"; +import { configureEnvVariables } from "../common/prepareEnv"; export enum CustomTaskType { Custom = "custom", @@ -84,7 +84,7 @@ export class CustomTask { if (!command) { return; } - const modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace); + const modifiedEnv = await configureEnvVariables(this.currentWorkspace); const options: ShellExecutionOptions = { cwd: this.currentWorkspace.fsPath, env: modifiedEnv, diff --git a/src/downloadManager.ts b/src/downloadManager.ts deleted file mode 100644 index b1c3b61bb..000000000 --- a/src/downloadManager.ts +++ /dev/null @@ -1,564 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as del from "del"; -import * as fs from "fs"; -import { ensureDir, pathExists } from "fs-extra"; -import * as path from "path"; -import * as vscode from "vscode"; -import axios, { AxiosRequestConfig, AxiosResponse, CancelToken } from "axios"; -import { IdfToolsManager } from "./idfToolsManager"; -import { IFileInfo, IPackage } from "./IPackage"; -import { Logger } from "./logger/logger"; -import { OutputChannel } from "./logger/outputChannel"; -import { PackageError } from "./packageError"; -import { PackageProgress } from "./PackageProgress"; -import { PackageManagerWebError } from "./packageWebError"; -import * as utils from "./utils"; -import { ESP } from "./config"; - -export class DownloadManager { - private readonly MAX_RETRIES = 5; - private readonly TIMEOUT = 30000; // 30 seconds - - constructor( - private installPath: string, - private refreshUIRate: number = 0.5 - ) {} - - public getToolPackagesPath(toolPackage: string[]) { - return path.resolve(this.installPath, ...toolPackage); - } - - public downloadPackages( - idfToolsManager: IdfToolsManager, - progress: vscode.Progress<{ message?: string; increment?: number }>, - mirror: ESP.IdfMirror, - pkgsProgress?: PackageProgress[], - cancelToken?: vscode.CancellationToken, - onReqPkgs?: string[] - ): Promise { - return idfToolsManager.getPackageList(onReqPkgs).then((packages) => { - let count: number = 1; - return utils.buildPromiseChain( - packages, - (pkg): Promise => { - let pkgProgressToUse: PackageProgress; - if (pkgsProgress) { - pkgProgressToUse = pkgsProgress.find((pkgProgress) => { - return pkgProgress.name === pkg.name; - }); - } - const p: Promise = this.downloadPackage( - idfToolsManager, - mirror, - pkg, - `${count}/${packages.length}`, - progress, - pkgProgressToUse, - cancelToken - ); - count += 1; - return p; - } - ); - }); - } - - public async downloadPackage( - idfToolsManager: IdfToolsManager, - mirror: ESP.IdfMirror, - pkg: IPackage, - progressCount: string, - progress: vscode.Progress<{ message?: string; increment?: number }>, - pkgProgress?: PackageProgress, - cancelToken?: vscode.CancellationToken - ): Promise { - progress.report({ message: `Downloading ${progressCount}: ${pkg.name}` }); - this.appendChannel(`Downloading ${pkg.description}`); - const urlInfoToUse = idfToolsManager.obtainUrlInfoForPlatform(pkg); - if (mirror == ESP.IdfMirror.Espressif) { - urlInfoToUse.url = idfToolsManager.applyGithubAssetsMapping( - urlInfoToUse.url - ); - } - this.appendChannel( - `Using mirror ${ - mirror == ESP.IdfMirror.Espressif ? "Espressif" : "Github" - } with URL ${urlInfoToUse.url}` - ); - await this.downloadPackageWithRetries( - pkg, - urlInfoToUse, - pkgProgress, - cancelToken - ); - } - - public async downloadPackageWithRetries( - pkg: IPackage, - urlInfoToUse: IFileInfo, - pkgProgress?: PackageProgress, - cancelToken?: vscode.CancellationToken - ): Promise { - const fileName = utils.fileNameFromUrl(urlInfoToUse.url); - const destPath = this.getToolPackagesPath(["dist"]); - const absolutePath: string = this.getToolPackagesPath(["dist", fileName]); - - const pkgExists = await pathExists(absolutePath); - if (pkgExists) { - const checksumEqual = await utils.validateFileSizeAndChecksum( - absolutePath, - urlInfoToUse.sha256, - urlInfoToUse.size - ); - if (checksumEqual) { - pkgProgress.FileMatchChecksum = checksumEqual; - this.appendChannel( - `Found ${pkg.name} in ${this.installPath + path.sep}dist` - ); - pkgProgress.Progress = `100.00%`; - pkgProgress.ProgressDetail = `(${(urlInfoToUse.size / 1024).toFixed( - 2 - )} / ${(urlInfoToUse.size / 1024).toFixed(2)}) KB`; - return; - } else { - this.appendChannel( - `Checksum mismatch for ${pkg.name}, will resume download` - ); - // Don't delete the file - we'll resume from where we left off - } - } - - // Download with resume capability - await this.downloadWithResume( - urlInfoToUse.url, - destPath, - pkgProgress, - cancelToken, - urlInfoToUse.size - ); - - // Validate the downloaded file - pkgProgress.FileMatchChecksum = await utils.validateFileSizeAndChecksum( - absolutePath, - urlInfoToUse.sha256, - urlInfoToUse.size - ); - } - - /** - * Download file with resume capability using HTTP Range requests - */ - public async downloadWithResume( - urlToUse: string, - destPath: string, - pkgProgress?: PackageProgress, - cancelToken?: vscode.CancellationToken, - expectedSize?: number - ): Promise { - const fileName = utils.fileNameFromUrl(urlToUse); - const absolutePath = path.resolve(destPath, fileName); - - // Ensure destination directory exists - await ensureDir(destPath, { mode: 0o775 }); - - let retryCount = 0; - let lastError: Error; - - while (retryCount < this.MAX_RETRIES) { - try { - let startByte = 0; - - if (await pathExists(absolutePath)) { - const stats = await fs.promises.stat(absolutePath); - startByte = stats.size; - - // Check if file is already complete - if (expectedSize && startByte >= expectedSize) { - this.appendChannel( - `File ${fileName} already exists and appears to be complete (${startByte} bytes >= ${expectedSize} expected)` - ); - if (pkgProgress) { - pkgProgress.Progress = "100.00%"; - pkgProgress.ProgressDetail = `(${(expectedSize / 1024).toFixed( - 2 - )} / ${(expectedSize / 1024).toFixed(2)}) KB`; - } - return { status: 200, data: null }; // Return success for completed download - } - - if (startByte > 0) { - this.appendChannel( - `Resuming download of ${fileName} from byte ${startByte}` - ); - } - } - - // Check if server supports range requests - const supportsRange = await this.checkRangeSupport(urlToUse); - - let response: any; - - if (supportsRange && startByte > 0) { - // Resume download using range requests - response = await this.downloadWithRange( - urlToUse, - absolutePath, - startByte, - pkgProgress, - cancelToken, - expectedSize - ); - } else { - // Full download (either no range support or starting from beginning) - if (startByte > 0) { - this.appendChannel( - `Server doesn't support range requests, starting fresh download` - ); - await del(absolutePath, { force: true }); - } - response = await this.downloadFull( - urlToUse, - absolutePath, - pkgProgress, - cancelToken, - expectedSize - ); - } - - this.appendChannel(`Successfully downloaded ${fileName}`); - return response; - } catch (error) { - lastError = error; - retryCount++; - - // Handle 416 Range Not Satisfiable error specifically - if (error.response && error.response.status === 416) { - this.appendChannel( - `Received 416 Range Not Satisfiable for ${fileName}. File may already be complete.` - ); - - // Check if the file exists and has reasonable size - if (await pathExists(absolutePath)) { - const stats = await fs.promises.stat(absolutePath); - if (stats.size > 0) { - this.appendChannel( - `File ${fileName} exists with size ${stats.size} bytes. Treating as complete.` - ); - if (pkgProgress) { - const size = expectedSize || stats.size; - pkgProgress.Progress = "100.00%"; - pkgProgress.ProgressDetail = `(${(size / 1024).toFixed(2)} / ${( - size / 1024 - ).toFixed(2)}) KB`; - } - return { status: 200, data: null }; // Return success for completed download - } - } - } - - if (cancelToken && cancelToken.isCancellationRequested) { - throw new PackageError( - "Download cancelled by user", - "downloadWithResume" - ); - } - - if (retryCount >= this.MAX_RETRIES) { - this.appendChannel( - `Failed to download ${urlToUse} after ${this.MAX_RETRIES} attempts` - ); - throw error; - } - - // Calculate exponential backoff delay - const delay = Math.min(1000 * Math.pow(2, retryCount - 1), 10000); - this.appendChannel( - `Download failed (attempt ${retryCount}/${this.MAX_RETRIES}). Retrying in ${delay}ms...` - ); - this.appendChannel(`Error: ${error.message || error}`); - - // Wait before retry - await new Promise((resolve) => setTimeout(resolve, delay)); - } - } - - throw lastError; - } - - /** - * Check if server supports HTTP Range requests - */ - private async checkRangeSupport(url: string): Promise { - try { - const config: AxiosRequestConfig = { - method: "HEAD", - timeout: this.TIMEOUT, - headers: { - "User-Agent": ESP.HTTP_USER_AGENT, - }, - }; - - const response = await axios.head(url, config); - const acceptRanges = response.headers["accept-ranges"]; - const contentRange = response.headers["content-range"]; - - return acceptRanges === "bytes" || !!contentRange; - } catch (error) { - this.appendChannel(`Could not check range support: ${error.message}`); - return false; - } - } - - /** - * Download file using HTTP Range requests for resume capability - */ - private async downloadWithRange( - url: string, - filePath: string, - startByte: number, - pkgProgress?: PackageProgress, - cancelToken?: vscode.CancellationToken, - expectedSize?: number - ): Promise { - const fileName = path.basename(filePath); - const fileStream = fs.createWriteStream(filePath, { - flags: "a", - mode: 0o775, - }); // Append mode - - const config: AxiosRequestConfig = { - method: "GET", - timeout: this.TIMEOUT, - responseType: "stream", - headers: { - "User-Agent": ESP.HTTP_USER_AGENT, - Range: `bytes=${startByte}-`, - }, - cancelToken: cancelToken - ? this.createCancelToken(cancelToken) - : undefined, - }; - - this.appendChannel( - `Downloading ${fileName} with range request from byte ${startByte}` - ); - - try { - const response = await axios.get(url, config); - - if (response.status !== 206 && response.status !== 200) { - throw new PackageManagerWebError( - null, - "HTTP Range Request Error", - "downloadWithRange", - `Unexpected status code: ${response.status}`, - response.status.toString() - ); - } - const contentRange = response.headers["content-range"]; - let totalSize = expectedSize || 0; - - // Parse content-range header to get total size - if (contentRange) { - const match = contentRange.match(/bytes \d+-\d+\/(\d+)/); - if (match) { - totalSize = parseInt(match[1], 10); - } - } - - let downloadedSize = startByte; - let lastProgressUpdate = 0; - - response.data.on("data", (chunk: Buffer) => { - downloadedSize += chunk.length; - - if (pkgProgress && totalSize > 0) { - const progress = (downloadedSize / totalSize) * 100; - const progressDetail = `(${(downloadedSize / 1024).toFixed(2)} / ${( - totalSize / 1024 - ).toFixed(2)}) KB`; - - // Update progress only if significant change - if ( - progress - lastProgressUpdate >= this.refreshUIRate || - downloadedSize === totalSize - ) { - pkgProgress.Progress = `${progress.toFixed(2)}%`; - pkgProgress.ProgressDetail = progressDetail; - lastProgressUpdate = progress; - } - } - }); - - response.data.pipe(fileStream); - - return new Promise((resolve, reject) => { - fileStream.on("finish", () => { - this.appendChannel(`Range download completed: ${fileName}`); - resolve(response); - }); - - fileStream.on("error", (error) => { - reject( - new PackageError( - `File write error: ${error.message}`, - "downloadWithRange", - error - ) - ); - }); - - response.data.on("error", (error) => { - reject( - new PackageError( - `Download stream error: ${error.message}`, - "downloadWithRange", - error - ) - ); - }); - }); - } catch (error) { - // Close the file stream if it was opened - if (fileStream) { - fileStream.end(); - } - - // Re-throw the error to be handled by the calling method - throw error; - } - } - - /** - * Download full file (no resume capability) - */ - private async downloadFull( - url: string, - filePath: string, - pkgProgress?: PackageProgress, - cancelToken?: vscode.CancellationToken, - expectedSize?: number - ): Promise { - const fileName = path.basename(filePath); - const fileStream = fs.createWriteStream(filePath, { mode: 0o775 }); - - const config: AxiosRequestConfig = { - method: "GET", - timeout: this.TIMEOUT, - responseType: "stream", - headers: { - "User-Agent": ESP.HTTP_USER_AGENT, - }, - cancelToken: cancelToken - ? this.createCancelToken(cancelToken) - : undefined, - }; - - this.appendChannel(`Downloading ${fileName} (full download)`); - - const response = await axios.get(url, config); - - if (response.status !== 200) { - throw new PackageManagerWebError( - null, - "HTTP Download Error", - "downloadFull", - `Unexpected status code: ${response.status}`, - response.status.toString() - ); - } - - const contentLength = parseInt( - response.headers["content-length"] || "0", - 10 - ); - const totalSize = expectedSize || contentLength; - let downloadedSize = 0; - let lastProgressUpdate = 0; - - response.data.on("data", (chunk: Buffer) => { - downloadedSize += chunk.length; - - if (pkgProgress && totalSize > 0) { - const progress = (downloadedSize / totalSize) * 100; - const progressDetail = `(${(downloadedSize / 1024).toFixed(2)} / ${( - totalSize / 1024 - ).toFixed(2)}) KB`; - - // Update progress only if significant change - if ( - progress - lastProgressUpdate >= this.refreshUIRate || - downloadedSize === totalSize - ) { - pkgProgress.Progress = `${progress.toFixed(2)}%`; - pkgProgress.ProgressDetail = progressDetail; - lastProgressUpdate = progress; - } - } - }); - - response.data.pipe(fileStream); - - return new Promise((resolve, reject) => { - fileStream.on("finish", () => { - this.appendChannel( - `Full download completed: ${fileName} into ${filePath}` - ); - resolve(response); - }); - - fileStream.on("error", (error) => { - reject( - new PackageError( - `File write error: ${error.message}`, - "downloadFull", - error - ) - ); - }); - - response.data.on("error", (error) => { - reject( - new PackageError( - `Download stream error: ${error.message}`, - "downloadFull", - error - ) - ); - }); - }); - } - - /** - * Create axios cancel token from VS Code cancellation token - */ - private createCancelToken( - cancelToken: vscode.CancellationToken - ): CancelToken { - const source = axios.CancelToken.source(); - - cancelToken.onCancellationRequested(() => { - source.cancel("Download cancelled by user"); - }); - - return source.token; - } - - private appendChannel(text: string): void { - OutputChannel.appendLine(text); - Logger.info(text); - } -} diff --git a/src/efuse/index.ts b/src/efuse/index.ts index 274893c77..2fbe98303 100644 --- a/src/efuse/index.ts +++ b/src/efuse/index.ts @@ -25,6 +25,7 @@ import { Logger } from "../logger/logger"; import { Uri, l10n } from "vscode"; import { getVirtualEnvPythonPath } from "../pythonManager"; import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; +import { ESP } from "../config"; export type ESPEFuseSummary = { [category: string]: [ @@ -51,8 +52,10 @@ export class ESPEFuseManager { private idfPath: string; constructor(private workspace: Uri) { - this.idfPath = - readParameter("idf.espIdfPath", workspace) || process.env.IDF_PATH; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + this.idfPath = currentEnvVars["IDF_PATH"] || process.env.IDF_PATH; } async summary(): Promise { @@ -78,7 +81,7 @@ export class ESPEFuseManager { async readSummary() { const tempFile = join(tmpdir(), "espefusejsondump.tmp"); - const pythonPath = await getVirtualEnvPythonPath(this.workspace); + const pythonPath = await getVirtualEnvPythonPath(); const port = await readSerialPort(this.workspace, false); if (!port) { diff --git a/src/eim/downloadInstall.ts b/src/eim/downloadInstall.ts new file mode 100644 index 000000000..3fd3c4942 --- /dev/null +++ b/src/eim/downloadInstall.ts @@ -0,0 +1,477 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Monday, 28th April 2025 4:34:49 pm + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import axios from "axios"; +import { tmpdir } from "os"; +import { basename, dirname, extname, join, resolve as pathResolve } from "path"; +import { + createWriteStream, + ensureDir, + move, + pathExists, + ReadStream, + remove, + WriteStream, +} from "fs-extra"; +import { CancellationToken, env, Progress, window } from "vscode"; +import { OutputChannel } from "../logger/outputChannel"; +import del from "del"; +import { dirExistPromise } from "../utils"; +import * as yauzl from "yauzl"; +import { Logger } from "../logger/logger"; +import { getEimIdfJson } from "./getExistingSetups"; +import { readParameter } from "../idfConfiguration"; + +export async function runExistingEIM( + progress: Progress<{ message: string; increment: number }>, + cancelToken: CancellationToken +): Promise { + let eimPath = ""; + if (cancelToken.isCancellationRequested) { + return false; + } + progress.report({ + message: `Checking EIM already exists...`, + increment: 0, + }); + try { + const eimJSON = await getEimIdfJson(); + if (eimJSON && eimJSON.eimPath) { + const doesEimPathExists = await pathExists(eimJSON.eimPath); + if (doesEimPathExists) { + eimPath = eimJSON.eimPath; + } + } + // 2. Check EIM_PATH env variable if not found in eim_idf.json + if (!eimPath) { + eimPath = process.env.EIM_PATH || ""; + } + // 3. Use default path based on platform if still not found + if (!eimPath) { + if (process.platform === "win32") { + eimPath = join( + process.env.USERPROFILE || "", + ".espressif", + "eim_gui", + "eim-gui-windows-x64.exe" + ); + } else if (process.platform === "darwin") { + eimPath = "/Applications/eim.app"; + } else if (process.platform === "linux") { + eimPath = join(process.env.HOME || "", ".espressif", "eim_gui", "eim"); + } + } + const doesEimPathExists = await pathExists(eimPath); + if (!doesEimPathExists) { + throw new Error(`EIM not found at ${eimPath}`); + } + } catch (error) { + Logger.error( + `Error while running existing EIM: ${error.message}`, + error, + "runExistingEIM" + ); + return false; + } + + progress.report({ + message: `EIM found at ${eimPath}. Launching...`, + increment: 0, + }); + + // Read idf.eimExecutableArgs with utils.readParameter and use it to run EIM + const idfEimExecutableArgs = readParameter( + "idf.eimExecutableArgs" + ) as string[]; + const argsString = idfEimExecutableArgs.join(" "); + + let binaryPath = ""; + if (process.platform === "win32") { + binaryPath = `& '${eimPath.replace(/'/g, "''")}'${ + argsString ? " " + argsString : "" + }`; + } else if (process.platform === "linux") { + binaryPath = `./${basename(eimPath)}${argsString ? " " + argsString : ""}`; + } else if (process.platform === "darwin") { + binaryPath = `open ${eimPath}${argsString ? " --args " + argsString : ""}`; + } + const shellPath = + process.platform === "win32" + ? "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" + : env.shell; + const espIdfTerminal = window.createTerminal({ + name: "ESP-IDF EIM", + shellPath: shellPath, + cwd: dirname(eimPath), + }); + espIdfTerminal.sendText(binaryPath, true); + espIdfTerminal.sendText("exit"); + return true; +} + +export async function downloadExtractAndRunEIM( + progress: Progress<{ message: string; increment: number }>, + cancelToken: CancellationToken, + useMirror: boolean = false +): Promise { + const jsonUrl = "https://dl.espressif.com/dl/eim/eim_unified_release.json"; + // Determine EIM install path + let eimInstallPath = ""; + if (process.platform === "win32") { + eimInstallPath = join( + process.env.USERPROFILE || "", + ".espressif", + "eim_gui" + ); + } else if (process.platform === "darwin") { + eimInstallPath = "/Applications"; + } else if (process.platform === "linux") { + eimInstallPath = join(process.env.HOME || "", ".espressif", "eim_gui"); + } + + try { + progress.report({ + message: `Downloading EIM versions...`, + increment: 0, + }); + const response = await axios.get(jsonUrl, { + headers: { "Cache-Control": "no-cache" }, + }); + const data = response.data; + + const arch = process.arch; + let osKey: string; + + if (process.platform === "darwin") { + osKey = + arch === "arm64" + ? "eim-gui-macos-aarch64.zip" + : "eim-gui-macos-x64.zip"; + } else if (process.platform === "win32") { + osKey = "eim-gui-windows-x64.exe"; + } else if (process.platform === "linux") { + osKey = + arch === "arm64" + ? "eim-gui-linux-aarch64.zip" + : "eim-gui-linux-x64.zip"; + } else { + throw new Error(`Unsupported platform: ${process.platform}`); + } + const fileInfo = data.assets.find((asset: any) => asset.name === osKey); + if (!fileInfo) { + throw new Error(`No file found for OS and architecture: ${osKey}`); + } + + progress.report({ + message: `Downloading EIM: ${fileInfo.browser_download_url}`, + increment: 0, + }); + OutputChannel.appendLine( + `Downloading EIM: ${fileInfo.browser_download_url}`, + "EIM Download" + ); + + let downloadUrl = fileInfo.browser_download_url; + const fileName = basename(downloadUrl); + const downloadPath = join(eimInstallPath, fileName); + + const doesDownloadPathExists = await pathExists(downloadPath); + if (!doesDownloadPathExists) { + if (useMirror) { + downloadUrl = downloadUrl.replace( + "https://github.com", + "https://dl.espressif.com/github_assets" + ); + } + + const doesTmpDirExists = await pathExists(eimInstallPath); + if (!doesTmpDirExists) { + await ensureDir(eimInstallPath); + } + + const writeStream: WriteStream = createWriteStream(downloadPath, { + mode: 0o755, + }); + const fileResponseStream = await axios({ + method: "get", + url: downloadUrl, + responseType: "stream", + }); + const { headers } = await axios.head(downloadUrl); + const totalSize = parseInt(headers["content-length"], 10); + + let downloadedSize = 0; + fileResponseStream.data.on("data", (chunk: Buffer) => { + if (cancelToken.isCancellationRequested) { + fileResponseStream.data.destroy(); + throw new Error("Download canceled by user."); + } + downloadedSize += chunk.length; + if (totalSize) { + const percentCompleted = Math.round( + (downloadedSize * 100) / totalSize + ); + const increment = Math.round((chunk.length * 100) / totalSize); + progress.report({ + message: `Downloading EIM... ${percentCompleted}%`, + increment, + }); + } + }); + fileResponseStream.data.pipe(writeStream); + + await new Promise((resolve, reject) => { + fileResponseStream.data.on("end", resolve); + fileResponseStream.data.on("error", reject); + }); + OutputChannel.appendLine( + `File downloaded and extracted to: ${downloadPath}` + ); + } else { + OutputChannel.appendLine(`Using existing: ${downloadPath}`); + progress.report({ + message: `Using existing: ${downloadPath}`, + increment: 0, + }); + } + + if (process.platform !== "win32") { + await installZipFile(downloadPath, eimInstallPath, cancelToken); + Logger.infoNotify(`File ${osKey} extracted to: ${eimInstallPath}`); + } + + const idfEimExecutableArgs = readParameter( + "idf.eimExecutableArgs" + ) as string[]; + const argsString = idfEimExecutableArgs.join(" "); + + let binaryPath = ""; + if (process.platform === "win32") { + binaryPath = `& '${join( + eimInstallPath, + "eim-gui-windows-x64.exe" + ).replace(/'/g, "''")}'${ + argsString ? " " + argsString : "" + }`; + } else if (process.platform === "linux") { + binaryPath = `./eim${ + argsString ? " " + argsString : "" + }`; + } else if (process.platform === "darwin") { + binaryPath = `open ${join(eimInstallPath, "eim.app")}${ + argsString ? " --args " + argsString : "" + }`; + } + const shellPath = + process.platform === "win32" + ? "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" + : env.shell; + const espIdfTerminal = window.createTerminal({ + name: "ESP-IDF EIM", + shellPath: shellPath, + cwd: eimInstallPath, + }); + espIdfTerminal.sendText(binaryPath, true); + espIdfTerminal.sendText("exit"); + } catch (error) { + Logger.errorNotify( + `Error during download and extraction: ${error.message}`, + error, + "downloadAndExtractEIM" + ); + } +} + +export class ZipFileError extends Error { + constructor( + public message: string, + public methodName: string, + public innerError: any = null, + public errorCode: string = " " + ) { + super(message); + this.errorCode = errorCode; + this.innerError = innerError; + this.methodName = methodName; + } +} + +export async function installZipFile( + zipFilePath: string, + destPath: string, + cancelToken?: CancellationToken +) { + return new Promise(async (resolve, reject) => { + const doesZipFileExists = await pathExists(zipFilePath); + if (!doesZipFileExists) { + return reject(`File ${zipFilePath} doesn't exist.`); + } + yauzl.open(zipFilePath, { lazyEntries: true }, (error, zipfile) => { + if (error) { + return reject( + new ZipFileError("Zip file error", "InstallZipFile", error) + ); + } + if (cancelToken && cancelToken.isCancellationRequested) { + return reject( + new ZipFileError("Install cancelled by user", "InstallZipFile") + ); + } + + zipfile.on("end", () => { + return resolve(); + }); + zipfile.on("error", (err) => { + return reject( + new ZipFileError("Zip File error", "InstallZipFile", err) + ); + }); + + zipfile.readEntry(); + zipfile.on("entry", async (entry: yauzl.Entry) => { + const absolutePath: string = pathResolve(destPath, entry.fileName); + const dirExists = await dirExistPromise(absolutePath); + if (dirExists) { + try { + await del(absolutePath, { force: true }); + } catch (err) { + OutputChannel.appendLine( + `Error deleting previous ${absolutePath}: ${err.message}` + ); + return reject( + new ZipFileError( + "Install folder cant be deleted", + "InstallZipFile", + err, + err.errorCode + ) + ); + } + } + if (entry.fileName.endsWith("/")) { + try { + await ensureDir(absolutePath, { mode: 0o775 }); + zipfile.readEntry(); + } catch (err) { + return reject( + new ZipFileError( + "Error creating directory", + "InstallZipFile", + err + ) + ); + } + } else { + const exists = await pathExists(absolutePath); + if (!exists) { + zipfile.openReadStream( + entry, + async (err, readStream: ReadStream) => { + if (err) { + return reject( + new ZipFileError( + "Error reading zip stream", + "InstallZipFile", + err + ) + ); + } + readStream.on("error", (openErr) => { + return reject( + new ZipFileError( + "Error in readstream", + "InstallZipFile", + openErr + ) + ); + }); + + try { + await ensureDir(dirname(absolutePath), { + mode: 0o775, + }); + } catch (mkdirErr) { + return reject( + new ZipFileError( + "Error creating directory", + "InstallZipFile", + mkdirErr + ) + ); + } + const absoluteEntryTmpPath: string = absolutePath + ".tmp"; + const doesTmpPathExists = await pathExists( + absoluteEntryTmpPath + ); + if (doesTmpPathExists) { + try { + await remove(absoluteEntryTmpPath); + } catch (rmError) { + return reject( + new ZipFileError( + `Error unlinking tmp file ${absoluteEntryTmpPath}`, + "InstallZipFile", + rmError + ) + ); + } + } + const writeStream: WriteStream = createWriteStream( + absoluteEntryTmpPath, + { mode: 0o755 } + ); + writeStream.on("error", (writeStreamErr) => { + return reject( + new ZipFileError( + "Error in writeStream", + "InstallZipFile", + writeStreamErr + ) + ); + }); + writeStream.on("close", async () => { + try { + await move(absoluteEntryTmpPath, absolutePath); + } catch (closeWriteStreamErr) { + return reject( + new ZipFileError( + `Error renaming file ${absoluteEntryTmpPath}`, + "InstallZipFile", + closeWriteStreamErr + ) + ); + } + zipfile.readEntry(); + }); + readStream.pipe(writeStream); + } + ); + } else { + if (extname(absolutePath) !== ".txt") { + OutputChannel.appendLine( + `Warning File ${absolutePath} + already exists and was not updated.` + ); + } + zipfile.readEntry(); + } + } + }); + }); + }); +} diff --git a/src/eim/getExistingSetups.ts b/src/eim/getExistingSetups.ts new file mode 100644 index 000000000..e23d675e3 --- /dev/null +++ b/src/eim/getExistingSetups.ts @@ -0,0 +1,133 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Friday, 29th November 2024 3:28:00 pm + * Copyright 2024 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { pathExists, readJson } from "fs-extra"; +import { join } from "path"; +import { readParameter } from "../idfConfiguration"; +import { Logger } from "../logger/logger"; +import { EspIdfJson, IdfSetup } from "./types"; +import { getEspIdfFromCMake } from "../utils"; +import { loadIdfSetupsFromEspIdfJson } from "./migrationTool"; +import { ESP } from "../config"; +import { Uri } from "vscode"; + +export async function getIdfSetups(workspaceFolder: Uri) { + const workspaceFolderUri = ESP.GlobalConfiguration.store.get( + ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER + ); + const customVars = readParameter( + "idf.customExtraVars", + workspaceFolderUri + ) as { + [key: string]: string; + }; + const eimIDFSetups = await loadIdfSetupsFromEimIdfJson(); + let resultingIdfSetups = eimIDFSetups; + if (customVars["IDF_TOOLS_PATH"]) { + const espIdfCustomVarsJsonSetups = await loadIdfSetupsFromEspIdfJson( + customVars["IDF_TOOLS_PATH"] + ); + resultingIdfSetups = resultingIdfSetups.concat(espIdfCustomVarsJsonSetups); + } + if (process.env.IDF_TOOLS_PATH) { + const espIdfSysJsonSetups = await loadIdfSetupsFromEspIdfJson( + process.env["IDF_TOOLS_PATH"] + ); + resultingIdfSetups = resultingIdfSetups.concat(espIdfSysJsonSetups); + } + const containerPath = + process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME; + const defaultIdfToolsPath = join(containerPath, ".espressif"); + const espIdfSysJsonSetups = await loadIdfSetupsFromEspIdfJson( + defaultIdfToolsPath + ); + resultingIdfSetups = resultingIdfSetups.concat(espIdfSysJsonSetups); + + + const oldIdfToolsPath = readParameter("idf.toolsPath", workspaceFolder) as string; + if (oldIdfToolsPath) { + const oldIdfSetups = await loadIdfSetupsFromEspIdfJson(oldIdfToolsPath); + resultingIdfSetups = resultingIdfSetups.concat(oldIdfSetups); + } + + resultingIdfSetups = resultingIdfSetups.filter( + (setup, index, self) => + index === + self.findIndex( + (s) => s.idfPath === setup.idfPath && s.toolsPath === setup.toolsPath + ) + ); + + return resultingIdfSetups; +} + +export async function loadIdfSetupsFromEimIdfJson() { + let idfSetups: IdfSetup[] = []; + const espIdfJson = await getEimIdfJson(); + if ( + espIdfJson && + espIdfJson.idfInstalled && + Object.keys(espIdfJson.idfInstalled).length + ) { + for (let idfInstalled of espIdfJson.idfInstalled) { + const idfVersion = await getEspIdfFromCMake(idfInstalled.path); + let setupConf: IdfSetup = { + activationScript: idfInstalled.activationScript, + id: idfInstalled.id, + idfPath: idfInstalled.path, + isValid: false, + gitPath: espIdfJson.gitPath, + version: idfVersion, + toolsPath: idfInstalled.idfToolsPath, + python: idfInstalled.python, + sysPythonPath: "", + } as IdfSetup; + idfSetups.push(setupConf); + } + } + return idfSetups; +} + +export async function getEimIdfJson() { + const espIdeJsonCustomPath = readParameter("idf.eimIdfJsonPath"); + const espIdePathExists = await pathExists(espIdeJsonCustomPath); + let eimIdfJsonPath = ""; + if (espIdePathExists) { + eimIdfJsonPath = espIdeJsonCustomPath; + } else { + eimIdfJsonPath = + process.platform === "win32" + ? join("C:", "Espressif", "tools", "eim_idf.json") + : join(process.env.HOME, ".espressif", "tools", "eim_idf.json"); + } + const espIdfJsonExists = await pathExists(eimIdfJsonPath); + let espIdfJson: EspIdfJson; + try { + if (!espIdfJsonExists) { + throw new Error(`${eimIdfJsonPath} doesn't exists.`); + } + espIdfJson = await readJson(eimIdfJsonPath); + return espIdfJson; + } catch (error) { + const msg = + error && error.message + ? error.message + : `Error reading ${eimIdfJsonPath}.`; + Logger.error(msg, error, "getEimIdfJson"); + } +} diff --git a/src/eim/loadIdfSetup.ts b/src/eim/loadIdfSetup.ts new file mode 100644 index 000000000..3969dae80 --- /dev/null +++ b/src/eim/loadIdfSetup.ts @@ -0,0 +1,179 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Monday, 24th February 2025 5:31:26 pm + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { commands, ConfigurationTarget, l10n, Uri, window } from "vscode"; +import { ESP } from "../config"; +import { getIdfSetups } from "./getExistingSetups"; +import { IdfSetup } from "./types"; +import { getEnvVariables } from "./loadSettings"; +import { readParameter, writeParameter } from "../idfConfiguration"; +import { getEspIdfFromCMake } from "../utils"; +import { join } from "path"; +import { isIdfSetupValid } from "./verifySetup"; +import { Logger } from "../logger/logger"; +import { createHash } from "crypto"; + +export async function loadIdfSetup(workspaceFolder: Uri) { + const idfSetups = await getIdfSetups(workspaceFolder); + + if (!idfSetups || idfSetups.length < 1) { + window.showInformationMessage(l10n.t("No ESP-IDF Setups found")); + Logger.info("Using loadEnvVarsAsIdfSetup to configure extension"); + const idfEnvSetup = await loadEnvVarsAsIdfSetup(workspaceFolder); + if (idfEnvSetup) { + return idfEnvSetup; + } + } + const currentIdfConfigurationName = readParameter( + "idf.currentSetup", + workspaceFolder + ) as string; + + let idfSetupToUse: IdfSetup; + if (idfSetups.length > 0) { + if (currentIdfConfigurationName) { + idfSetupToUse = idfSetups.find((idfSetup) => { + return idfSetup.idfPath === currentIdfConfigurationName; + }); + } else { + const oldIdfPath = readParameter( + "idf.espIdfPath", + workspaceFolder + ) as string; + if (oldIdfPath) { + idfSetupToUse = idfSetups.find((idfSetup) => { + return idfSetup.idfPath === oldIdfPath; + }); + } + if (!idfSetupToUse) { + idfSetupToUse = idfSetups[0]; + } + await writeParameter( + "idf.currentSetup", + idfSetupToUse.idfPath, + ConfigurationTarget.WorkspaceFolder, + workspaceFolder + ); + } + } + + if (!idfSetupToUse) { + Logger.infoNotify("Current ESP-IDF setup is not found."); + + const openESPIDFManager = l10n.t( + "Open ESP-IDF Installation Manager" + ) as string; + const action = await window.showInformationMessage( + l10n.t("The extension configuration is not valid. Choose an action:"), + openESPIDFManager + ); + if (!action) { + return; + } + + if (action === openESPIDFManager) { + commands.executeCommand("espIdf.installManager"); + return; + } + } + + await writeParameter( + "idf.gitPath", + idfSetupToUse.gitPath, + ConfigurationTarget.Global + ); + + const envVars = await getEnvVariables(idfSetupToUse); + + ESP.ProjectConfiguration.store.set( + ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, + envVars + ); + return idfSetupToUse; +} + +function getIdfMd5sum(idfPath: string) { + if (!idfPath) { + return ""; + } + const md5Value = createHash("md5") + .update(idfPath.replace(/\\/g, "/")) + .digest("hex"); + return `esp-idf-${md5Value}`; +} + +export async function loadEnvVarsAsIdfSetup(workspaceFolder: Uri) { + const customVars = readParameter("idf.customExtraVars", workspaceFolder) as { + [key: string]: string; + }; + + const idfPath = process.env.IDF_PATH || customVars["IDF_PATH"]; + const containerPath = + process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME; + const defaultIdfToolsPath = join(containerPath, ".espressif"); + const idfToolsPath = + process.env.IDF_TOOLS_PATH || + customVars["IDF_TOOLS_PATH"] || + defaultIdfToolsPath; + const gitPath = "/usr/bin/git"; + const idfSetupId = getIdfMd5sum(idfPath); + const idfVersion = await getEspIdfFromCMake(idfPath); + const pyDir = + process.platform === "win32" + ? ["Scripts", "python.exe"] + : ["bin", "python3"]; + let venvPythonPath = ""; + if (process.env.IDF_PYTHON_ENV_PATH || customVars["IDF_PYTHON_ENV_PATH"]) { + venvPythonPath = join( + process.env.IDF_PYTHON_ENV_PATH || customVars["IDF_PYTHON_ENV_PATH"], + ...pyDir + ); + } + const envDefinedIdfSetup: IdfSetup = { + id: idfSetupId, + activationScript: "", + idfPath, + gitPath, + toolsPath: idfToolsPath, + sysPythonPath: "", + version: idfVersion, + python: venvPythonPath, + isValid: false, + }; + let reason = ""; + [envDefinedIdfSetup.isValid, reason] = await isIdfSetupValid( + envDefinedIdfSetup + ); + + if (!envDefinedIdfSetup.isValid) { + Logger.infoNotify(l10n.t("ESP-IDF Setup is not valid: {0}", reason), { + category: "espIdf.installManager", + reason, + }); + return; + } + + if (envDefinedIdfSetup.isValid) { + const envVars = await getEnvVariables(envDefinedIdfSetup); + ESP.ProjectConfiguration.store.set( + ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, + envVars + ); + return envDefinedIdfSetup; + } +} diff --git a/src/eim/loadSettings.ts b/src/eim/loadSettings.ts new file mode 100644 index 000000000..6f3d53886 --- /dev/null +++ b/src/eim/loadSettings.ts @@ -0,0 +1,100 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Thursday, 6th February 2025 11:42:36 am + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { EOL } from "os"; +import { spawn } from "../utils"; +import { IdfSetup } from "./types"; +import { delimiter, join } from "path"; +import { getEnvVariablesFromIdfSetup } from "./migrationTool"; +import { Logger } from "../logger/logger"; +import { env } from "vscode"; + +export async function getEnvVariables(idfSetup: IdfSetup) { + if (idfSetup.activationScript) { + return await getEnvVariablesFromActivationScript(idfSetup.activationScript); + } else { + return await getEnvVariablesFromIdfSetup(idfSetup); + } +} + +export async function getEnvVariablesFromActivationScript( + activationScriptPath: string +) { + try { + const args = + process.platform === "win32" + ? [ + "-ExecutionPolicy", + "Bypass", + "-NoProfile", + `'${activationScriptPath.replace(/'/g, "''")}'`, + "-e", + ] + : [`"${activationScriptPath}"`, "-e"]; + const shellPath = + process.platform === "win32" + ? "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" + : env.shell; + const envVarsOutput = await spawn(shellPath, args, { + maxBuffer: 500 * 1024, + cwd: process.cwd(), + shell: shellPath, + }); + const envVarsArray = envVarsOutput.toString().trim().split(/\r?\n/g); + let envDict: { [key: string]: string } = {}; + for (const envVar of envVarsArray) { + let keyIndex = envVar.indexOf("="); + if (keyIndex === -1) { + continue; + } + let varKey = envVar.slice(0, keyIndex).trim(); + let varValue = envVar.slice(keyIndex + 1).trim(); + envDict[varKey] = varValue; + } + + let pathNameInEnv: string = Object.keys(process.env).find( + (k) => k.toUpperCase() == "PATH" + ); + + if (envDict[pathNameInEnv]) { + envDict[pathNameInEnv] = envDict[pathNameInEnv] + .replace(process.env[pathNameInEnv], "") + .replace(new RegExp(`(^${delimiter}|${delimiter}$)`, "g"), ""); + } + + const pyDir = + process.platform === "win32" + ? ["Scripts", "python.exe"] + : ["bin", "python"]; + envDict["PYTHON"] = join(envDict["IDF_PYTHON_ENV_PATH"], ...pyDir); + + return envDict; + } catch (error) { + const errMsg = + error && error.message + ? error.message + : "Error getting Env variables from EIM activation script"; + Logger.error( + errMsg, + error, + "loadSettings getEnvVariablesFromActivationScript", + undefined, + false + ); + } +} diff --git a/src/eim/migrationTool.ts b/src/eim/migrationTool.ts new file mode 100644 index 000000000..103dbc21b --- /dev/null +++ b/src/eim/migrationTool.ts @@ -0,0 +1,211 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Monday, 16th December 2024 5:48:20 pm + * Copyright 2024 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { dirname, join } from "path"; +import { execChildProcess, getEspIdfFromCMake } from "../utils"; +import { IdfSetup } from "./types"; +import { pathExists, readJson } from "fs-extra"; +import { ESP } from "../config"; +import { getEnvVarsFromIdfTools, getUnixPythonList } from "../pythonManager"; +import { IdfToolsManager } from "../idfToolsManager"; + +export async function getSystemPython( + espIdfPath: string, + espIdfToolsPath: string +) { + if (process.platform !== "win32") { + const sysPythonList = await getUnixPythonList(__dirname); + return sysPythonList && sysPythonList.length ? sysPythonList[0] : "python3"; + } else { + const idfVersion = await getEspIdfFromCMake(espIdfPath); + const pythonVersionToUse = + idfVersion >= "5.0" + ? ESP.URL.IDF_EMBED_PYTHON.VERSION + : ESP.URL.OLD_IDF_EMBED_PYTHON.VERSION; + const idfPythonPath = join( + espIdfToolsPath, + "tools", + "idf-python", + pythonVersionToUse, + "python.exe" + ); + const idfPythonPathExists = await pathExists(idfPythonPath); + return idfPythonPathExists ? idfPythonPath : ""; + } +} + +export async function getIdfPythonEnvPath( + espIdfDir: string, + idfToolsDir: string, + pythonBin: string +) { + const pythonCode = `import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))`; + const args = ["-c", pythonCode]; + const rawPythonVersion = await execChildProcess(pythonBin, args, espIdfDir); + if (!rawPythonVersion) { + throw new Error("Failed to retrieve Python version. The result is empty."); + } + const pythonVersion = rawPythonVersion.replace(/(\n|\r|\r\n)/gm, ""); + const fullEspIdfVersion = await getEspIdfFromCMake(espIdfDir); + const majorMinorMatches = fullEspIdfVersion.match(/([0-9]+\.[0-9]+).*/); + const espIdfVersion = + majorMinorMatches && majorMinorMatches.length > 0 + ? majorMinorMatches[1] + : "x.x"; + const resultVersion = `idf${espIdfVersion}_py${pythonVersion}_env`; + return join(idfToolsDir, "python_env", resultVersion); +} + +export async function getPythonEnvPath( + espIdfDir: string, + idfToolsDir: string, + pythonBin: string +) { + const idfPyEnvPath = await getIdfPythonEnvPath( + espIdfDir, + idfToolsDir, + pythonBin + ); + const pyDir = + process.platform === "win32" + ? ["Scripts", "python.exe"] + : ["bin", "python"]; + const fullIdfPyEnvPath = join(idfPyEnvPath, ...pyDir); + const pyEnvPathExists = await pathExists(fullIdfPyEnvPath); + return pyEnvPathExists ? fullIdfPyEnvPath : ""; +} + +export async function getEnvVariablesFromIdfSetup(idfSetup: IdfSetup) { + let envVars: { [key: string]: string } = {}; + envVars["IDF_PATH"] = idfSetup.idfPath; + envVars["IDF_TOOLS_PATH"] = idfSetup.toolsPath; + envVars["ESP_IDF_VERSION"] = idfSetup.version; + const idfToolsManager = await IdfToolsManager.createIdfToolsManager( + idfSetup.idfPath + ); + const exportedToolsPaths = await idfToolsManager.exportPathsInString( + join(idfSetup.toolsPath, "tools"), + ["cmake", "ninja"] + ); + envVars["PATH"] = exportedToolsPaths; + const idfToolsVars = await idfToolsManager.exportVars(idfSetup.toolsPath); + + for (const toolVar in idfToolsVars) { + envVars[toolVar] = idfToolsVars[toolVar]; + } + + if (!idfSetup.python) { + if (!idfSetup.sysPythonPath) { + idfSetup.sysPythonPath = await getSystemPython( + idfSetup.idfPath, + idfSetup.toolsPath + ); + } + + idfSetup.python = await getPythonEnvPath( + idfSetup.idfPath, + idfSetup.toolsPath, + idfSetup.sysPythonPath + ); + } + const pythonExists = await pathExists(idfSetup.python); + + if (pythonExists) { + envVars["PYTHON"] = idfSetup.python; + envVars["IDF_PYTHON_ENV_PATH"] = dirname(dirname(idfSetup.python)); + const idfVars = await getEnvVarsFromIdfTools( + idfSetup.idfPath, + idfSetup.toolsPath, + idfSetup.python + ); + for (const idfVar in idfVars) { + envVars[idfVar] = idfVars[idfVar]; + } + } + return envVars; +} + +export async function loadIdfSetupsFromEspIdfJson(toolsPath: string) { + const espIdfJson = await loadEspIdfJson(toolsPath); + let idfSetups: IdfSetup[] = []; + if ( + espIdfJson && + espIdfJson.idfInstalled && + Object.keys(espIdfJson.idfInstalled).length + ) { + for (let idfInstalledKey of Object.keys(espIdfJson.idfInstalled)) { + let setupConf: IdfSetup = { + id: idfInstalledKey, + idfPath: espIdfJson.idfInstalled[idfInstalledKey].path, + gitPath: espIdfJson.gitPath, + version: espIdfJson.idfInstalled[idfInstalledKey].version, + python: espIdfJson.idfInstalled[idfInstalledKey].python, + toolsPath: toolsPath, + isValid: false, + } as IdfSetup; + idfSetups.push(setupConf); + } + } + return idfSetups; +} + +export interface EspIdfJson { + $schema: string; + $id: string; + _comment: string; + _warning: string; + gitPath: string; + idfToolsPath: string; + idfSelectedId: string; + idfInstalled: { [key: string]: IdfInstalled }; +} + +export interface IdfInstalled { + version: string; + python: string; + path: string; +} + +export function getEspIdfJsonTemplate(toolsPath: string) { + return { + $schema: "http://json-schema.org/schema#", + $id: "http://dl.espressif.com/dl/schemas/esp_idf", + _comment: "Configuration file for ESP-IDF IDEs.", + _warning: + "Use / or \\ when specifying path. Single backslash is not allowed by JSON format.", + gitPath: "", + idfToolsPath: toolsPath, + idfSelectedId: "", + idfInstalled: {}, + } as EspIdfJson; +} + +export async function loadEspIdfJson(toolsPath: string) { + const espIdfJsonPath = join(toolsPath, "esp_idf.json"); + const espIdfJsonExists = await pathExists(espIdfJsonPath); + let espIdfJson: EspIdfJson; + try { + if (!espIdfJsonExists) { + throw new Error(`${espIdfJsonPath} doesn't exists.`); + } + espIdfJson = await readJson(espIdfJsonPath); + } catch (error) { + espIdfJson = getEspIdfJsonTemplate(toolsPath); + } + return espIdfJson; +} diff --git a/src/views/setup/types.ts b/src/eim/types.ts similarity index 51% rename from src/views/setup/types.ts rename to src/eim/types.ts index a43d90868..9043f789b 100644 --- a/src/views/setup/types.ts +++ b/src/eim/types.ts @@ -1,27 +1,20 @@ /* * Project: ESP-IDF VSCode Extension - * File Created: Thursday, 31st August 2023 8:11:39 pm - * Copyright 2023 Espressif Systems (Shanghai) CO LTD - * + * File Created: Wednesday, 11th December 2024 2:32:14 pm + * Copyright 2024 Espressif Systems (Shanghai) CO LTD + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ -export interface IEspIdfLink { - filename: string; - name: string; - mirror: string; - url: string; - version: string; -} export interface IdfSetup { id: string; @@ -29,43 +22,29 @@ export interface IdfSetup { toolsPath: string; idfPath: string; gitPath: string; - python?: string; - sysPythonPath?: string; isValid: boolean; + activationScript: string; + python: string; + sysPythonPath: string; } -export enum IdfMirror { - Espressif, - Github, +export interface EspIdfJson { + $schema: string; + $id: string; + _comment: string; + _warning: string; + gitPath: string; + idfToolsPath: string; + idfSelectedId: string; + idfInstalled: IdfInstalled[]; + eimPath: string; } -export interface IDownload { +export interface IdfInstalled { + activationScript: string; id: string; - progress: string; - progressDetail: string; -} - -export interface IEspIdfTool extends IDownload { - actual: string; - description: string; - doesToolExist: boolean; - env: {}; - expected: string; - hashResult: boolean; - hasFailed: boolean; + idfToolsPath: string; name: string; path: string; -} - -export enum StatusType { - failed, - installed, - pending, - started, -} - -export enum SetupMode { - advanced, - express, - existing, -} + python: string; +} \ No newline at end of file diff --git a/src/eim/verifySetup.ts b/src/eim/verifySetup.ts new file mode 100644 index 000000000..188fb6585 --- /dev/null +++ b/src/eim/verifySetup.ts @@ -0,0 +1,191 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Wednesday, 11th December 2024 3:05:43 pm + * Copyright 2024 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { pathExists } from "fs-extra"; +import { Logger } from "../logger/logger"; +import { IdfSetup } from "./types"; +import { startPythonReqsProcess } from "../utils"; +import { IdfToolsManager, IEspIdfTool } from "../idfToolsManager"; +import { join } from "path"; +import { ConfigurationTarget, StatusBarItem, Uri } from "vscode"; +import { writeParameter } from "../idfConfiguration"; +import { CommandKeys, createCommandDictionary } from "../cmdTreeView/cmdStore"; +import { getEnvVariables } from "./loadSettings"; +import { ESP } from "../config"; + +/** + * Validate that given IDF Setup is valid. + * @param {IdfSetup} idfSetup IDF Setup to validate. + * @param logToChannel If output IDF Tools validation result in output channel + * @returns {[boolean, string]} Tuple: True if IDF Setup is valid, False otherwise, and fail reason + */ +export async function isIdfSetupValid( + idfSetup: IdfSetup, + logToChannel = true +): Promise<[boolean, string]> { + try { + let envVars: { [key: string]: string } = await getEnvVariables(idfSetup); + let venvPythonPath: string = ""; + if (idfSetup.python) { + venvPythonPath = idfSetup.python; + } else { + const pyDir = + process.platform === "win32" + ? ["Scripts", "python.exe"] + : ["bin", "python3"]; + venvPythonPath = join(envVars["IDF_PYTHON_ENV_PATH"], ...pyDir); + } + + if (!envVars["IDF_PATH"]) { + return [false, "IDF_PATH is not set in environment variables"]; + } + const doesIdfPathExists = await pathExists(envVars["IDF_PATH"]); + if (!doesIdfPathExists) { + return [false, `IDF_PATH does not exist: ${envVars["IDF_PATH"]}`]; + } + + const pathNameInEnv: string = Object.keys(envVars).find( + (k) => k.toUpperCase() == "PATH" + ); + + const idfToolsManager = await IdfToolsManager.createIdfToolsManager( + envVars["IDF_PATH"] + ); + let toolsInfo: IEspIdfTool[] = []; + const activationScriptPathExists = await pathExists( + idfSetup.activationScript + ); + if (!activationScriptPathExists) { + const exportedToolsPaths = await idfToolsManager.exportPathsInString( + join(idfSetup.toolsPath, "tools"), + ["cmake", "ninja"] + ); + toolsInfo = await idfToolsManager.getRequiredToolsInfo( + join(idfSetup.toolsPath, "tools"), + exportedToolsPaths, + ["cmake", "ninja"], + logToChannel + ); + } else { + toolsInfo = await idfToolsManager.getEIMToolsInfo( + envVars[pathNameInEnv], + ["cmake", "ninja"], + logToChannel + ); + } + + const failedToolsResult = toolsInfo.filter( + (tInfo) => + !tInfo.doesToolExist && ["cmake", "ninja"].indexOf(tInfo.name) === -1 + ); + + if (failedToolsResult.length) { + const missingTools = failedToolsResult.map((t) => t.name).join(", "); + return [false, `Missing required tools: ${missingTools}`]; + } + const [pyEnvReqsValid, pyEnvReqsMsg] = await checkPyVenv( + venvPythonPath, + envVars["IDF_PATH"] + ); + if (!pyEnvReqsValid) { + return [ + pyEnvReqsValid, + pyEnvReqsMsg || + "Python virtual environment or requirements are not satisfied", + ]; + } + return [true, ""]; + } catch (error) { + const msg = + error && error.message + ? error.message + : `Error checking EIM Idf Setup for script ${idfSetup.activationScript}`; + Logger.error(msg, error, "verifySetup isIdfSetupValid"); + return [false, msg]; + } +} + +export async function checkPyVenv( + pyVenvPath: string, + espIdfPath: string +): Promise<[boolean, string]> { + const pyExists = await pathExists(pyVenvPath); + if (!pyExists) { + return [false, `${pyVenvPath} does not exist.`]; + } + let requirements: string; + requirements = join( + espIdfPath, + "tools", + "requirements", + "requirements.core.txt" + ); + const coreRequirementsExists = await pathExists(requirements); + if (!coreRequirementsExists) { + requirements = join(espIdfPath, "requirements.txt"); + const requirementsExists = await pathExists(requirements); + if (!requirementsExists) { + return [false, `${requirements} doesn't exist.`]; + } + } + const reqsResults = await startPythonReqsProcess( + pyVenvPath, + espIdfPath, + requirements + ); + if (reqsResults.indexOf("are not satisfied") > -1) { + return [false, reqsResults]; + } + return [true, ""]; +} + +export async function saveSettings( + setupConf: IdfSetup, + workspaceFolderUri: Uri, + espIdfStatusBar: StatusBarItem +) { + await writeParameter( + "idf.currentSetup", + setupConf.idfPath, + ConfigurationTarget.WorkspaceFolder, + workspaceFolderUri + ); + + const envVars = await getEnvVariables(setupConf); + + if (setupConf.python) { + envVars["PYTHON"] = setupConf.python; + } + + ESP.ProjectConfiguration.store.set( + ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, + envVars + ); + await writeParameter( + "idf.gitPath", + setupConf.gitPath, + ConfigurationTarget.Global + ); + if (espIdfStatusBar) { + const commandDictionary = createCommandDictionary(); + espIdfStatusBar.text = `$(${ + commandDictionary[CommandKeys.SelectCurrentIdfVersion].iconId + }) ESP-IDF v${setupConf.version}`; + } + Logger.infoNotify("ESP-IDF has been configured"); +} diff --git a/src/espAdf/espAdfDownload.ts b/src/espAdf/espAdfDownload.ts index babd1cef5..5a49e7904 100644 --- a/src/espAdf/espAdfDownload.ts +++ b/src/espAdf/espAdfDownload.ts @@ -30,5 +30,5 @@ export class AdfCloning extends AbstractCloning { export async function getEspAdf(workspace?: Uri) { const gitPath = (await readParameter("idf.gitPath", workspace)) || "git"; const adfInstaller = new AdfCloning(gitPath); - await adfInstaller.getRepository("idf.espAdfPath", workspace); + await adfInstaller.getRepository("ADF_PATH", workspace); } diff --git a/src/espBom/index.ts b/src/espBom/index.ts index 485351655..b9ed2c19b 100644 --- a/src/espBom/index.ts +++ b/src/espBom/index.ts @@ -27,7 +27,6 @@ import { ProcessExecution, } from "vscode"; import { - appendIdfAndToolsToPath, canAccessFile, execChildProcess, } from "../utils"; @@ -38,6 +37,7 @@ import { pathExists, lstat, constants } from "fs-extra"; import { Logger } from "../logger/logger"; import { TaskManager } from "../taskManager"; import { getVirtualEnvPythonPath } from "../pythonManager"; +import { configureEnvVariables } from "../common/prepareEnv"; export async function createSBOM(workspaceUri: Uri) { try { @@ -52,7 +52,7 @@ export async function createSBOM(workspaceUri: Uri) { `${projectDescriptionJson} doesn't exists for ESP-IDF SBOM tasks.` ); } - const modifiedEnv = await appendIdfAndToolsToPath(workspaceUri); + const modifiedEnv = await configureEnvVariables(workspaceUri); const sbomFilePath = readParameter( "idf.sbomFilePath", workspaceUri @@ -142,8 +142,8 @@ export async function createSBOM(workspaceUri: Uri) { } export async function installEspSBOM(workspace: Uri) { - const pythonBinPath = await getVirtualEnvPythonPath(workspace); - const modifiedEnv = await appendIdfAndToolsToPath(workspace); + const pythonBinPath = await getVirtualEnvPythonPath(); + const modifiedEnv = await configureEnvVariables(workspace); try { const showResult = await execChildProcess( pythonBinPath, diff --git a/src/espHomekit/espHomekitDownload.ts b/src/espHomekit/espHomekitDownload.ts index 295bf1f63..f142d070f 100644 --- a/src/espHomekit/espHomekitDownload.ts +++ b/src/espHomekit/espHomekitDownload.ts @@ -35,5 +35,5 @@ export class EspHomekitCloning extends AbstractCloning { export async function getEspHomeKitSdk(workspace: Uri) { const gitPath = (await readParameter("idf.gitPath", workspace)) || "git"; const homeKitInstaller = new EspHomekitCloning(gitPath); - await homeKitInstaller.getRepository("idf.espHomeKitSdkPath", workspace); + await homeKitInstaller.getRepository("HOMEKIT_PATH", workspace); } diff --git a/src/espIdf/core-dump/esp-core-dump-py-tool.ts b/src/espIdf/core-dump/esp-core-dump-py-tool.ts index a84523eec..327125550 100644 --- a/src/espIdf/core-dump/esp-core-dump-py-tool.ts +++ b/src/espIdf/core-dump/esp-core-dump-py-tool.ts @@ -2,13 +2,13 @@ * Project: ESP-IDF VSCode Extension * File Created: Friday, 3rd July 2020 5:49:06 pm * Copyright 2020 Espressif Systems (Shanghai) CO LTD - *  + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *  + * * http://www.apache.org/licenses/LICENSE-2.0 - *  + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,9 +17,10 @@ */ import { join } from "path"; -import { appendIdfAndToolsToPath, spawn } from "../../utils"; +import { spawn } from "../../utils"; import { Logger } from "../../logger/logger"; import { Uri } from "vscode"; +import { configureEnvVariables } from "../../common/prepareEnv"; export enum InfoCoreFileFormat { Base64 = "b64", @@ -49,7 +50,7 @@ export class ESPCoreDumpPyTool { public async generateCoreELFFile(options: CoreELFGenerationOptions) { let resp: Buffer; try { - const env = await appendIdfAndToolsToPath(options.workspaceUri); + const env = await configureEnvVariables(options.workspaceUri); resp = await spawn( options.pythonBinPath, [ diff --git a/src/espIdf/debugAdapter/checkPyReqs.ts b/src/espIdf/debugAdapter/checkPyReqs.ts deleted file mode 100644 index 99ca49c36..000000000 --- a/src/espIdf/debugAdapter/checkPyReqs.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Friday, 23rd February 2024 6:13:58 pm - * Copyright 2024 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { join } from "path"; -import { readParameter } from "../../idfConfiguration"; -import { pathExists } from "fs-extra"; -import { Uri } from "vscode"; -import { extensionContext, startPythonReqsProcess } from "../../utils"; -import { getVirtualEnvPythonPath } from "../../pythonManager"; - -export async function checkDebugAdapterRequirements(workspaceFolder: Uri) { - const idfPath = readParameter("idf.espIdfPath", workspaceFolder); - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); - let requirementsPath = join( - extensionContext.extensionPath, - "esp_debug_adapter", - "requirements.txt" - ); - let checkResult: string; - try { - const doesPyTestRequirementsExists = await pathExists(requirementsPath); - if (!doesPyTestRequirementsExists) { - return false; - } - checkResult = await startPythonReqsProcess( - pythonBinPath, - idfPath, - requirementsPath - ); - } catch (error) { - checkResult = error && error.message ? error.message : " are not satisfied"; - } - if (checkResult.indexOf("are satisfied") > -1) { - return true; - } - return false; -} diff --git a/src/espIdf/debugAdapter/debugAdapterManager.ts b/src/espIdf/debugAdapter/debugAdapterManager.ts deleted file mode 100644 index 6fd5e52eb..000000000 --- a/src/espIdf/debugAdapter/debugAdapterManager.ts +++ /dev/null @@ -1,347 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Friday, 12th July 2019 5:59:07 pm - * Copyright 2019 Espressif Systems (Shanghai) CO LTD - *  - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *  - * http://www.apache.org/licenses/LICENSE-2.0 - *  - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ChildProcess, spawn } from "child_process"; -import { EventEmitter } from "events"; -import * as path from "path"; -import * as vscode from "vscode"; -import * as idfConf from "../../idfConfiguration"; -import { Logger } from "../../logger/logger"; -import { - appendIdfAndToolsToPath, - canAccessFile, - getToolchainToolName, - isBinInPath, - PreCheck, -} from "../../utils"; -import { EOL } from "os"; -import { outputFile, constants } from "fs-extra"; -import { createFlashModel } from "../../flash/flashModelBuilder"; -import { OutputChannel } from "../../logger/outputChannel"; -import { getVirtualEnvPythonPath } from "../../pythonManager"; -import { getIdfTargetFromSdkconfig } from "../../workspaceConfig"; - -export interface IDebugAdapterConfig { - appOffset?: string; - tmoScaleFactor?: number; - coreDumpFile?: string; - currentWorkspace?: vscode.Uri; - debugAdapterPort?: number; - elfFile?: string; - env?: NodeJS.ProcessEnv; - gdbinitFilePath?: string; - initGdbCommands?: string[]; - isPostMortemDebugMode: boolean; - isOocdDisabled: boolean; - logLevel?: number; - target?: string; -} - -export class DebugAdapterManager extends EventEmitter { - public static init(context: vscode.ExtensionContext): DebugAdapterManager { - if (!DebugAdapterManager.instance) { - DebugAdapterManager.instance = new DebugAdapterManager(context); - } - return DebugAdapterManager.instance; - } - private static instance: DebugAdapterManager; - - private adapter: ChildProcess; - private appOffset: string; - private chan: Buffer; - private coreDumpFile: string; - private currentWorkspace: vscode.Uri; - private debugAdapterPath: string; - private elfFile: string; - private env; - private gdbinitFilePath: string; - private initGdbCommands: string[]; - private tmoScaleFactor?: number; - private isPostMortemDebugMode: boolean; - private isOocdDisabled: boolean; - private logLevel: number; - private port: number; - private target: string; - - private constructor(context: vscode.ExtensionContext) { - super(); - this.configureWithDefaultValues(context.extensionUri); - OutputChannel.init(); - this.chan = Buffer.alloc(0); - } - - public start() { - return new Promise(async (resolve, reject) => { - if (this.isRunning()) { - return; - } - if (!isBinInPath("openocd", this.env)) { - return reject( - new Error("Invalid OpenOCD bin path or access is denied for the user") - ); - } - if ( - this.env && - !this.isOocdDisabled && - typeof this.env.OPENOCD_SCRIPTS === "undefined" - ) { - return reject( - new Error( - "Invalid OpenOCD script path or access is denied for the user" - ) - ); - } - if (!canAccessFile(this.elfFile, constants.R_OK)) { - return reject(new Error(`${this.elfFile} doesn't exist. Build first.`)); - } - const logFile = path.join(this.currentWorkspace.fsPath, "debug") + ".log"; - - if (!this.appOffset) { - const serialPort = await idfConf.readSerialPort(this.currentWorkspace, false); - if (!serialPort) { - return reject( - new Error( - vscode.l10n.t( - "No serial port found for current IDF_TARGET: {0}", - this.target - ) - ) - ); - } - const flashBaudRate = await idfConf.readParameter( - "idf.flashBaudRate", - this.currentWorkspace - ); - const buildDirPath = idfConf.readParameter( - "idf.buildPath", - this.currentWorkspace - ) as string; - const flasherArgsJsonPath = path.join( - buildDirPath, - "flasher_args.json" - ); - if (!canAccessFile(flasherArgsJsonPath, constants.R_OK)) { - return reject( - new Error(`${flasherArgsJsonPath} doesn't exist. Build first.`) - ); - } - const model = await createFlashModel( - flasherArgsJsonPath, - serialPort, - flashBaudRate - ); - this.appOffset = model.app.address; - } - const pythonBinPath = await getVirtualEnvPythonPath( - this.currentWorkspace - ); - - const toolchainPrefix = getToolchainToolName(this.target, ""); - const adapterArgs = [ - this.debugAdapterPath, - "-d", - this.logLevel.toString(), - "-e", - this.elfFile, - "-l", - logFile, - "-p", - this.port.toString(), - "-dn", - this.target, - "-a", - this.appOffset, - "-t", - toolchainPrefix, - ]; - if (this.isPostMortemDebugMode) { - adapterArgs.push("-pm"); - } - if (this.coreDumpFile) { - adapterArgs.push("-c", this.coreDumpFile); - } - if (this.isOocdDisabled) { - adapterArgs.push("-om", "without_oocd"); - } - const resultGdbInitFile = this.gdbinitFilePath - ? this.gdbinitFilePath - : await this.makeGdbinitFile(); - if (resultGdbInitFile) { - adapterArgs.push("-x", resultGdbInitFile); - } - if (this.tmoScaleFactor) { - adapterArgs.push("-tsf", this.tmoScaleFactor.toString()); - } - this.adapter = spawn(pythonBinPath, adapterArgs, { env: this.env }); - - this.adapter.stderr.on("data", (data) => { - data = typeof data === "string" ? Buffer.from(data) : data; - this.sendToOutputChannel(data); - OutputChannel.appendLine(data.toString(), "Debug Adapter"); - Logger.info(data.toString()); - this.emit("error", data, this.chan); - }); - - this.adapter.stdout.on("data", (data) => { - data = typeof data === "string" ? Buffer.from(data) : data; - this.sendToOutputChannel(data); - OutputChannel.appendLine(data.toString(), "Debug Adapter"); - Logger.info(data.toString()); - this.emit("data", this.chan); - if (data.toString().trim().endsWith("DEBUG_ADAPTER_READY2CONNECT")) { - return resolve(true); - } - }); - - this.adapter.on("error", (error) => { - this.emit("error", error, this.chan); - this.stop(); - return reject(error); - }); - - this.adapter.on("close", (code: number, signal: string) => { - if (!signal && code && code !== 0) { - Logger.errorNotify( - `ESP-IDF Debug Adapter exit with error code ${code}`, - new Error("Spawn exit with non-zero" + code), - "DebugAdapterManager start" - ); - } - this.stop(); - }); - OutputChannel.show(); - }); - } - - public stop() { - if (this.adapter && !this.adapter.killed) { - this.isPostMortemDebugMode = false; - this.initGdbCommands = []; - this.adapter.kill("SIGKILL"); - this.adapter = undefined; - const stoppedMsg = "[Stopped] : ESP-IDF Debug Adapter"; - Logger.info(stoppedMsg); - OutputChannel.appendLine(stoppedMsg); - } - } - - public configureAdapter(config: IDebugAdapterConfig) { - if (config.coreDumpFile) { - this.coreDumpFile = config.coreDumpFile; - } - if (config.currentWorkspace) { - this.currentWorkspace = config.currentWorkspace; - } - if (config.debugAdapterPort) { - this.port = config.debugAdapterPort; - } - if (config.elfFile) { - this.elfFile = config.elfFile; - } - if (config.env) { - for (const envVar of Object.keys(config.env)) { - this.env[envVar] = config.env[envVar]; - } - } - if (config.gdbinitFilePath) { - this.gdbinitFilePath = config.gdbinitFilePath; - } - if (config.initGdbCommands) { - this.initGdbCommands = config.initGdbCommands; - } - this.isPostMortemDebugMode = config.isPostMortemDebugMode; - if (config.logLevel) { - this.logLevel = config.logLevel; - } - if (config.target) { - this.target = config.target; - } - if (config.isOocdDisabled) { - this.isOocdDisabled = config.isOocdDisabled; - } - this.tmoScaleFactor = config.tmoScaleFactor; - this.appOffset = config.appOffset; - } - - public isRunning(): boolean { - return this.adapter && !this.adapter.killed; - } - - private async configureWithDefaultValues(extensionPath: vscode.Uri) { - this.currentWorkspace = PreCheck.isWorkspaceFolderOpen() - ? vscode.workspace.workspaceFolders[0].uri - : extensionPath; - this.debugAdapterPath = path.join( - extensionPath.fsPath, - "esp_debug_adapter", - "debug_adapter_main.py" - ); - this.isPostMortemDebugMode = false; - this.isOocdDisabled = false; - this.port = 43474; - this.logLevel = 0; - let idfTarget = await getIdfTargetFromSdkconfig(this.currentWorkspace); - this.target = idfTarget; - this.env = await appendIdfAndToolsToPath(this.currentWorkspace); - this.env.PYTHONPATH = path.join( - extensionPath.fsPath, - "esp_debug_adapter", - "debug_adapter" - ); - this.initGdbCommands = []; - this.elfFile = ""; - if (this.currentWorkspace) { - const buildDirPath = idfConf.readParameter( - "idf.buildPath", - this.currentWorkspace - ) as string; - this.elfFile = `${path.join(buildDirPath, "project-name")}.elf`; - } - } - - private sendToOutputChannel(data: Buffer) { - this.chan = Buffer.concat([this.chan, data]); - } - - private async makeGdbinitFile() { - try { - if (this.initGdbCommands && this.initGdbCommands.length > 0) { - let result = ""; - for (const initCmd of this.initGdbCommands) { - result = result + initCmd + EOL; - } - const lastValue = result.lastIndexOf(EOL); - result = result.substring(0, lastValue); - - const resultGdbInitPath = path.join( - this.currentWorkspace.fsPath, - "esp-idf-vscode-generated.gdb" - ); - await outputFile(resultGdbInitPath, result); - return resultGdbInitPath; - } - } catch (error) { - Logger.errorNotify( - "Error creating gdbinit file", - error, - "DebugAdapterManager makeGdbinitFile" - ); - } - return; - } -} diff --git a/src/espIdf/debugAdapter/verifyApp.ts b/src/espIdf/debugAdapter/verifyApp.ts index d2fc9357e..1b0a3e768 100644 --- a/src/espIdf/debugAdapter/verifyApp.ts +++ b/src/espIdf/debugAdapter/verifyApp.ts @@ -21,12 +21,13 @@ import { l10n, Uri } from "vscode"; import { createFlashModel } from "../../flash/flashModelBuilder"; import { readParameter, readSerialPort } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; -import { appendIdfAndToolsToPath, spawn } from "../../utils"; +import { spawn } from "../../utils"; import { pathExists } from "fs-extra"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { configureEnvVariables } from "../../common/prepareEnv"; export async function verifyAppBinary(workspaceFolder: Uri) { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const modifiedEnv = await configureEnvVariables(workspaceFolder); const serialPort = await readSerialPort(workspaceFolder, false); if (!serialPort) { return Logger.warnNotify( @@ -37,10 +38,9 @@ export async function verifyAppBinary(workspaceFolder: Uri) { ); } const flashBaudRate = readParameter("idf.flashBaudRate", workspaceFolder); - const idfPath = readParameter("idf.espIdfPath", workspaceFolder); - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); const esptoolPath = join( - idfPath, + modifiedEnv["IDF_PATH"], "components", "esptool_py", "esptool", diff --git a/src/espIdf/documentation/getDocsVersion.ts b/src/espIdf/documentation/getDocsVersion.ts index e172be774..4917694c9 100644 --- a/src/espIdf/documentation/getDocsVersion.ts +++ b/src/espIdf/documentation/getDocsVersion.ts @@ -13,16 +13,22 @@ // limitations under the License. import { ESP } from "../../config"; -import { pathExists, readFile, readJSON, stat, writeJSON } from "fs-extra"; +import { + createWriteStream, + pathExists, + readFile, + readJSON, + stat, + writeJSON, +} from "fs-extra"; import { tmpdir } from "os"; import { basename, join } from "path"; -import { DownloadManager } from "../../downloadManager"; import jsonic from "jsonic"; import { Logger } from "../../logger/logger"; import { extensionContext, getEspIdfFromCMake } from "../../utils"; import * as vscode from "vscode"; -import * as idfConf from "../../idfConfiguration"; import { getIdfTargetFromSdkconfig } from "../../workspaceConfig"; +import axios from "axios"; export interface IEspIdfDocVersion { name: string; @@ -110,9 +116,8 @@ export async function getDocsIndex( } export async function readObjectFromUrlFile(objectUrl: string) { - const downloadManager = new DownloadManager(tmpdir()); - await downloadManager.downloadWithResume(objectUrl, tmpdir()); const fileName = join(tmpdir(), basename(objectUrl)); + await downloadFile(objectUrl, fileName); const objectStr = await readFile(fileName, "utf-8"); const objectMatches = objectStr.match(/{[\s\S]+}/g); if (objectMatches && objectMatches.length > 0) { @@ -120,6 +125,29 @@ export async function readObjectFromUrlFile(objectUrl: string) { } } +async function downloadFile(url: string, outputLocationPath: string) { + const writer = createWriteStream(outputLocationPath); + try { + const response = await axios({ + url, + method: "GET", + responseType: "stream", + }); + response.data.pipe(writer); + return new Promise((resolve, reject) => { + writer.on("finish", resolve); + writer.on("error", reject); + }); + } catch (error) { + Logger.error( + `Error downloading ${basename(url)}: ${error}`, + error, + "getDocsVersion downloadFile" + ); + throw error; + } +} + /** * Retrieves the URL for the specified documentation part based on the ESP-IDF version and workspace. * @param documentationPart - The documentation part to retrieve the URL for. @@ -130,10 +158,10 @@ export async function getDocsUrl( documentationPart: string, workspace: vscode.Uri ) { - const espIdfPath = idfConf.readParameter( - "idf.espIdfPath", - workspace - ) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const espIdfPath = currentEnvVars["IDF_PATH"]; const adapterTargetName = await getIdfTargetFromSdkconfig(workspace); const idfVersion = await getEspIdfFromCMake(espIdfPath); diff --git a/src/espIdf/documentation/getSearchResults.ts b/src/espIdf/documentation/getSearchResults.ts index 3fb5651e1..4c99df688 100644 --- a/src/espIdf/documentation/getSearchResults.ts +++ b/src/espIdf/documentation/getSearchResults.ts @@ -17,6 +17,7 @@ import * as idfConf from "../../idfConfiguration"; import { getEspIdfFromCMake } from "../../utils"; import { getDocsBaseUrl, getDocsIndex, getDocsVersion } from "./getDocsVersion"; import { getIdfTargetFromSdkconfig } from "../../workspaceConfig"; +import { ESP } from "../../config"; export class IDocResult { public name: string; @@ -44,9 +45,10 @@ export async function seachInEspDocs( workspaceFolder: Uri ) { const docsVersions = await getDocsVersion(); - const idfPath = - idfConf.readParameter("idf.espIdfPath", workspaceFolder) || - process.env.IDF_PATH; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPath = currentEnvVars["IDF_PATH"]; let idfVersion = "v" + (await getEspIdfFromCMake(idfPath)); let idfTarget = await getIdfTargetFromSdkconfig(workspaceFolder); let docVersion = docsVersions.find((docVer) => docVer.name === idfVersion); diff --git a/src/espIdf/menuconfig/confServerProcess.ts b/src/espIdf/menuconfig/confServerProcess.ts index 1d076be68..27793a9a4 100644 --- a/src/espIdf/menuconfig/confServerProcess.ts +++ b/src/espIdf/menuconfig/confServerProcess.ts @@ -24,7 +24,6 @@ import * as idfConf from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; import { OutputChannel } from "../../logger/outputChannel"; import { - appendIdfAndToolsToPath, delConfigFile, getSDKConfigFilePath, isStringNotEmpty, @@ -33,6 +32,8 @@ import { KconfigMenuLoader } from "./kconfigMenuLoader"; import { Menu, menuType } from "./Menu"; import { MenuConfigPanel } from "./MenuconfigPanel"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { configureEnvVariables } from "../../common/prepareEnv"; +import { ESP } from "../../config"; export class ConfserverProcess { public static async initWithProgress( @@ -71,8 +72,8 @@ export class ConfserverProcess { public static async init(workspaceFolder: vscode.Uri, extensionPath: string) { return new Promise(async (resolve) => { - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); + const modifiedEnv = await configureEnvVariables(workspaceFolder); if (!ConfserverProcess.instance) { const configFile = await getSDKConfigFilePath(workspaceFolder); ConfserverProcess.instance = new ConfserverProcess( @@ -207,12 +208,13 @@ export class ConfserverProcess { ConfserverProcess.instance.areValuesSaved = true; const currWorkspace = ConfserverProcess.instance.workspaceFolder; await delConfigFile(currWorkspace); - const guiconfigEspPath = - idfConf.readParameter("idf.espIdfPath", currWorkspace) || - process.env.IDF_PATH; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const guiconfigEspPath = currentEnvVars["IDF_PATH"]; const idfPyPath = path.join(guiconfigEspPath, "tools", "idf.py"); - const modifiedEnv = await appendIdfAndToolsToPath(currWorkspace); - const pythonBinPath = await getVirtualEnvPythonPath(currWorkspace); + const modifiedEnv = await configureEnvVariables(currWorkspace); + const pythonBinPath = await getVirtualEnvPythonPath(); const enableCCache = idfConf.readParameter( "idf.enableCCache", currWorkspace @@ -329,9 +331,10 @@ export class ConfserverProcess { this.workspaceFolder = workspaceFolder; this.extensionPath = extensionPath; this.emitter = new EventEmitter(); - this.espIdfPath = - idfConf.readParameter("idf.espIdfPath", workspaceFolder).toString() || - process.env.IDF_PATH; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + this.espIdfPath = currentEnvVars["IDF_PATH"]; modifiedEnv.PYTHONUNBUFFERED = "0"; this.configFile = configFile; const idfPath = path.join(this.espIdfPath, "tools", "idf.py"); diff --git a/src/espIdf/menuconfig/saveDefConfig.ts b/src/espIdf/menuconfig/saveDefConfig.ts index ea16f7b18..2607204a5 100644 --- a/src/espIdf/menuconfig/saveDefConfig.ts +++ b/src/espIdf/menuconfig/saveDefConfig.ts @@ -31,9 +31,10 @@ import { TaskManager } from "../../taskManager"; import { NotificationMode, readParameter } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; import { join } from "path"; -import { appendIdfAndToolsToPath } from "../../utils"; import { pathExists } from "fs-extra"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { configureEnvVariables } from "../../common/prepareEnv"; +import { ESP } from "../../config"; export async function saveDefSdkconfig( workspaceFolder: Uri, @@ -45,7 +46,10 @@ export async function saveDefSdkconfig( TaskManager.disposeListeners(); }); } - const idfPath = readParameter("idf.espIdfPath", workspaceFolder); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPath = currentEnvVars["IDF_PATH"]; const notificationMode = readParameter( "idf.notificationMode", workspaceFolder @@ -92,12 +96,12 @@ export async function getSaveDefConfigExecution( wsFolder: Uri ) { const saveDefConfArgs = [join(idfPath, "tools", "idf.py"), "save-defconfig"]; - const modifiedEnv = await appendIdfAndToolsToPath(wsFolder); + const modifiedEnv = await configureEnvVariables(wsFolder); const options: ProcessExecutionOptions = { cwd: wsFolder.fsPath, env: modifiedEnv, }; - const pythonBinPath = await getVirtualEnvPythonPath(wsFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); const pythonBinExists = await pathExists(pythonBinPath); if (!pythonBinExists) { throw new Error( diff --git a/src/espIdf/monitor/checkWebsocketClient.ts b/src/espIdf/monitor/checkWebsocketClient.ts index 1293af551..116ad7e6a 100644 --- a/src/espIdf/monitor/checkWebsocketClient.ts +++ b/src/espIdf/monitor/checkWebsocketClient.ts @@ -18,12 +18,13 @@ import { Uri } from "vscode"; import { OutputChannel } from "../../logger/outputChannel"; -import { appendIdfAndToolsToPath, execChildProcess } from "../../utils"; +import { execChildProcess } from "../../utils"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { configureEnvVariables } from "../../common/prepareEnv"; export async function installWebsocketClient(workspace: Uri) { - const pythonBinPath = await getVirtualEnvPythonPath(workspace); - const modifiedEnv = await appendIdfAndToolsToPath(workspace); + const pythonBinPath = await getVirtualEnvPythonPath(); + const modifiedEnv = await configureEnvVariables(workspace); try { const showResult = await execChildProcess( pythonBinPath, diff --git a/src/espIdf/monitor/command.ts b/src/espIdf/monitor/command.ts index b975ed6c0..580c6eaf7 100644 --- a/src/espIdf/monitor/command.ts +++ b/src/espIdf/monitor/command.ts @@ -71,7 +71,7 @@ export async function createNewIdfMonitor( "createNewIdfMonitor select a serial port" ); } - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); if (!utils.canAccessFile(pythonBinPath, R_OK)) { Logger.errorNotify( "Python binary path is not defined", @@ -79,7 +79,10 @@ export async function createNewIdfMonitor( "createNewIdfMonitor pythonBinPath not defined" ); } - const idfPath = readParameter("idf.espIdfPath", workspaceFolder) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPath = currentEnvVars["IDF_PATH"]; const idfVersion = await utils.getEspIdfFromCMake(idfPath); let sdkMonitorBaudRate: string = await utils.getMonitorBaudRate( workspaceFolder @@ -138,8 +141,6 @@ export async function createNewIdfMonitor( } IDFMonitor.start(); if (noReset) { - const idfPath = readParameter("idf.espIdfPath", workspaceFolder) as string; - const idfVersion = await utils.getEspIdfFromCMake(idfPath); if (idfVersion <= "5.0") { const monitorDelay = readParameter( "idf.monitorDelay", diff --git a/src/espIdf/monitor/index.ts b/src/espIdf/monitor/index.ts index 9d9bdbae2..93480a6b5 100644 --- a/src/espIdf/monitor/index.ts +++ b/src/espIdf/monitor/index.ts @@ -16,8 +16,9 @@ * limitations under the License. */ +import { configureEnvVariables } from "../../common/prepareEnv"; import { ESP } from "../../config"; -import { appendIdfAndToolsToPath, getUserShell } from "../../utils"; +import { getUserShell } from "../../utils"; import { window, Terminal, Uri, env, debug } from "vscode"; import { join } from "path"; @@ -48,9 +49,7 @@ export class IDFMonitor { } static async start() { - const modifiedEnv = await appendIdfAndToolsToPath( - this.config.workspaceFolder - ); + const modifiedEnv = await configureEnvVariables(this.config.workspaceFolder); if (!IDFMonitor.terminal) { IDFMonitor.terminal = window.createTerminal({ name: `ESP-IDF Monitor ${this.config.wsPort ? "(--ws enabled)" : ""}`, diff --git a/src/espIdf/nvs/partitionTable/panel.ts b/src/espIdf/nvs/partitionTable/panel.ts index 0e648a352..4a099fad0 100644 --- a/src/espIdf/nvs/partitionTable/panel.ts +++ b/src/espIdf/nvs/partitionTable/panel.ts @@ -23,6 +23,7 @@ import * as idfConf from "../../../idfConfiguration"; import { canAccessFile, execChildProcess } from "../../../utils"; import { OutputChannel } from "../../../logger/outputChannel"; import { getVirtualEnvPythonPath } from "../../../pythonManager"; +import { ESP } from "../../../config"; export class NVSPartitionTable { private static currentPanel: NVSPartitionTable; @@ -142,11 +143,12 @@ export class NVSPartitionTable { partitionSize: string ) { try { - const idfPathDir = - idfConf.readParameter("idf.espIdfPath", this.workspaceFolder) || - process.env.IDF_PATH; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPathDir = currentEnvVars["IDF_PATH"]; - const pythonBinPath = await getVirtualEnvPythonPath(this.workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); const dirPath = dirname(this.filePath); const fileName = basename(this.filePath); const resultName = fileName.replace(".csv", ".bin"); @@ -173,7 +175,7 @@ export class NVSPartitionTable { Logger.errorNotify( "nvs_partition_gen.py is not defined", new Error( - "nvs_partition_gen.py is not defined, Make sure idf.espIdfPath is correct." + "nvs_partition_gen.py is not defined, Make sure IDF_PATH in your setup is correct." ), "NVSPartitionTable generateNvsPartition, toolsPath" ); diff --git a/src/espIdf/openOcd/boardConfiguration.ts b/src/espIdf/openOcd/boardConfiguration.ts index f00eaff33..a60e50ea1 100644 --- a/src/espIdf/openOcd/boardConfiguration.ts +++ b/src/espIdf/openOcd/boardConfiguration.ts @@ -21,7 +21,6 @@ import { readJSON } from "fs-extra"; import { Logger } from "../../logger/logger"; import { commands, ConfigurationTarget, l10n, Uri, window } from "vscode"; import { defaultBoards } from "./defaultBoards"; -import { IdfToolsManager } from "../../idfToolsManager"; import { getIdfTargetFromSdkconfig } from "../../workspaceConfig"; export interface IdfBoard { @@ -32,22 +31,13 @@ export interface IdfBoard { } export async function getOpenOcdScripts(workspace: Uri): Promise { - const idfPathDir = readParameter("idf.espIdfPath", workspace) as string; - const toolsPath = readParameter("idf.toolsPath", workspace) as string; - const userExtraVars = readParameter("idf.customExtraVars", workspace) as { - [key: string]: string; - }; - const idfToolsManager = await IdfToolsManager.createIdfToolsManager( - idfPathDir - ); - const idfExtraVars = await idfToolsManager.exportVars( - join(toolsPath, "tools") - ); + const userExtraVars = readParameter( + "idf.customExtraVars", + workspace + ) as { [key: string]: string }; let openOcdScriptsPath: string; try { - openOcdScriptsPath = idfExtraVars.hasOwnProperty("OPENOCD_SCRIPTS") - ? idfExtraVars.OPENOCD_SCRIPTS - : userExtraVars.hasOwnProperty("OPENOCD_SCRIPTS") + openOcdScriptsPath = userExtraVars.hasOwnProperty("OPENOCD_SCRIPTS") ? userExtraVars.OPENOCD_SCRIPTS : process.env.OPENOCD_SCRIPTS ? process.env.OPENOCD_SCRIPTS diff --git a/src/espIdf/openOcd/openOcdManager.ts b/src/espIdf/openOcd/openOcdManager.ts index d01e0c0b6..654128e94 100644 --- a/src/espIdf/openOcd/openOcdManager.ts +++ b/src/espIdf/openOcd/openOcdManager.ts @@ -23,7 +23,6 @@ import * as idfConf from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; import { OutputChannel } from "../../logger/outputChannel"; import { - appendIdfAndToolsToPath, isBinInPath, PreCheck, spawn as sspawn, @@ -35,6 +34,7 @@ import { CommandKeys, createCommandDictionary, } from "../../cmdTreeView/cmdStore"; +import { configureEnvVariables } from "../../common/prepareEnv"; export interface IOpenOCDConfig { workspace: vscode.Uri; @@ -60,7 +60,7 @@ export class OpenOCDManager extends EventEmitter { } public async version(): Promise { - const modifiedEnv = await appendIdfAndToolsToPath(this.workspace); + const modifiedEnv = await configureEnvVariables(this.workspace); const openOcdPath = await isBinInPath("openocd", modifiedEnv, [ "openocd-esp32", ]); @@ -159,7 +159,7 @@ export class OpenOCDManager extends EventEmitter { if (this.isRunning()) { return; } - const modifiedEnv = await appendIdfAndToolsToPath(this.workspace); + const modifiedEnv = await configureEnvVariables(this.workspace); const openOcdPath = await isBinInPath("openocd", modifiedEnv, [ "openocd-esp32", ]); diff --git a/src/espIdf/partition-table/partitionFlasher.ts b/src/espIdf/partition-table/partitionFlasher.ts index db5917e86..77fd92b13 100644 --- a/src/espIdf/partition-table/partitionFlasher.ts +++ b/src/espIdf/partition-table/partitionFlasher.ts @@ -2,13 +2,13 @@ * Project: ESP-IDF VSCode Extension * File Created: Monday, 19th July 2021 7:11:49 pm * Copyright 2021 Espressif Systems (Shanghai) CO LTD - *  + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *  + * * http://www.apache.org/licenses/LICENSE-2.0 - *  + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,8 +24,9 @@ import { readSerialPort, } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; -import { appendIdfAndToolsToPath, spawn } from "../../utils"; +import { spawn } from "../../utils"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { configureEnvVariables } from "../../common/prepareEnv"; export async function flashBinaryToPartition( offset: string, @@ -49,7 +50,7 @@ export async function flashBinaryToPartition( }, async (progress: Progress<{ message: string; increment: number }>) => { try { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const modifiedEnv = await configureEnvVariables(workspaceFolder); const serialPort = await readSerialPort(workspaceFolder, false); if (!serialPort) { return Logger.warnNotify( @@ -59,8 +60,8 @@ export async function flashBinaryToPartition( ) ); } - const idfPath = readParameter("idf.espIdfPath", workspaceFolder); - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const idfPath = modifiedEnv["IDF_PATH"]; + const pythonBinPath = await getVirtualEnvPythonPath(); const esptoolPath = join( idfPath, "components", diff --git a/src/espIdf/partition-table/partitionReader.ts b/src/espIdf/partition-table/partitionReader.ts index 3d4b70063..dff8ba661 100644 --- a/src/espIdf/partition-table/partitionReader.ts +++ b/src/espIdf/partition-table/partitionReader.ts @@ -19,9 +19,10 @@ import { dirname, join } from "path"; import { l10n, Progress, ProgressLocation, Uri, window } from "vscode"; import { NotificationMode, readParameter, readSerialPort } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; -import { appendIdfAndToolsToPath, spawn } from "../../utils"; +import { spawn } from "../../utils"; import { getVirtualEnvPythonPath } from "../../pythonManager"; import { ensureDir } from "fs-extra"; +import { configureEnvVariables } from "../../common/prepareEnv"; export async function readPartition( name: string, @@ -46,7 +47,7 @@ export async function readPartition( }, async (progress: Progress<{ message: string; increment: number }>) => { try { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const modifiedEnv = await configureEnvVariables(this.config.workspaceFolder); const serialPort = await readSerialPort(workspaceFolder, false); if (!serialPort) { return Logger.warnNotify( @@ -56,8 +57,8 @@ export async function readPartition( ) ); } - const idfPath = readParameter("idf.espIdfPath", workspaceFolder); - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const idfPath = modifiedEnv.IDF_PATH; + const pythonBinPath = await getVirtualEnvPythonPath(); const esptoolPath = join( idfPath, "components", diff --git a/src/espIdf/partition-table/tree.ts b/src/espIdf/partition-table/tree.ts index a39bc2732..adcb18396 100644 --- a/src/espIdf/partition-table/tree.ts +++ b/src/espIdf/partition-table/tree.ts @@ -17,7 +17,6 @@ */ import { ensureDir, pathExists, readFile, stat } from "fs-extra"; -import { EOL } from "os"; import { join } from "path"; import { Disposable, @@ -29,20 +28,15 @@ import { TreeItem, Uri, window, - workspace, } from "vscode"; import { readParameter, readSerialPort } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; -import { - appendIdfAndToolsToPath, - getConfigValueFromSDKConfig, - PreCheck, - spawn, -} from "../../utils"; import { CSV2JSON } from "../../views/partition-table/util"; import { getVirtualEnvPythonPath } from "../../pythonManager"; import { createFlashModel } from "../../flash/flashModelBuilder"; import { formatAsPartitionSize } from "./partitionReader"; +import { spawn } from "../../utils"; +import { configureEnvVariables } from "../../common/prepareEnv"; export class PartitionItem extends TreeItem { name: string; @@ -84,10 +78,7 @@ export class PartitionTreeDataProvider public async populatePartitionItems(workspace: Uri) { this.partitionItems = Array(0); try { - const idfPath = readParameter("idf.espIdfPath", workspace); - const buildPath = readParameter("idf.buildPath", workspace); - const flashBaudRate = readParameter("idf.flashBaudRate", workspace); - const modifiedEnv = await appendIdfAndToolsToPath(workspace); + const modifiedEnv = await configureEnvVariables(workspace); const serialPort = readParameter("idf.port", workspace) as string; if (!serialPort) { return Logger.warnNotify( @@ -97,7 +88,10 @@ export class PartitionTreeDataProvider ) ); } - const pythonBinPath = await getVirtualEnvPythonPath(workspace); + const buildPath = readParameter("idf.buildPath", workspace); + const flashBaudRate = readParameter("idf.flashBaudRate", workspace); + const idfPath = modifiedEnv["IDF_PATH"]; + const pythonBinPath = await getVirtualEnvPythonPath(); const flasherArgsPath = join(buildPath, "flasher_args.json"); diff --git a/src/espIdf/reconfigure/task.ts b/src/espIdf/reconfigure/task.ts index 2e3c666d1..03bc16809 100644 --- a/src/espIdf/reconfigure/task.ts +++ b/src/espIdf/reconfigure/task.ts @@ -27,24 +27,23 @@ import { workspace, } from "vscode"; import { NotificationMode, readParameter } from "../../idfConfiguration"; -import { appendIdfAndToolsToPath, getSDKConfigFilePath } from "../../utils"; +import { getSDKConfigFilePath } from "../../utils"; import { join } from "path"; import { TaskManager } from "../../taskManager"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { configureEnvVariables } from "../../common/prepareEnv"; export class IdfReconfigureTask { private buildDirPath: string; private curWorkspace: Uri; - private idfPathDir: string; constructor(workspace: Uri) { this.curWorkspace = workspace; - this.idfPathDir = readParameter("idf.espIdfPath", workspace) as string; this.buildDirPath = readParameter("idf.buildPath", workspace) as string; } public async reconfigure() { - const modifiedEnv = await appendIdfAndToolsToPath(this.curWorkspace); + const modifiedEnv = await configureEnvVariables(this.curWorkspace); const options: ProcessExecutionOptions = { cwd: this.curWorkspace.fsPath, env: modifiedEnv, @@ -63,7 +62,7 @@ export class IdfReconfigureTask { ? TaskRevealKind.Always : TaskRevealKind.Silent; - const idfPy = join(this.idfPathDir, "tools", "idf.py"); + const idfPy = join(modifiedEnv["IDF_PATH"], "tools", "idf.py"); const reconfigureArgs = [idfPy]; let buildPathArgsIndex = reconfigureArgs.indexOf("-B"); @@ -102,7 +101,7 @@ export class IdfReconfigureTask { reconfigureArgs.push("reconfigure"); - const pythonBinPath = await getVirtualEnvPythonPath(this.curWorkspace); + const pythonBinPath = await getVirtualEnvPythonPath(); const reconfigureExecution = new ProcessExecution( pythonBinPath, diff --git a/src/espIdf/serial/serialPort.ts b/src/espIdf/serial/serialPort.ts index ac0ae756e..cfe811e58 100644 --- a/src/espIdf/serial/serialPort.ts +++ b/src/espIdf/serial/serialPort.ts @@ -27,6 +27,7 @@ import * as SerialPortLib from "serialport"; import { getVirtualEnvPythonPath } from "../../pythonManager"; import { getIdfTargetFromSdkconfig } from "../../workspaceConfig"; import { showInfoNotificationWithAction } from "../../logger/utils"; +import { ESP } from "../../config"; export class SerialPort { /** @@ -98,7 +99,7 @@ export class SerialPort { "idf.espIdfPath", workspaceFolder ) as string; - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); const esptoolPath = join( idfPath, "components", @@ -365,11 +366,11 @@ export class SerialPort { ); }); - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); - const idfPath = idfConf.readParameter( - "idf.espIdfPath", - workspaceFolder - ); + const pythonBinPath = await getVirtualEnvPythonPath(); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPath = currentEnvVars["IDF_PATH"]; const enableSerialPortChipIdRequest = idfConf.readParameter( "idf.enableSerialPortChipIdRequest", workspaceFolder diff --git a/src/espIdf/setTarget/DevkitsCommand.ts b/src/espIdf/setTarget/DevkitsCommand.ts index fd906de5e..99541b719 100644 --- a/src/espIdf/setTarget/DevkitsCommand.ts +++ b/src/espIdf/setTarget/DevkitsCommand.ts @@ -17,27 +17,28 @@ */ import * as vscode from "vscode"; -import * as fs from "fs" +import * as fs from "fs"; import { join } from "path"; import * as idfConf from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; import { getVirtualEnvPythonPath } from "../../pythonManager"; import { OpenOCDManager } from "../openOcd/openOcdManager"; -import { appendIdfAndToolsToPath, execChildProcess } from "../../utils"; +import { execChildProcess } from "../../utils"; import { OutputChannel } from "../../logger/outputChannel"; import { getOpenOcdScripts } from "../openOcd/boardConfiguration"; +import { configureEnvVariables } from "../../common/prepareEnv"; export class DevkitsCommand { - private workspaceRoot: vscode.Uri; + private workspaceFolderUri: vscode.Uri; - constructor(workspaceRoot: vscode.Uri) { - this.workspaceRoot = workspaceRoot; + constructor(workspaceFolder: vscode.Uri) { + this.workspaceFolderUri = workspaceFolder; } public async runDevkitsScript(): Promise { try { const workspaceFolder = vscode.workspace.getWorkspaceFolder( - this.workspaceRoot + this.workspaceFolderUri ); if (!workspaceFolder) { throw new Error("No workspace folder found"); @@ -45,7 +46,7 @@ export class DevkitsCommand { const toolsPath = idfConf.readParameter( "idf.toolsPath", - this.workspaceRoot + this.workspaceFolderUri ) as string; const openOCDManager = OpenOCDManager.init(); const openOCDVersion = await openOCDManager.version(); @@ -67,7 +68,9 @@ export class DevkitsCommand { "esp_detect_config.py" ); - const openOcdScriptsPath = await getOpenOcdScripts(this.workspaceRoot); + const openOcdScriptsPath = await getOpenOcdScripts( + this.workspaceFolderUri + ); if (!openOcdScriptsPath) { throw new Error("Could not get OpenOCD scripts path"); } @@ -76,7 +79,7 @@ export class DevkitsCommand { const notificationMode = idfConf.readParameter( "idf.notificationMode", - this.workspaceRoot + this.workspaceFolderUri ) as string; const ProgressLocation = @@ -85,8 +88,8 @@ export class DevkitsCommand { ? vscode.ProgressLocation.Notification : vscode.ProgressLocation.Window; - const pythonBinPath = await getVirtualEnvPythonPath(this.workspaceRoot); - const modifiedEnv = await appendIdfAndToolsToPath(this.workspaceRoot); + const pythonBinPath = await getVirtualEnvPythonPath(); + const modifiedEnv = await configureEnvVariables(this.workspaceFolderUri); OutputChannel.init(); OutputChannel.appendLine( @@ -109,7 +112,7 @@ export class DevkitsCommand { const result = await execChildProcess( pythonBinPath, [scriptPath, "--esp-config", espConfigPath], - this.workspaceRoot.fsPath, + this.workspaceFolderUri.fsPath, OutputChannel.init(), { env: modifiedEnv }, cancelToken @@ -144,7 +147,7 @@ export class DevkitsCommand { try { const toolsPath = idfConf.readParameter( "idf.toolsPath", - this.workspaceRoot + this.workspaceFolderUri ) as string; const openOCDManager = OpenOCDManager.init(); const openOCDVersion = await openOCDManager.version(); diff --git a/src/espIdf/setTarget/getTargets.ts b/src/espIdf/setTarget/getTargets.ts index 39106baf2..26d1728c0 100644 --- a/src/espIdf/setTarget/getTargets.ts +++ b/src/espIdf/setTarget/getTargets.ts @@ -18,8 +18,8 @@ import { existsSync, readFileSync } from "fs"; import { join } from "path"; import { Uri } from "vscode"; -import { readParameter } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; +import { configureEnvVariables } from "../../common/prepareEnv"; export interface IdfTarget { label: string; @@ -32,9 +32,10 @@ export async function getTargetsFromEspIdf( workspaceFolder: Uri, givenIdfPathDir?: string ) { + const modifiedEnv = await configureEnvVariables(workspaceFolder); const idfPathDir = givenIdfPathDir ? givenIdfPathDir - : readParameter("idf.espIdfPath", workspaceFolder); + : modifiedEnv["IDF_PATH"]; const resultTargetArray: IdfTarget[] = []; try { diff --git a/src/espIdf/setTarget/setTargetInIdf.ts b/src/espIdf/setTarget/setTargetInIdf.ts index f42aac1d4..3786057b9 100644 --- a/src/espIdf/setTarget/setTargetInIdf.ts +++ b/src/espIdf/setTarget/setTargetInIdf.ts @@ -22,7 +22,6 @@ import { readParameter } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; import { OutputChannel } from "../../logger/outputChannel"; import { - appendIdfAndToolsToPath, setCCppPropertiesJsonCompilerPath, spawn, } from "../../utils"; @@ -30,6 +29,7 @@ import { ConfserverProcess } from "../menuconfig/confServerProcess"; import { IdfTarget } from "./getTargets"; import { getVirtualEnvPythonPath } from "../../pythonManager"; import * as vscode from "vscode"; +import { configureEnvVariables } from "../../common/prepareEnv"; export async function setTargetInIDF( workspaceFolder: WorkspaceFolder, @@ -39,13 +39,12 @@ export async function setTargetInIDF( if (ConfserverProcess.exists()) { ConfserverProcess.dispose(); } - const idfPathDir = readParameter("idf.espIdfPath", workspaceFolder.uri); const buildDirPath = readParameter( "idf.buildPath", workspaceFolder.uri ) as string; - const idfPy = join(idfPathDir, "tools", "idf.py"); - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder.uri); + const modifiedEnv = await configureEnvVariables(workspaceFolder.uri); + const idfPy = join(modifiedEnv["IDF_PATH"], "tools", "idf.py"); modifiedEnv.IDF_TARGET = undefined; const enableCCache = readParameter( "idf.enableCCache", @@ -74,7 +73,7 @@ export async function setTargetInIDF( } setTargetArgs.push("set-target", selectedTarget.target); - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder.uri); + const pythonBinPath = await getVirtualEnvPythonPath(); OutputChannel.appendLine("Running IDF Set Target action", "Set Target"); const setTargetResult = await spawn(pythonBinPath, setTargetArgs, { cwd: workspaceFolder.uri.fsPath, diff --git a/src/espIdf/size/idfSize.ts b/src/espIdf/size/idfSize.ts index 8becd00af..5c1c7fda1 100644 --- a/src/espIdf/size/idfSize.ts +++ b/src/espIdf/size/idfSize.ts @@ -24,6 +24,7 @@ import { fileExists, spawn } from "../../utils"; import { getProjectName } from "../../workspaceConfig"; import * as utils from "../../utils"; import { getVirtualEnvPythonPath } from "../../pythonManager"; +import { ESP } from "../../config"; export class IDFSize { private readonly workspaceFolderUri: vscode.Uri; @@ -54,16 +55,13 @@ export class IDFSize { const mapFilePath = await this.mapFilePath(); let locMsg = vscode.l10n.t("Gathering Overview"); - const espIdfPath = idfConf.readParameter( - "idf.espIdfPath", - this.workspaceFolderUri - ) as string; + const espIdfPath = this.idfPath(); const version = await utils.getEspIdfFromCMake(espIdfPath); const formatArgs = utils.compareVersion(version, "5.3.0") >= 0 ? ["--format", "json2"] : utils.compareVersion(version, "5.1.0") >= 0 - ? ["--format", "json"] + ? ["--format", "json"] : ["--json"]; const overview = await this.idfCommandInvoker([ "idf_size.py", @@ -106,11 +104,10 @@ export class IDFSize { } private idfPath(): string { - const idfPathDir = idfConf.readParameter( - "idf.espIdfPath", - this.workspaceFolderUri - ); - return path.join(idfPathDir, "tools"); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + return currentEnvVars["IDF_PATH"]; } public async isBuiltAlready() { @@ -120,11 +117,9 @@ export class IDFSize { private async idfCommandInvoker(args: string[]) { const idfPath = this.idfPath(); try { - const pythonBinPath = await getVirtualEnvPythonPath( - this.workspaceFolderUri - ); + const pythonBinPath = await getVirtualEnvPythonPath(); const buffOut = await spawn(pythonBinPath, args, { - cwd: idfPath, + cwd: path.join(idfPath, "tools"), }); const buffStr = buffOut.toString(); const buffObj = JSON.parse(buffStr); diff --git a/src/espIdf/size/idfSizeTask.ts b/src/espIdf/size/idfSizeTask.ts index f3087acdf..85c798853 100644 --- a/src/espIdf/size/idfSizeTask.ts +++ b/src/espIdf/size/idfSizeTask.ts @@ -28,9 +28,11 @@ import { } from "vscode"; import { NotificationMode, readParameter } from "../../idfConfiguration"; import { TaskManager } from "../../taskManager"; -import { appendIdfAndToolsToPath, readProjectCMakeLists } from "../../utils"; +import { readProjectCMakeLists } from "../../utils"; import { getVirtualEnvPythonPath } from "../../pythonManager"; import { OutputCapturingExecution } from "../../taskManager/customExecution"; +import { configureEnvVariables } from "../../common/prepareEnv"; +import { ESP } from "../../config"; export class IdfSizeTask { private currentWorkspace: Uri; @@ -39,8 +41,11 @@ export class IdfSizeTask { constructor(workspaceUri: Uri) { this.currentWorkspace = workspaceUri; - const idfPathDir = readParameter("idf.espIdfPath", workspaceUri) as string; - this.idfSizePath = join(idfPathDir, "tools", "idf_size.py"); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPath = currentEnvVars["IDF_PATH"]; + this.idfSizePath = join(idfPath, "tools", "idf_size.py"); this.buildDirPath = readParameter("idf.buildPath", workspaceUri) as string; } @@ -51,11 +56,11 @@ export class IdfSizeTask { public async getSizeInfo() { await ensureDir(this.buildDirPath); - const pythonCommand = await getVirtualEnvPythonPath(this.currentWorkspace); - const mapFilePath = this.mapFilePath(); + const pythonCommand = await getVirtualEnvPythonPath(); + const mapFilePath = await this.mapFilePath(); const args = [this.idfSizePath, mapFilePath]; - const modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace); + const modifiedEnv = await configureEnvVariables(this.currentWorkspace); const processOptions = { cwd: this.buildDirPath, env: modifiedEnv, diff --git a/src/espIdf/tracing/gdbHeapTraceManager.ts b/src/espIdf/tracing/gdbHeapTraceManager.ts index 228e97cf2..6c8d37ca6 100644 --- a/src/espIdf/tracing/gdbHeapTraceManager.ts +++ b/src/espIdf/tracing/gdbHeapTraceManager.ts @@ -2,13 +2,13 @@ * Project: ESP-IDF VSCode Extension * File Created: Wednesday, 14th July 2021 2:51:09 pm * Copyright 2021 Espressif Systems (Shanghai) CO LTD - *  + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *  + * * http://www.apache.org/licenses/LICENSE-2.0 - *  + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,12 +22,7 @@ import { env, Uri, window } from "vscode"; import { readParameter } from "../../idfConfiguration"; import { Logger } from "../../logger/logger"; import { OutputChannel } from "../../logger/outputChannel"; -import { - appendIdfAndToolsToPath, - getToolchainToolName, - isBinInPath, - PreCheck, -} from "../../utils"; +import { getToolchainToolName, isBinInPath } from "../../utils"; import { getProjectName } from "../../workspaceConfig"; import { OpenOCDManager } from "../openOcd/openOcdManager"; import { AppTraceArchiveTreeDataProvider } from "./tree/appTraceArchiveTreeDataProvider"; @@ -35,13 +30,13 @@ import { AppTraceButtonType, AppTraceTreeDataProvider, } from "./tree/appTraceTreeDataProvider"; +import { configureEnvVariables } from "../../common/prepareEnv"; export class GdbHeapTraceManager { private treeDataProvider: AppTraceTreeDataProvider; private archiveDataProvider: AppTraceArchiveTreeDataProvider; private childProcess: ChildProcess; private gdbinitFileName: string = "heaptrace-gdbinit"; - private workspace: Uri; constructor( treeDataProvider: AppTraceTreeDataProvider, @@ -71,7 +66,7 @@ export class GdbHeapTraceManager { throw new Error(`${buildDirPath} doesn't exist. Build first.`); } await this.createGdbinitFile(fileName, buildDirPath); - const modifiedEnv = await appendIdfAndToolsToPath(workspace); + const modifiedEnv = await configureEnvVariables(workspace); const idfTarget = modifiedEnv.IDF_TARGET || "esp32"; const gdbTool = getToolchainToolName(idfTarget, "gdb"); const isGdbToolInPath = await isBinInPath( @@ -108,14 +103,22 @@ export class GdbHeapTraceManager { }); this.childProcess.on("error", (err) => { - Logger.errorNotify(err.message, err, "GdbHeapTraceManager start error"); + Logger.errorNotify( + err.message, + err, + "GdbHeapTraceManager start error" + ); this.stop(); }); this.childProcess.on("exit", (code, signal) => { if (code && code !== 0) { const errMsg = `Heap tracing process exited with code ${code} and signal ${signal}`; - Logger.errorNotify(errMsg, new Error(errMsg), "GdbHeapTraceManager start exit"); + Logger.errorNotify( + errMsg, + new Error(errMsg), + "GdbHeapTraceManager start exit" + ); } }); } diff --git a/src/espIdf/tracing/tools/abstractTracingToolManager.ts b/src/espIdf/tracing/tools/abstractTracingToolManager.ts index bce8de76c..7103f7b96 100644 --- a/src/espIdf/tracing/tools/abstractTracingToolManager.ts +++ b/src/espIdf/tracing/tools/abstractTracingToolManager.ts @@ -20,7 +20,9 @@ import { join } from "path"; import * as vscode from "vscode"; import * as idfConf from "../../../idfConfiguration"; -import { appendIdfAndToolsToPath, canAccessFile, spawn } from "../../../utils"; +import { canAccessFile, spawn } from "../../../utils"; +import { configureEnvVariables } from "../../../common/prepareEnv"; +import { ESP } from "../../../config"; export abstract class AbstractTracingToolManager { protected readonly traceFilePath: string; @@ -42,13 +44,16 @@ export abstract class AbstractTracingToolManager { args?: string[], option?: any ) { - const modifiedEnv = await appendIdfAndToolsToPath(this.workspaceRoot); + const modifiedEnv = await configureEnvVariables(this.workspaceRoot); option.env = option.env || modifiedEnv; return await spawn(command, args, option); } protected appTraceToolsPath(): string { - const idfPathDir = idfConf.readParameter("idf.espIdfPath", this.workspaceRoot); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPathDir = currentEnvVars["IDF_PATH"]; return join(idfPathDir, "tools", "esp_app_trace"); } diff --git a/src/espIdf/tracing/tools/xtensa/abstractXtensaTools.ts b/src/espIdf/tracing/tools/xtensa/abstractXtensaTools.ts index 43e530718..e51ae68fe 100644 --- a/src/espIdf/tracing/tools/xtensa/abstractXtensaTools.ts +++ b/src/espIdf/tracing/tools/xtensa/abstractXtensaTools.ts @@ -18,8 +18,9 @@ import * as vscode from "vscode"; import { Logger } from "../../../../logger/logger"; -import { appendIdfAndToolsToPath, getToolchainToolName, spawn } from "../../../../utils"; +import { getToolchainToolName, spawn } from "../../../../utils"; import { getIdfTargetFromSdkconfig } from "../../../../workspaceConfig"; +import { configureEnvVariables } from "../../../../common/prepareEnv"; export abstract class XtensaTools { protected readonly workspaceRoot: vscode.Uri; @@ -29,7 +30,7 @@ export abstract class XtensaTools { } protected async call(args: string[]): Promise { - const env = await appendIdfAndToolsToPath(this.workspaceRoot); + const env = await configureEnvVariables(this.workspaceRoot); const toolName = await this.toolNameForTarget(this.toolName); try { return await spawn(toolName, args, { env }); diff --git a/src/espIdf/unitTest/configure.ts b/src/espIdf/unitTest/configure.ts index f6a33e0a9..cc1fb457b 100644 --- a/src/espIdf/unitTest/configure.ts +++ b/src/espIdf/unitTest/configure.ts @@ -129,10 +129,10 @@ export async function flashTestApp( ); } const flashBaudRate = readParameter("idf.flashBaudRate", unitTestAppDirPath); - const idfPathDir = readParameter( - "idf.espIdfPath", - unitTestAppDirPath - ) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfPathDir = currentEnvVars["IDF_PATH"]; const canFlash = await verifyCanFlash( flashBaudRate, port, diff --git a/src/espMatter/espMatterDownload.ts b/src/espMatter/espMatterDownload.ts index 0c3166085..e53aae0e1 100644 --- a/src/espMatter/espMatterDownload.ts +++ b/src/espMatter/espMatterDownload.ts @@ -38,7 +38,7 @@ import { Logger } from "../logger/logger"; import { TaskManager } from "../taskManager"; import { OutputChannel } from "../logger/outputChannel"; import { PackageProgress } from "../PackageProgress"; -import { getVirtualEnvPythonPath, installEspMatterPyReqs } from "../pythonManager"; +import { installEspMatterPyReqs } from "../pythonManager"; import { platform } from "os"; export class EspMatterCloning extends AbstractCloning { @@ -64,10 +64,11 @@ export class EspMatterCloning extends AbstractCloning { if (EspMatterCloning.isBuildingGn) { throw new Error("ALREADY_BUILDING"); } - const matterPathDir = readParameter( - "idf.espMatterPath", + const customExtraVars = readParameter( + "idf.customExtraVars", this.currWorkspace - ); + ) as { [key: string]: string }; + const matterPathDir = customExtraVars["ESP_MATTER_PATH"]; const espMatterPathExists = await pathExists(matterPathDir); if (!espMatterPathExists) { return; @@ -182,7 +183,11 @@ export class EspMatterCloning extends AbstractCloning { ); } catch (error) { OutputChannel.appendLine(error.message); - Logger.errorNotify(error.message, error, "EspMatterCloning initEsp32PlatformSubmodules"); + Logger.errorNotify( + error.message, + error, + "EspMatterCloning initEsp32PlatformSubmodules" + ); } } ); @@ -259,15 +264,6 @@ export async function installPythonReqs( espMatterPath: string, workspace?: Uri ) { - const espIdfPath = readParameter("idf.espIdfPath", workspace); - const pythonBinPath = await getVirtualEnvPythonPath(workspace); - const containerPath = - process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME; - const confToolsPath = readParameter("idf.toolsPath", workspace); - const toolsPath = - confToolsPath || - process.env.IDF_TOOLS_PATH || - join(containerPath, ".espressif"); const notificationMode = readParameter( "idf.notificationMode", workspace @@ -291,10 +287,8 @@ export async function installPythonReqs( message: `Installing Python Requirements...`, }); await installEspMatterPyReqs( - espIdfPath, - toolsPath, + workspace, espMatterPath, - pythonBinPath, undefined, cancelToken ); @@ -323,16 +317,18 @@ export async function getEspMatter(workspace?: Uri) { try { if (installAllSubmodules.target === "true") { - await espMatterInstaller.getRepository("idf.espMatterPath", workspace); - espMatterPath = readParameter("idf.espMatterPath", workspace); + await espMatterInstaller.getRepository("ESP_MATTER_PATH", workspace); + const customExtraVars = readParameter("idf.customExtraVars", workspace); + espMatterPath = customExtraVars["ESP_MATTER_PATH"]; await espMatterInstaller.startBootstrap(); } else { await espMatterInstaller.getRepository( - "idf.espMatterPath", + "ESP_MATTER_PATH", workspace, false ); - espMatterPath = readParameter("idf.espMatterPath", workspace); + const customExtraVars = readParameter("idf.customExtraVars", workspace); + espMatterPath = customExtraVars["ESP_MATTER_PATH"]; await espMatterInstaller.getSubmodules(espMatterPath); await espMatterInstaller.initEsp32PlatformSubmodules( espMatterPath, diff --git a/src/espMdf/espMdfDownload.ts b/src/espMdf/espMdfDownload.ts index f70863615..c5748bbac 100644 --- a/src/espMdf/espMdfDownload.ts +++ b/src/espMdf/espMdfDownload.ts @@ -30,5 +30,5 @@ export class MdfCloning extends AbstractCloning { export async function getEspMdf(workspace: Uri) { const gitPath = await readParameter("idf.gitPath", workspace) || "git"; const adfInstaller = new MdfCloning(gitPath); - await adfInstaller.getRepository("idf.espMdfPath", workspace); + await adfInstaller.getRepository("MDF_PATH", workspace); } diff --git a/src/extension.ts b/src/extension.ts index ab439d9db..442cef2ea 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -16,10 +16,6 @@ import * as path from "path"; import * as vscode from "vscode"; import { srcOp, UpdateCmakeLists } from "./cmake/srcsWatcher"; -import { - DebugAdapterManager, - IDebugAdapterConfig, -} from "./espIdf/debugAdapter/debugAdapterManager"; import { ConfserverProcess } from "./espIdf/menuconfig/confServerProcess"; import { IOpenOCDConfig, @@ -40,10 +36,7 @@ import { AppTraceTreeDataProvider } from "./espIdf/tracing/tree/appTraceTreeData import * as idfConf from "./idfConfiguration"; import { Logger } from "./logger/logger"; import { OutputChannel } from "./logger/outputChannel"; -import { - showInfoNotificationWithAction, - showInfoNotificationWithMultipleActions, -} from "./logger/utils"; +import { showInfoNotificationWithAction } from "./logger/utils"; import * as utils from "./utils"; import { PreCheck, shouldDisableMonitorReset } from "./utils"; import { @@ -78,16 +71,12 @@ import { ESPEFuseManager } from "./efuse"; import { constants, createFileSync, pathExists, readFile } from "fs-extra"; import { getEspAdf } from "./espAdf/espAdfDownload"; import { getEspMdf } from "./espMdf/espMdfDownload"; -import { SetupPanel } from "./setup/SetupPanel"; import { ChangelogViewer } from "./changelog-viewer"; import { PreReleaseNotification } from "./preReleaseNotification"; -import { getSetupInitialValues, ISetupInitArgs } from "./setup/setupInit"; import { getVirtualEnvPythonPath, installEspMatterPyReqs, - installExtensionPyReqs, } from "./pythonManager"; -import { checkExtensionSettings } from "./checkExtensionSettings"; import { CmakeListsEditorPanel } from "./cmake/cmakeEditorPanel"; import { seachInEspDocs } from "./espIdf/documentation/getSearchResults"; import { @@ -118,7 +107,6 @@ import { createNewIdfMonitor } from "./espIdf/monitor/command"; import { KconfigLangClient } from "./kconfig"; import { configureProjectWithGcov } from "./coverage/configureProject"; import { ComponentManagerUIPanel } from "./component-manager/panel"; -import { verifyAppBinary } from "./espIdf/debugAdapter/verifyApp"; import { QemuLaunchMode, QemuManager } from "./qemu/qemuManager"; import { PartitionItem, @@ -142,11 +130,6 @@ import { PeripheralBaseNode } from "./espIdf/debugAdapter/nodes/base"; import { ExtensionConfigStore } from "./common/store"; import { projectConfigurationPanel } from "./project-conf/projectConfPanel"; import { ProjectConfigStore } from "./project-conf"; -import { - clearPreviousIdfSetups, - getPreviousIdfSetups, - loadIdfSetupsFromEspIdfJson, -} from "./setup/existingIdfSetups"; import { getEspRainmaker } from "./rainmaker/download/espRainmakerDownload"; import { UnitTest } from "./espIdf/unitTest/adapter"; import { @@ -159,16 +142,11 @@ import { getFileList, getTestComponents } from "./espIdf/unitTest/utils"; import { saveDefSdkconfig } from "./espIdf/menuconfig/saveDefConfig"; import { createSBOM, installEspSBOM } from "./espBom"; import { getEspHomeKitSdk } from "./espHomekit/espHomekitDownload"; -import { getCurrentIdfSetup, selectIdfSetup } from "./versionSwitcher"; -import { checkDebugAdapterRequirements } from "./espIdf/debugAdapter/checkPyReqs"; +import { selectIdfSetup } from "./versionSwitcher"; import { CDTDebugConfigurationProvider } from "./cdtDebugAdapter/debugConfProvider"; import { CDTDebugAdapterDescriptorFactory } from "./cdtDebugAdapter/server"; import { IdfReconfigureTask } from "./espIdf/reconfigure/task"; -import { - ErrorHintProvider, - ErrorHintTreeItem, - HintHoverProvider, -} from "./espIdf/hints/index"; +import { ErrorHintProvider, HintHoverProvider } from "./espIdf/hints/index"; import { installWebsocketClient } from "./espIdf/monitor/checkWebsocketClient"; import { TroubleshootingPanel } from "./support/troubleshootPanel"; import { createCmdsStatusBarItems, statusBarItems } from "./statusBar"; @@ -177,7 +155,6 @@ import { createCommandDictionary, IDFWebCommandKeys, } from "./cmdTreeView/cmdStore"; -import { IdfSetup } from "./views/setup/types"; import { asyncRemoveEspIdfSettings } from "./uninstall"; import { clearSelectedProjectConfiguration, @@ -194,6 +171,13 @@ import { OpenOCDErrorMonitor } from "./espIdf/hints/openocdhint"; import { updateHintsStatusBarItem } from "./statusBar"; import { activateLanguageTool, deactivateLanguageTool } from "./langTools"; import { readSerialPort } from "./idfConfiguration"; +import { getIdfSetups } from "./eim/getExistingSetups"; +import { loadIdfSetup } from "./eim/loadIdfSetup"; +import { configureEnvVariables } from "./common/prepareEnv"; +import { + downloadExtractAndRunEIM, + runExistingEIM, +} from "./eim/downloadInstall"; // Global variables shared by commands let workspaceRoot: vscode.Uri; @@ -205,7 +189,6 @@ let covRenderer: CoverageRenderer; let openOCDManager: OpenOCDManager; let isOpenOCDLaunchedByDebug: boolean = false; let isDebugRestarted: boolean = false; -let debugAdapterManager: DebugAdapterManager; // QEMU let qemuManager: QemuManager; @@ -269,12 +252,11 @@ const minIdfVersionCheck = async function ( minVersion: string, workspace: vscode.Uri ) { - const espIdfPath = idfConf.readParameter( - "idf.espIdfPath", - workspace - ) as string; - const gitPath = idfConf.readParameter("idf.gitPath", workspace) || "git"; - const currentVersion = await utils.getEspIdfFromCMake(espIdfPath); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + let currentVersion = ""; + currentVersion = await utils.getEspIdfFromCMake(currentEnvVars["IDF_PATH"]); return [ () => PreCheck.espIdfVersionValidator(minVersion, currentVersion), `Selected command needs ESP-IDF v${minVersion} or higher`, @@ -356,8 +338,6 @@ export async function activate(context: vscode.ExtensionContext) { ); } } - - debugAdapterManager = DebugAdapterManager.init(context); OutputChannel.init(); const registerIDFCommand = ( name: string, @@ -423,6 +403,7 @@ export async function activate(context: vscode.ExtensionContext) { registerQemuStatusBarItem(context); if (PreCheck.isWorkspaceFolderOpen()) { + await loadIdfSetup(vscode.workspace.workspaceFolders[0].uri); await createCmdsStatusBarItems(vscode.workspace.workspaceFolders[0].uri); workspaceRoot = initSelectedWorkspace(statusBarItems["workspace"]); ESP.GlobalConfiguration.store.set( @@ -485,6 +466,7 @@ export async function activate(context: vscode.ExtensionContext) { for (const ws of e.removed) { if (workspaceRoot && ws.uri === workspaceRoot) { workspaceRoot = initSelectedWorkspace(statusBarItems["workspace"]); + await loadIdfSetup(workspaceRoot); ESP.GlobalConfiguration.store.set( ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER, workspaceRoot @@ -525,17 +507,18 @@ export async function activate(context: vscode.ExtensionContext) { ESP.ProjectConfiguration.SELECTED_CONFIG ); } - const currentIdfSetup = await getCurrentIdfSetup( - workspaceRoot, - false + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + const idfVersion = await utils.getEspIdfFromCMake( + currentEnvVars["IDF_PATH"] ); - context.subscriptions.push(projectConfigManager); if (statusBarItems["currentIdfVersion"]) { - statusBarItems["currentIdfVersion"].text = currentIdfSetup.isValid + statusBarItems["currentIdfVersion"].text = idfVersion ? `$(${ commandDictionary[CommandKeys.SelectCurrentIdfVersion] .iconId - }) ESP-IDF v${currentIdfSetup.version}` + }) ESP-IDF v${idfVersion}` : `$(${ commandDictionary[CommandKeys.SelectCurrentIdfVersion] .iconId @@ -548,6 +531,7 @@ export async function activate(context: vscode.ExtensionContext) { } if (typeof workspaceRoot === "undefined") { workspaceRoot = initSelectedWorkspace(statusBarItems["workspace"]); + await loadIdfSetup(workspaceRoot); ESP.GlobalConfiguration.store.set( ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER, workspaceRoot @@ -565,11 +549,6 @@ export async function activate(context: vscode.ExtensionContext) { ) as string; const projectName = await getProjectName(buildDirPath); const projectElfFile = `${path.join(buildDirPath, projectName)}.elf`; - const debugAdapterConfig = { - currentWorkspace: workspaceRoot, - elfFile: projectElfFile, - } as IDebugAdapterConfig; - debugAdapterManager.configureAdapter(debugAdapterConfig); const openOCDConfig: IOpenOCDConfig = { workspace: workspaceRoot, } as IOpenOCDConfig; @@ -594,7 +573,6 @@ export async function activate(context: vscode.ExtensionContext) { isOpenOCDLaunchedByDebug = false; openOCDManager.stop(); } - debugAdapterManager.stop(); }); const sdkconfigWatcher = vscode.workspace.createFileSystemWatcher( @@ -771,10 +749,10 @@ export async function activate(context: vscode.ExtensionContext) { const gitPath = (await idfConf.readParameter("idf.gitPath", workspaceRoot)) || "git"; - const idfPath = idfConf.readParameter( - "idf.espIdfPath", - workspaceRoot - ) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + let idfPath = currentEnvVars["IDF_PATH"]; const arduinoComponentManager = new ArduinoComponentInstaller( idfPath, workspaceRoot.fsPath, @@ -987,6 +965,7 @@ export async function activate(context: vscode.ExtensionContext) { ESP.GlobalConfiguration.SELECTED_WORKSPACE_FOLDER, workspaceRoot ); + await loadIdfSetup(workspaceRoot); await getIdfTargetFromSdkconfig( workspaceRoot, statusBarItems["target"] @@ -1030,20 +1009,22 @@ export async function activate(context: vscode.ExtensionContext) { ESP.ProjectConfiguration.SELECTED_CONFIG ); } - const currentIdfSetup = await getCurrentIdfSetup(workspaceRoot, false); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + + const idfVersion = await utils.getEspIdfFromCMake( + currentEnvVars["IDF_PATH"] + ); if (statusBarItems["currentIdfVersion"]) { - statusBarItems["currentIdfVersion"].text = currentIdfSetup.isValid + statusBarItems["currentIdfVersion"].text = idfVersion ? `$(${ commandDictionary[CommandKeys.SelectCurrentIdfVersion].iconId - }) ESP-IDF v${currentIdfSetup.version}` + }) ESP-IDF v${idfVersion}` : `$(${ commandDictionary[CommandKeys.SelectCurrentIdfVersion].iconId }) ESP-IDF InvalidSetup`; } - const debugAdapterConfig = { - currentWorkspace: workspaceRoot, - } as IDebugAdapterConfig; - debugAdapterManager.configureAdapter(debugAdapterConfig); const openOCDConfig: IOpenOCDConfig = { workspace: workspaceRoot, } as IOpenOCDConfig; @@ -1117,10 +1098,6 @@ export async function activate(context: vscode.ExtensionContext) { ); }); - registerIDFCommand("espIdf.clearSavedIdfSetups", async () => { - await clearPreviousIdfSetups(); - }); - registerIDFCommand("espIdf.rmProjectConfStatusBar", async () => { if (statusBarItems["projectConf"]) { statusBarItems["projectConf"].dispose(); @@ -1212,7 +1189,7 @@ export async function activate(context: vscode.ExtensionContext) { statusBarItems[statusItem] = undefined; } } - } else if (e.affectsConfiguration("idf.espIdfPath" + winFlag)) { + } else if (e.affectsConfiguration("idf.customExtraVars")) { ESP.URL.Docs.IDF_INDEX = undefined; } else if (e.affectsConfiguration("idf.port" + winFlag)) { if (statusBarItems && statusBarItems["port"]) { @@ -1275,11 +1252,6 @@ export async function activate(context: vscode.ExtensionContext) { } }); - const debugProvider = new IdfDebugConfigurationProvider(); - context.subscriptions.push( - vscode.debug.registerDebugConfigurationProvider("espidf", debugProvider) - ); - const cdtDebugProvider = new CDTDebugConfigurationProvider(); context.subscriptions.push( vscode.debug.registerDebugConfigurationProvider( @@ -1296,73 +1268,6 @@ export async function activate(context: vscode.ExtensionContext) { ) ); - vscode.debug.registerDebugAdapterDescriptorFactory("espidf", { - async createDebugAdapterDescriptor(session: vscode.DebugSession) { - try { - const portToUse = session.configuration.debugPort || DEBUG_DEFAULT_PORT; - const launchMode = session.configuration.mode || "auto"; - const useMonitorWithDebug = idfConf.readParameter( - "idf.launchMonitorOnDebugSession", - workspaceRoot - ); - if ( - session.configuration.sessionID !== "core-dump.debug.session.ws" && - useMonitorWithDebug - ) { - await createNewIdfMonitor(workspaceRoot, true); - } - if ( - launchMode === "auto" && - !openOCDManager.isRunning() && - session.configuration.sessionID !== "core-dump.debug.session.ws" - ) { - isOpenOCDLaunchedByDebug = true; - await openOCDManager.start(); - } - if (session.configuration.sessionID === "qemu.debug.session") { - const debugAdapterConfig = { - appOffset: session.configuration.appOffset, - elfFile: session.configuration.elfFilePath, - debugAdapterPort: portToUse, - tmoScaleFactor: session.configuration.tmoScaleFactor, - } as IDebugAdapterConfig; - debugAdapterManager.configureAdapter(debugAdapterConfig); - await debugAdapterManager.start(); - } - if (session.configuration.sessionID === "core-dump.debug.session.ws") { - await debugAdapterManager.start(); - } - if (launchMode === "auto" && !debugAdapterManager.isRunning()) { - const debugAdapterConfig = { - appOffset: session.configuration.appOffset, - debugAdapterPort: portToUse, - elfFile: session.configuration.elfFilePath, - env: session.configuration.env, - gdbinitFilePath: session.configuration.gdbinitFile, - initGdbCommands: session.configuration.initGdbCommands || [], - tmoScaleFactor: session.configuration.tmoScaleFactor, - isPostMortemDebugMode: false, - isOocdDisabled: false, - logLevel: session.configuration.logLevel, - } as IDebugAdapterConfig; - debugAdapterManager.configureAdapter(debugAdapterConfig); - await debugAdapterManager.start(); - } - return new vscode.DebugAdapterServer(portToUse); - } catch (error) { - const errMsg = - error && error.message - ? error.message - : "Error starting ESP-IDF Debug Adapter"; - return Logger.errorNotify( - errMsg, - error, - "extension createDebugAdapterDescriptor espidf" - ); - } - }, - }); - vscode.debug.onDidStartDebugSession(async (session) => { const svdFile = idfConf.readParameter( "idf.svdFilePath", @@ -1604,72 +1509,6 @@ export async function activate(context: vscode.ExtensionContext) { ); }); - registerIDFCommand("espIdf.installPyReqs", () => { - return PreCheck.perform([openFolderCheck], async () => { - const notificationMode = idfConf.readParameter( - "idf.notificationMode", - workspaceRoot - ) as string; - const ProgressLocation = - notificationMode === idfConf.NotificationMode.All || - notificationMode === idfConf.NotificationMode.Notifications - ? vscode.ProgressLocation.Notification - : vscode.ProgressLocation.Window; - vscode.window.withProgress( - { - cancellable: true, - location: ProgressLocation, - title: "ESP-IDF: Installing Python requirements", - }, - async ( - progress: vscode.Progress<{ message: string; increment?: number }>, - cancelToken: vscode.CancellationToken - ) => { - try { - const espIdfPath = idfConf.readParameter( - "idf.espIdfPath", - workspaceRoot - ) as string; - const containerPath = - process.platform === "win32" - ? process.env.USERPROFILE - : process.env.HOME; - const confToolsPath = idfConf.readParameter( - "idf.toolsPath", - workspaceRoot - ) as string; - const toolsPath = - confToolsPath || - process.env.IDF_TOOLS_PATH || - path.join(containerPath, ".espressif"); - const pyPath = await getVirtualEnvPythonPath(workspaceRoot); - progress.report({ - message: vscode.l10n.t( - `Installing ESP-IDF extension Python requirements...` - ), - }); - await installExtensionPyReqs( - pyPath, - espIdfPath, - toolsPath, - undefined - ); - vscode.window.showInformationMessage( - vscode.l10n.t("ESP-IDF Python Requirements has been installed") - ); - } catch (error) { - const msg = error.message - ? error.message - : typeof error === "string" - ? error - : "Error installing Python requirements"; - Logger.errorNotify(msg, error, "extension installPyReqs"); - } - } - ); - }); - }); - registerIDFCommand("espIdf.installEspMatterPyReqs", () => { if (process.platform === "win32") { return vscode.window.showInformationMessage( @@ -1697,37 +1536,19 @@ export async function activate(context: vscode.ExtensionContext) { cancelToken: vscode.CancellationToken ) => { try { - const espIdfPath = idfConf.readParameter( - "idf.espIdfPath", - workspaceRoot - ) as string; - const containerPath = - process.platform === "win32" - ? process.env.USERPROFILE - : process.env.HOME; - const confToolsPath = idfConf.readParameter( - "idf.toolsPath", - workspaceRoot - ) as string; - const toolsPath = - confToolsPath || - process.env.IDF_TOOLS_PATH || - path.join(containerPath, ".espressif"); - const espMatterPath = idfConf.readParameter( - "idf.espMatterPath", + const customExtraVars = idfConf.readParameter( + "idf.customExtraVars", workspaceRoot - ) as string; - const pyPath = await getVirtualEnvPythonPath(workspaceRoot); + ) as { [key: string]: string }; + const espMatterPath = customExtraVars["ESP_MATTER_PATH"]; progress.report({ message: vscode.l10n.t( `Installing ESP-Matter Python Requirements...` ), }); await installEspMatterPyReqs( - espIdfPath, - toolsPath, + workspaceRoot, espMatterPath, - pyPath, undefined, cancelToken ); @@ -2281,54 +2102,55 @@ export async function activate(context: vscode.ExtensionContext) { }); }); - registerIDFCommand("espIdf.setup.start", (setupArgs?: ISetupInitArgs) => { - PreCheck.perform([webIdeCheck, isNotDockerContainerCheck], async () => { - try { - if (SetupPanel.isCreatedAndHidden()) { - SetupPanel.createOrShow(context); - return; - } - const notificationMode = idfConf.readParameter( - "idf.notificationMode", - workspaceRoot - ) as string; - const ProgressLocation = - notificationMode === idfConf.NotificationMode.All || - notificationMode === idfConf.NotificationMode.Notifications - ? vscode.ProgressLocation.Notification - : vscode.ProgressLocation.Window; - await vscode.window.withProgress( - { - cancellable: false, - location: ProgressLocation, - title: vscode.l10n.t("ESP-IDF: Configure ESP-IDF extension"), - }, - async ( - progress: vscode.Progress<{ message: string; increment: number }> - ) => { - try { - setupArgs = setupArgs - ? setupArgs - : await getSetupInitialValues( - context.extensionPath, - progress, - workspaceRoot - ); - setupArgs.espIdfStatusBar = statusBarItems["currentIdfVersion"]; - SetupPanel.createOrShow(context, setupArgs); - } catch (error) { - Logger.errorNotify( - error.message, - error, - "extension setup getSetupInitialValues" - ); + registerIDFCommand("espIdf.installManager", async () => { + const notificationMode = idfConf.readParameter( + "idf.notificationMode", + workspaceRoot + ) as string; + const ProgressLocation = + notificationMode === idfConf.NotificationMode.All || + notificationMode === idfConf.NotificationMode.Notifications + ? vscode.ProgressLocation.Notification + : vscode.ProgressLocation.Window; + vscode.window.withProgress( + { + cancellable: true, + location: ProgressLocation, + title: vscode.l10n.t("ESP-IDF Install Manager"), + }, + async ( + progress: vscode.Progress<{ message: string; increment: number }>, + cancelToken: vscode.CancellationToken + ) => { + const doesEIMExecutableExist = await runExistingEIM( + progress, + cancelToken + ); + if (!doesEIMExecutableExist) { + progress.report({ + message: `EIM executable not found. Please choose a download mirror.`, + increment: 0, + }); + const mirrorToUse = await vscode.window.showQuickPick( + ["Github", "Espressif (faster in China)", "Open Releases URL"], + { + placeHolder: vscode.l10n.t("Select mirror to use"), } + ); + if (mirrorToUse === "Open Releases URL") { + vscode.env.openExternal( + vscode.Uri.parse(ESP.URL.InstallManager.Releases) + ); + return; } - ); - } catch (error) { - Logger.errorNotify(error.message, error, "extension setup"); + let useMirror = false; + if (mirrorToUse && mirrorToUse === "Espressif (faster in China)") { + useMirror = true; + } + await downloadExtractAndRunEIM(progress, cancelToken, useMirror); + } } - }); + ); }); registerIDFCommand( @@ -2375,10 +2197,7 @@ export async function activate(context: vscode.ExtensionContext) { cancelToken: vscode.CancellationToken ) => { try { - const welcomeArgs = await getWelcomePageInitialValues( - progress, - workspaceRoot - ); + const welcomeArgs = await getWelcomePageInitialValues(progress); if (!welcomeArgs) { throw new Error("Error getting welcome page initial values"); } @@ -2390,7 +2209,7 @@ export async function activate(context: vscode.ExtensionContext) { ); }); - registerIDFCommand("espIdf.newProject.start", () => { + registerIDFCommand("espIdf.newProject.start", async () => { if (NewProjectPanel.isCreatedAndHidden()) { NewProjectPanel.createOrShow(context.extensionPath); return; @@ -2404,6 +2223,21 @@ export async function activate(context: vscode.ExtensionContext) { notificationMode === idfConf.NotificationMode.Notifications ? vscode.ProgressLocation.Notification : vscode.ProgressLocation.Window; + + let idfSetups = await getIdfSetups(workspaceRoot); + const currentIdfSetup = await loadIdfSetup(workspaceRoot); + const isCurrentSetupInList = idfSetups.findIndex((idfSetup) => { + return ( + idfSetup.idfPath === currentIdfSetup.idfPath && + idfSetup.toolsPath === currentIdfSetup.toolsPath + ); + }); + if (isCurrentSetupInList === -1) { + idfSetups.push(currentIdfSetup); + } + if (idfSetups.length === 0) { + return; + } vscode.window.withProgress( { cancellable: false, @@ -2418,7 +2252,8 @@ export async function activate(context: vscode.ExtensionContext) { const newProjectArgs = await getNewProjectArgs( context.extensionPath, progress, - workspaceRoot + workspaceRoot, + idfSetups ); if (newProjectArgs) { NewProjectPanel.createOrShow(context.extensionPath, newProjectArgs); @@ -2916,7 +2751,7 @@ export async function activate(context: vscode.ExtensionContext) { { cancellable: false, location: ProgressLocation, - title: vscode.l10n.t("ESP-IDF: Preparing ESP-IDF extension report"), + title: vscode.l10n.t("ESP-IDF Doctor"), }, async ( progress: vscode.Progress<{ message: string; increment: number }> @@ -2926,7 +2761,8 @@ export async function activate(context: vscode.ExtensionContext) { await generateConfigurationReport( context, workspaceRoot, - reportedResult + reportedResult, + progress ); await vscode.window.showTextDocument( vscode.Uri.file(path.join(context.extensionPath, "report.txt")) @@ -3081,13 +2917,17 @@ export async function activate(context: vscode.ExtensionContext) { } // For Heap Trace, show the webview as before + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + let espIdfPath = currentEnvVars["IDF_PATH"]; AppTracePanel.createOrShow(context, { trace: { fileName: trace.fileName, filePath: trace.filePath, type: trace.type, workspacePath: workspaceRoot.fsPath, - idfPath: idfConf.readParameter("idf.espIdfPath", workspaceRoot), + idfPath: espIdfPath, }, }); }); @@ -3351,7 +3191,7 @@ export async function activate(context: vscode.ExtensionContext) { ); } - const pythonBinPath = await getVirtualEnvPythonPath(workspaceRoot); + const pythonBinPath = await getVirtualEnvPythonPath(); if (!utils.canAccessFile(pythonBinPath, constants.R_OK)) { Logger.errorNotify( vscode.l10n.t("Python binary path is not defined"), @@ -3359,10 +3199,10 @@ export async function activate(context: vscode.ExtensionContext) { "extension launchWSServerAndMonitor python path not set" ); } - const idfPath = idfConf.readParameter( - "idf.espIdfPath", - workspaceRoot - ) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + let idfPath = currentEnvVars["IDF_PATH"]; const idfMonitorToolPath = path.join( idfPath, "tools", @@ -3742,7 +3582,7 @@ export async function activate(context: vscode.ExtensionContext) { }, async () => { try { - const pythonBinPath = await getVirtualEnvPythonPath(workspaceRoot); + const pythonBinPath = await getVirtualEnvPythonPath(); const ninjaSummaryScript = path.join( context.extensionPath, "external", @@ -3894,7 +3734,6 @@ export async function activate(context: vscode.ExtensionContext) { Logger.warn(`Failed to handle URI Open, ${uri.toString()}`); }, }); - checkExtensionSettings(workspaceRoot, statusBarItems["currentIdfVersion"]); // WALK-THROUGH let disposable = vscode.commands.registerCommand( @@ -4483,10 +4322,10 @@ async function startFlashing( } return await jtagFlashCommand(workspaceRoot); } else { - const idfPathDir = idfConf.readParameter( - "idf.espIdfPath", - workspaceRoot - ) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + let idfPathDir = currentEnvVars["IDF_PATH"]; return await flashCommand( cancelToken, flashBaudRate, @@ -4506,30 +4345,27 @@ async function createEspIdfTerminal( initialCommand?: string, location?: vscode.TerminalLocation ): Promise { - const modifiedEnv = await utils.appendIdfAndToolsToPath(workspaceRoot); + const shellExecutableArgs = idfConf.readParameter( + "idf.customTerminalExecutableArgs", + workspaceRoot + ) as string[]; + const modifiedEnv = await configureEnvVariables(workspaceRoot); let shellArgs = []; if (process.platform === "win32") { - if ( - vscode.env.shell.indexOf("powershell") !== -1 || - vscode.env.shell.indexOf("pwsh") !== -1 - ) { - shellArgs = ["-ExecutionPolicy", "Bypass"]; - } + shellArgs = ["-ExecutionPolicy", "Bypass"]; + } else if (shellExecutableArgs && shellExecutableArgs.length) { + shellArgs = shellExecutableArgs; } let shellExecutablePath = idfConf.readParameter( "idf.customTerminalExecutable", workspaceRoot ) as string; - const shellExecutableArgs = idfConf.readParameter( - "idf.customTerminalExecutableArgs", - workspaceRoot - ) as string[]; - if (!shellExecutablePath) { - shellExecutablePath = vscode.env.shell; - } - if (shellExecutableArgs && shellExecutableArgs.length) { - shellArgs = shellExecutableArgs; - } + const shellPath = + process.platform === "win32" + ? "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe" + : shellExecutablePath + ? shellExecutablePath + : vscode.env.shell; const espIdfTerminal = vscode.window.createTerminal({ name: terminalName, @@ -4537,23 +4373,24 @@ async function createEspIdfTerminal( cwd: workspaceRoot.fsPath || modifiedEnv.IDF_PATH || process.cwd(), strictEnv: true, shellArgs, - shellPath: shellExecutablePath, + shellPath, location, }); + const currentSetup = await loadIdfSetup(workspaceRoot); + const activationScriptPathExists = await pathExists( + currentSetup.activationScript + ); + if (process.platform === "win32") { - if (shellExecutablePath.indexOf("cmd.exe") !== -1) { - espIdfTerminal.sendText( - `call "${path.join(extensionPath, "export.bat")}"` - ); - } else if ( - shellExecutablePath.indexOf("powershell") !== -1 || - shellExecutablePath.indexOf("pwsh") !== -1 - ) { - espIdfTerminal.sendText( - `& '${path.join(extensionPath, "export.ps1").replace(/'/g, "''")}'` - ); - } + const activationScriptPath = activationScriptPathExists + ? currentSetup.activationScript + : path.join(extensionPath, "export.ps1"); + espIdfTerminal.sendText(`& '${activationScriptPath.replace(/'/g, "''")}'`); + } else if (activationScriptPathExists) { + espIdfTerminal.sendText( + `. '${currentSetup.activationScript.replace(/'/g, "''")}'` + ); } if (initialCommand) { @@ -4716,69 +4553,3 @@ export function deactivate() { KconfigLangClient.stopKconfigLangServer(); deactivateLanguageTool(); } - -class IdfDebugConfigurationProvider - implements vscode.DebugConfigurationProvider { - public async resolveDebugConfiguration( - folder: vscode.WorkspaceFolder | undefined, - config: vscode.DebugConfiguration, - token?: vscode.CancellationToken - ): Promise { - try { - const buildDirPath = idfConf.readParameter( - "idf.buildPath", - workspaceRoot - ) as string; - const projectName = await getProjectName(buildDirPath); - const elfFilePath = path.join(buildDirPath, `${projectName}.elf`); - const elfFileExists = await pathExists(elfFilePath); - if (!elfFileExists) { - throw new Error( - `${elfFilePath} doesn't exist. Build this project first.` - ); - } - if (config.verifyAppBinBeforeDebug) { - const isSameAppBinary = await verifyAppBinary(workspaceRoot); - if (!isSameAppBinary) { - throw new Error( - vscode.l10n.t( - `Current app binary is different from your project. Flash first.` - ) - ); - } - } - config.elfFilePath = elfFilePath; - const debugAdapterPackagesExist = await checkDebugAdapterRequirements( - workspaceRoot - ); - if (!debugAdapterPackagesExist) { - const installDAPyPkgs = await vscode.window.showInformationMessage( - "ESP-IDF Debug Adapter Python packages are not installed", - "Install" - ); - if (installDAPyPkgs && installDAPyPkgs === "Install") { - await vscode.commands.executeCommand("espIdf.installPyReqs"); - } - return; - } - } catch (error) { - const msg = error.message - ? error.message - : "Some build files doesn't exist. Build this project first."; - Logger.error( - error.message, - error, - "extension IdfDebugConfigurationProvider" - ); - const startBuild = await vscode.window.showInformationMessage( - msg, - "Build" - ); - if (startBuild === "Build") { - await buildFlashAndMonitor(false); - return; - } - } - return config; - } -} diff --git a/src/flash/dfu.ts b/src/flash/dfu.ts index b445b5878..03fac517d 100644 --- a/src/flash/dfu.ts +++ b/src/flash/dfu.ts @@ -16,8 +16,9 @@ * limitations under the License. */ import * as vscode from "vscode"; -import { appendIdfAndToolsToPath, execChildProcess } from "../utils"; +import { execChildProcess } from "../utils"; import { OutputChannel } from "../logger/outputChannel"; +import { configureEnvVariables } from "../common/prepareEnv"; function deviceLabel(selectedDevice: string) { const regex = new RegExp(/:\d+\]/g); @@ -30,7 +31,7 @@ function deviceLabel(selectedDevice: string) { } export async function getDfuList(workspaceUri: vscode.Uri) { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceUri); + const modifiedEnv = await configureEnvVariables(workspaceUri); const dfuListStr = await execChildProcess( "dfu-util", ["--list"], diff --git a/src/flash/eraseFlashTask.ts b/src/flash/eraseFlashTask.ts index 4b3bb88e8..6588da37f 100644 --- a/src/flash/eraseFlashTask.ts +++ b/src/flash/eraseFlashTask.ts @@ -16,8 +16,6 @@ * limitations under the License. */ import { - l10n, - ProcessExecution, ProcessExecutionOptions, TaskPanelKind, TaskPresentationOptions, @@ -28,48 +26,31 @@ import { } from "vscode"; import { join } from "path"; import { constants } from "fs"; -import { - NotificationMode, - readParameter, - readSerialPort, -} from "../idfConfiguration"; -import { appendIdfAndToolsToPath, canAccessFile } from "../utils"; +import { NotificationMode, readParameter } from "../idfConfiguration"; +import { canAccessFile } from "../utils"; import { sleep } from "../utils"; import { TaskManager } from "../taskManager"; import { ESP } from "../config"; import { getVirtualEnvPythonPath } from "../pythonManager"; import { IDFMonitor } from "../espIdf/monitor"; -import { Logger } from "../logger/logger"; -import { OutputChannel } from "../logger/outputChannel"; -import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; import { OutputCapturingExecution } from "../taskManager/customExecution"; +import { configureEnvVariables } from "../common/prepareEnv"; export class EraseFlashTask { public static isErasing: boolean; private currentWorkspace: Uri; - private flashScriptPath: string; - private idfPathDir: string; - private modifiedEnv: { [key: string]: string }; private processOptions: ProcessExecutionOptions; constructor(workspaceUri: Uri) { this.currentWorkspace = workspaceUri; - this.idfPathDir = readParameter("idf.espIdfPath", workspaceUri) as string; - this.flashScriptPath = join( - this.idfPathDir, - "components", - "esptool_py", - "esptool", - "esptool.py" - ); } public erasing(flag: boolean) { EraseFlashTask.isErasing = flag; } - private verifyArgs() { - if (!canAccessFile(this.flashScriptPath, constants.R_OK)) { + private verifyArgs(flashScriptPath: string) { + if (!canAccessFile(flashScriptPath, constants.R_OK)) { throw new Error("SCRIPT_PERMISSION_ERROR"); } } @@ -79,8 +60,6 @@ export class EraseFlashTask { throw new Error("ALREADY_ERASING"); } - this.verifyArgs(); - // Stop monitor if running if (IDFMonitor.terminal) { IDFMonitor.terminal.sendText(ESP.CTRL_RBRACKET); @@ -95,7 +74,6 @@ export class EraseFlashTask { "idf.notificationMode", this.currentWorkspace ) as string; - const pythonBinPath = await getVirtualEnvPythonPath(this.currentWorkspace); const currentWorkspaceFolder = workspace.workspaceFolders.find( (w) => w.uri === this.currentWorkspace ); @@ -105,13 +83,26 @@ export class EraseFlashTask { ? TaskRevealKind.Always : TaskRevealKind.Silent; - this.modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace); + const modifiedEnv = await configureEnvVariables(this.currentWorkspace); + const flashScriptPath = join( + modifiedEnv["IDF_PATH"], + "components", + "esptool_py", + "esptool", + "esptool.py" + ); + this.verifyArgs(flashScriptPath); this.processOptions = { cwd: process.cwd(), - env: this.modifiedEnv, + env: modifiedEnv, }; - const eraseExecution = this._eraseExecution(pythonBinPath, port); + const pythonBinPath = await getVirtualEnvPythonPath(); + const eraseExecution = this._eraseExecution( + pythonBinPath, + port, + flashScriptPath + ); const erasePresentationOptions = { reveal: showTaskOutput, showReuseMessage: false, @@ -134,9 +125,13 @@ export class EraseFlashTask { return eraseExecution; } - private async _eraseExecution(pythonBinPath: string, port: string) { + private async _eraseExecution( + pythonBinPath: string, + port: string, + flashScriptPath: string + ) { this.erasing(true); - const args = [this.flashScriptPath, "-p", port, "erase_flash"]; + const args = [flashScriptPath, "-p", port, "erase_flash"]; return OutputCapturingExecution.create( pythonBinPath, args, diff --git a/src/flash/flashTask.ts b/src/flash/flashTask.ts index 1fe8f61bb..02e8e7729 100644 --- a/src/flash/flashTask.ts +++ b/src/flash/flashTask.ts @@ -21,12 +21,13 @@ import { join } from "path"; import * as vscode from "vscode"; import * as idfConf from "../idfConfiguration"; import { FlashModel } from "./flashModel"; -import { appendIdfAndToolsToPath, canAccessFile } from "../utils"; +import { canAccessFile } from "../utils"; import { TaskManager } from "../taskManager"; import { getDfuList, selectDfuDevice, selectedDFUAdapterId } from "./dfu"; import { ESP } from "../config"; import { getVirtualEnvPythonPath } from "../pythonManager"; import { OutputCapturingExecution } from "../taskManager/customExecution"; +import { configureEnvVariables } from "../common/prepareEnv"; export class FlashTask { public static isFlashing: boolean; @@ -59,10 +60,10 @@ export class FlashTask { workspaceUri ) as string; this.encryptPartitions = encryptPartitions; - this.idfPathDir = idfConf.readParameter( - "idf.espIdfPath", - this.currentWorkspace - ) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + this.idfPathDir = currentEnvVars["IDF_PATH"]; } public flashing(flag: boolean) { @@ -94,7 +95,7 @@ export class FlashTask { "idf.notificationMode", this.currentWorkspace ) as string; - const pythonBinPath = await getVirtualEnvPythonPath(this.currentWorkspace); + const pythonBinPath = await getVirtualEnvPythonPath(); const currentWorkspaceFolder = vscode.workspace.workspaceFolders.find( (w) => w.uri === this.currentWorkspace ); @@ -104,7 +105,7 @@ export class FlashTask { ? vscode.TaskRevealKind.Always : vscode.TaskRevealKind.Silent; let flashExecution: OutputCapturingExecution; - this.modifiedEnv = await appendIdfAndToolsToPath(this.currentWorkspace); + this.modifiedEnv = await configureEnvVariables(this.currentWorkspace); this.processOptions = { cwd: this.buildDirPath, env: this.modifiedEnv, diff --git a/src/idfComponentsDataProvider.ts b/src/idfComponentsDataProvider.ts index 5b074e1d6..717afb5a0 100644 --- a/src/idfComponentsDataProvider.ts +++ b/src/idfComponentsDataProvider.ts @@ -19,6 +19,7 @@ import * as idfConf from "./idfConfiguration"; import { Logger } from "./logger/logger"; import * as utils from "./utils"; import { join } from "path"; +import { ESP } from "./config"; export class IdfTreeDataProvider implements TreeDataProvider { private OnDidChangeTreeData: EventEmitter< @@ -79,10 +80,10 @@ export class IdfTreeDataProvider implements TreeDataProvider { utils.readFileSync(this.projectDescriptionJsonPath) ); - const defaultComponentsDir = idfConf.readParameter( - "idf.espIdfPath", - this.workspaceFolder - ); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + let defaultComponentsDir = currentEnvVars["IDF_PATH"]; if ( Object.prototype.hasOwnProperty.call( diff --git a/src/idfConfiguration.ts b/src/idfConfiguration.ts index 8f4da0710..5565b1484 100644 --- a/src/idfConfiguration.ts +++ b/src/idfConfiguration.ts @@ -345,6 +345,12 @@ export function resolveVariables( if (Object.keys(customExtraVars).indexOf(envVariable) !== -1) { return customExtraVars[envVariable]; } + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION); + if (Object.keys(currentEnvVars).indexOf(envVariable) !== -1) { + return currentEnvVars[envVariable]; + } if (Object.keys(process.env).indexOf(envVariable) === -1) { return ""; } diff --git a/src/idfToolsManager.ts b/src/idfToolsManager.ts index 52b46fec0..d88e7cc2d 100644 --- a/src/idfToolsManager.ts +++ b/src/idfToolsManager.ts @@ -29,13 +29,8 @@ export interface IEspIdfTool { doesToolExist: boolean; env: {}; expected: string; - hashResult: boolean; - hasFailed: boolean; - id: string; name: string; path: string; - progress: string; - progressDetail: string; } export class IdfToolsManager { @@ -383,13 +378,45 @@ export class IdfToolsManager { doesToolExist: isToolVersionCorrect, env: pkgVars, expected: expectedVersions.join(","), - hashResult: isToolVersionCorrect, - hasFailed: false, - id: pkg.name, name: pkg.name, path: pkgExportedPath, - progress: "0.00%", - progressDetail: "", + } as IEspIdfTool; + }); + return idfToolsList; + } + + public async getEIMToolsInfo( + pathToVerify: string, + onReqPkgs?: string[], + logToChannel: boolean = true + ) { + let versions: { [key: string]: string } = await this.verifyPackages( + pathToVerify, + onReqPkgs, + logToChannel + ); + const packages = await this.getPackageList(onReqPkgs); + const idfToolsList = packages.map((pkg) => { + const pkgVersionsForPlatform = pkg.versions.filter((version) => { + return ( + Object.getOwnPropertyNames(version).indexOf( + this.platformInfo.platformToUse + ) > -1 || + Object.getOwnPropertyNames(version).indexOf( + this.platformInfo.fallbackPlatform + ) > -1 + ); + }); + const expectedVersions = pkgVersionsForPlatform.map((p) => p.name); + let isToolVersionCorrect = + expectedVersions.indexOf(versions[pkg.name]) > -1 || + (versions[pkg.name] && versions[pkg.name] === "No command version"); + return { + actual: versions[pkg.name] || "", + description: pkg.description, + doesToolExist: isToolVersionCorrect, + expected: expectedVersions.join(","), + name: pkg.name, } as IEspIdfTool; }); return idfToolsList; diff --git a/src/installManager.ts b/src/installManager.ts deleted file mode 100644 index bec986dfe..000000000 --- a/src/installManager.ts +++ /dev/null @@ -1,489 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as del from "del"; -import * as fs from "fs"; -import { ensureDir, pathExists, remove } from "fs-extra"; -import * as path from "path"; -import * as tarfs from "tar-fs"; -import * as vscode from "vscode"; -import * as yauzl from "yauzl"; -import * as zlib from "zlib"; -import { IdfToolsManager } from "./idfToolsManager"; -import { IPackage } from "./IPackage"; -import { Logger } from "./logger/logger"; -import { OutputChannel } from "./logger/outputChannel"; -import { PackageError } from "./packageError"; -import { installEspIdfToolFromIdf } from "./pythonManager"; -import * as utils from "./utils"; - -export class InstallManager { - constructor(private installPath: string) {} - public getToolPackagesPath(toolPackage: string[]) { - return path.resolve(this.installPath, ...toolPackage); - } - - public async installPackages( - idfToolsManager: IdfToolsManager, - progress: vscode.Progress<{ message?: string; increment?: number }>, - pythonBinPath: string, - cancelToken?: vscode.CancellationToken, - onReqPkgs?: string[] - ): Promise { - return idfToolsManager.getPackageList(onReqPkgs).then((packages) => { - let count: number = 1; - return utils.buildPromiseChain(packages, async (pkg) => { - const versionName = idfToolsManager.getVersionToUse(pkg); - const absolutePath: string = this.getToolPackagesPath([ - "tools", - pkg.name, - versionName, - ]); - const binDir = pkg.binaries - ? path.join(absolutePath, ...pkg.binaries) - : absolutePath; - const toolPathExists = await pathExists(binDir); - if (toolPathExists) { - const binVersion = await idfToolsManager.checkBinariesVersion( - pkg, - binDir - ); - const expectedVersion = idfToolsManager.getVersionToUse(pkg); - if (binVersion === expectedVersion) { - this.appendChannel( - `Using existing ${pkg.description} in ${absolutePath}` - ); - progress.report({ - message: `Installed ${count}/${packages.length}: ${pkg.description}...`, - }); - return; - } - } - - progress.report({ - message: `Installing ${count}/${packages.length}: ${pkg.description}...`, - }); - this.appendChannel(`Installing package ${pkg.description}`); - const urlToUse = idfToolsManager.obtainUrlInfoForPlatform(pkg); - const parsedUrl = urlToUse.url.split(/\#|\?/)[0].split("."); // Get url file extension - let p: Promise; - if (parsedUrl[parsedUrl.length - 1] === "zip") { - p = this.installZipPackage( - idfToolsManager, - pkg, - absolutePath, - cancelToken - ).then(async () => { - if (pkg.strip_container_dirs) { - await this.promisedStripContainerDirs( - absolutePath, - pkg.strip_container_dirs - ); - } - }); - } else if ( - parsedUrl[parsedUrl.length - 2] === "tar" && - parsedUrl[parsedUrl.length - 1] === "gz" - ) { - p = this.installTarPackage( - idfToolsManager, - pkg, - absolutePath, - cancelToken - ).then(async () => { - if (pkg.strip_container_dirs) { - await this.promisedStripContainerDirs( - absolutePath, - pkg.strip_container_dirs - ); - } - }); - } else if ( - parsedUrl[parsedUrl.length - 2] === "tar" && - parsedUrl[parsedUrl.length - 1] === "xz" - ) { - p = this.installToolFromIdf( - idfToolsManager, - pythonBinPath, - pkg, - cancelToken - ).then(async () => { - if (pkg.strip_container_dirs) { - await this.promisedStripContainerDirs( - absolutePath, - pkg.strip_container_dirs - ); - } - }); - } else { - p = new Promise((resolve) => { - resolve(); - }); - } - count += 1; - return p; - }); - }); - } - - public async installZipFile( - zipFilePath: string, - destPath: string, - cancelToken?: vscode.CancellationToken - ) { - return new Promise(async (resolve, reject) => { - const doesZipFileExists = await pathExists(zipFilePath); - if (!doesZipFileExists) { - return reject(`File ${zipFilePath} doesn't exist.`); - } - yauzl.open(zipFilePath, { lazyEntries: true }, (error, zipfile) => { - if (error) { - return reject( - new PackageError("Zip file error", "InstallZipFile", error) - ); - } - if (cancelToken && cancelToken.isCancellationRequested) { - return reject( - new PackageError("Install cancelled by user", "InstallZipFile") - ); - } - - zipfile.on("end", () => { - return resolve(); - }); - zipfile.on("error", (err) => { - return reject( - new PackageError("Zip File error", "InstallZipFile", err) - ); - }); - - zipfile.readEntry(); - zipfile.on("entry", async (entry: yauzl.Entry) => { - const absolutePath: string = path.resolve(destPath, entry.fileName); - const dirExists = await utils.dirExistPromise(absolutePath); - if (dirExists) { - try { - await del(absolutePath, { force: true }); - } catch (err) { - this.appendChannel( - `Error deleting previous ${absolutePath}: ${err.message}` - ); - return reject( - new PackageError( - "Install folder cant be deleted", - "InstallZipFile", - err, - err.errorCode - ) - ); - } - } - if (entry.fileName.endsWith("/")) { - try { - await ensureDir(absolutePath, { mode: 0o775 }); - zipfile.readEntry(); - } catch (err) { - return reject( - new PackageError( - "Error creating directory", - "InstallZipFile", - err - ) - ); - } - } else { - const exists = await pathExists(absolutePath); - if (!exists) { - zipfile.openReadStream( - entry, - async (err, readStream: fs.ReadStream) => { - if (err) { - return reject( - new PackageError( - "Error reading zip stream", - "InstallZipFile", - err - ) - ); - } - readStream.on("error", (openErr) => { - return reject( - new PackageError( - "Error in readstream", - "InstallZipFile", - openErr - ) - ); - }); - - try { - await ensureDir(path.dirname(absolutePath), { - mode: 0o775, - }); - } catch (mkdirErr) { - return reject( - new PackageError( - "Error creating directory", - "InstallZipFile", - mkdirErr - ) - ); - } - const absoluteEntryTmpPath: string = absolutePath + ".tmp"; - const doesTmpPathExists = await pathExists( - absoluteEntryTmpPath - ); - if (doesTmpPathExists) { - try { - await remove(absoluteEntryTmpPath); - } catch (rmError) { - return reject( - new PackageError( - `Error unlinking tmp file ${absoluteEntryTmpPath}`, - "InstallZipFile", - rmError - ) - ); - } - } - const writeStream: fs.WriteStream = fs.createWriteStream( - absoluteEntryTmpPath, - { mode: 0o755 } - ); - writeStream.on("error", (writeStreamErr) => { - return reject( - new PackageError( - "Error in writeStream", - "InstallZipFile", - writeStreamErr - ) - ); - }); - writeStream.on("close", async () => { - try { - await utils.robustMove( - absoluteEntryTmpPath, - absolutePath - ); - } catch (closeWriteStreamErr) { - return reject( - new PackageError( - `Error renaming file ${absoluteEntryTmpPath}`, - "InstallZipFile", - closeWriteStreamErr - ) - ); - } - zipfile.readEntry(); - }); - readStream.pipe(writeStream); - } - ); - } else { - if (path.extname(absolutePath) !== ".txt") { - this.appendChannel( - `Warning File ${absolutePath} - already exists and was not updated.` - ); - } - zipfile.readEntry(); - } - } - }); - }); - }); - } - - public async installZipPackage( - idfToolsManager: IdfToolsManager, - pkg: IPackage, - absolutePath: string, - cancelToken?: vscode.CancellationToken - ) { - this.appendChannel(`Installing zip package ${pkg.description}`); - const urlInfo = idfToolsManager.obtainUrlInfoForPlatform(pkg); - const fileName = utils.fileNameFromUrl(urlInfo.url); - const packageFile: string = this.getToolPackagesPath(["dist", fileName]); - - const packageDownloaded = await pathExists(packageFile); - if (!packageDownloaded) { - this.appendChannel( - `${pkg.description} downloaded file is not available.` - ); - throw new PackageError( - "Error finding downloaded file", - "InstallZipPackage" - ); - } - const isValidFile = await utils.validateFileSizeAndChecksum( - packageFile, - urlInfo.sha256, - urlInfo.size - ); - if (!isValidFile) { - this.appendChannel( - `Package ${pkg.description} downloaded file is invalid.` - ); - throw new PackageError("Downloaded file invalid", "InstallZipPackage"); - } - return await this.installZipFile(packageFile, absolutePath, cancelToken); - } - - public installTarPackage( - idfToolsManager: IdfToolsManager, - pkg: IPackage, - absolutePath: string, - cancelToken?: vscode.CancellationToken - ): Promise { - return new Promise(async (resolve, reject) => { - const urlInfo = idfToolsManager.obtainUrlInfoForPlatform(pkg); - const fileName = utils.fileNameFromUrl(urlInfo.url); - const packageFile: string = this.getToolPackagesPath(["dist", fileName]); - - if (cancelToken && cancelToken.isCancellationRequested) { - return reject(new Error("Process cancelled by user")); - } - - const packageDownloaded = await pathExists(packageFile); - if (!packageDownloaded) { - this.appendChannel( - `Package ${pkg.description} downloaded file not available.` - ); - return reject( - new PackageError("Downloaded file unavailable", "InstallTarPackage") - ); - } - const isValidFile = await utils.validateFileSizeAndChecksum( - packageFile, - urlInfo.sha256, - urlInfo.size - ); - if (!isValidFile) { - this.appendChannel( - `Package ${pkg.description} downloaded file is invalid.` - ); - return reject( - new PackageError("Downloaded file invalid", "InstallTarPackage") - ); - } - const dirExists = await utils.dirExistPromise(absolutePath); - if (dirExists) { - try { - await del(absolutePath, { force: true }); - } catch (err) { - this.appendChannel( - `Error deleting ${pkg.name} old install: ${err.message}` - ); - return reject( - new PackageError( - "Install folder cant be deleted", - "installTarPackage", - err, - err.errorCode - ) - ); - } - } - const binPath = pkg.binaries - ? path.join(absolutePath, ...pkg.binaries, pkg.version_cmd[0]) - : path.join(absolutePath, pkg.version_cmd[0]); - - const binExists = await pathExists(binPath); - if (binExists) { - this.appendChannel( - `Existing ${pkg.description} found in ${this.installPath}` - ); - return resolve(); - } - this.appendChannel(`Installing tar.gz package ${pkg.description}`); - const extractor = tarfs.extract(absolutePath, { - readable: true, // all dirs and files should be readable - writable: true, // all dirs and files should be writable - }); - extractor.on("error", (err) => { - reject( - new PackageError( - "Extracting gunzipped tar error", - "InstallTarPackage", - err, - err.code - ) - ); - }); - extractor.on("finish", () => { - return resolve(); - }); - try { - fs.createReadStream(packageFile) - .pipe(zlib.createGunzip()) - .pipe(extractor); - } catch (error) { - return reject(error); - } - }); - } - - public installToolFromIdf( - idfToolsManager: IdfToolsManager, - pythonBinPath: string, - pkg: IPackage, - cancelToken?: vscode.CancellationToken - ) { - return installEspIdfToolFromIdf( - idfToolsManager.espIdfPath, - pythonBinPath, - this.installPath, - pkg.name, - cancelToken - ); - } - - private appendChannel(text: string): void { - OutputChannel.init().appendLine(text); - Logger.info(text); - } - - private async promisedStripContainerDirs(pkgDirPath: string, levels: number) { - const tmpPath = pkgDirPath + ".tmp"; - const exists = await utils.dirExistPromise(tmpPath); - if (exists) { - await del(tmpPath, { force: true }); - } - await utils.robustMove(pkgDirPath, tmpPath); - await ensureDir(pkgDirPath); - let basePath = tmpPath; - // Walk given number of levels down - for (let i = 0; i < levels; i++) { - const files = await utils.readDirPromise(basePath); - if (files.length > 1) { - throw new Error(`At level ${i} expected 1 entry, got ${files.length}`); - } - basePath = path.join(basePath, files[0]); - const isDirectory = await utils.dirExistPromise(basePath); - if (!isDirectory) { - throw new Error( - `At level ${levels[i]}, ${files[0]} is not a directory.` - ); - } - } - // Get list of directories/files to move - const filesToMove = await utils.readDirPromise(basePath); - for (let file of filesToMove) { - const moveFrom = path.join(basePath, file); - const moveTo = path.join(pkgDirPath, file); - await utils.robustMove(moveFrom, moveTo); - } - await del(tmpPath, { force: true }); - } -} diff --git a/src/logger/logger.ts b/src/logger/logger.ts index e7e7db8db..a96b85103 100644 --- a/src/logger/logger.ts +++ b/src/logger/logger.ts @@ -89,7 +89,7 @@ export class Logger { ...metadata, message: error.message, stack: error.stack, - category: category + category, }); } diff --git a/src/newProject/newProjectInit.ts b/src/newProject/newProjectInit.ts index 622c1faab..08a5bdc87 100644 --- a/src/newProject/newProjectInit.ts +++ b/src/newProject/newProjectInit.ts @@ -23,17 +23,12 @@ import { getOpenOcdScripts, IdfBoard, } from "../espIdf/openOcd/boardConfiguration"; -import { - getPreviousIdfSetups, - loadIdfSetupsFromEspIdfJson, -} from "../setup/existingIdfSetups"; -import { IdfSetup } from "../views/setup/types"; import { getTargetsFromEspIdf, IdfTarget, } from "../espIdf/setTarget/getTargets"; -import { getCurrentIdfSetup } from "../versionSwitcher"; import { join } from "path"; +import { IdfSetup } from "../eim/types"; export interface INewProjectArgs { espIdfSetup: IdfSetup; @@ -53,7 +48,8 @@ export interface INewProjectArgs { export async function getNewProjectArgs( extensionPath: string, progress: Progress<{ message: string; increment: number }>, - workspace: Uri + workspace: Uri, + idfSetups: IdfSetup[] ) { progress.report({ increment: 10, message: "Loading ESP-IDF components..." }); const components = []; @@ -76,39 +72,13 @@ export async function getNewProjectArgs( const openOcdScriptsPath = await getOpenOcdScripts(workspace); let espBoards = await getBoards(openOcdScriptsPath); progress.report({ increment: 10, message: "Loading ESP-IDF setups list..." }); - const idfSetups = await getPreviousIdfSetups(true); - const toolsPath = idfConf.readParameter("idf.toolsPath", workspace) as string; - let existingIdfSetups = await loadIdfSetupsFromEspIdfJson(toolsPath); - if (process.env.IDF_TOOLS_PATH && toolsPath !== process.env.IDF_TOOLS_PATH) { - const systemIdfSetups = await loadIdfSetupsFromEspIdfJson( - process.env.IDF_TOOLS_PATH - ); - existingIdfSetups = [...existingIdfSetups, ...systemIdfSetups]; - } - const currentIdfSetup = await getCurrentIdfSetup(workspace); - let setupsToUse = [...idfSetups, ...existingIdfSetups, currentIdfSetup]; - setupsToUse = setupsToUse.filter( - (setup, index, self) => - index === - self.findIndex( - (s) => s.idfPath === setup.idfPath && s.toolsPath === setup.toolsPath - ) - ); - if (setupsToUse.length === 0) { - await window.showInformationMessage("No ESP-IDF Setups found"); - return; - } - const onlyValidIdfSetups = [ - ...new Map( - setupsToUse.filter((i) => i.isValid).map((item) => [item.idfPath, item]) - ).values(), - ]; + const pickItems: { description: string; label: string; target: IdfSetup; }[] = []; - for (const idfSetup of onlyValidIdfSetups) { + for (const idfSetup of idfSetups) { pickItems.push({ description: `ESP-IDF v${idfSetup.version}`, label: l10n.t(`Use ESP-IDF {espIdfPath}`, { @@ -126,26 +96,15 @@ export async function getNewProjectArgs( return; } const idfSetup = espIdfPathToUse.target; - const espAdfPath = idfConf.readParameter( - "idf.espAdfPath", - workspace - ) as string; - const espMdfPath = idfConf.readParameter( - "idf.espMdfPath", - workspace - ) as string; - const espMatterPath = idfConf.readParameter( - "idf.espMatterPath", - workspace - ) as string; - const espHomeKitSdkPath = idfConf.readParameter( - "idf.espHomeKitSdkPath", - workspace - ) as string; - const espRainmakerPath = idfConf.readParameter( - "idf.espRainmakerPath", + const customExtraVars = idfConf.readParameter( + "idf.customExtraVars", workspace - ) as string; + ) as { [key: string]: string }; + const espAdfPath = customExtraVars["ADF_PATH"]; + const espMdfPath = customExtraVars["MDF_PATH"]; + const espMatterPath = customExtraVars["ESP_MATTER_PATH"]; + const espRainmakerPath = customExtraVars["RMAKER_PATH"]; + const espHomeKitSdkPath = customExtraVars["HOMEKIT_PATH"]; let templates: { [key: string]: IExampleCategory } = {}; const idfExists = await dirExistPromise(idfSetup.idfPath); if (idfExists) { diff --git a/src/newProject/newProjectPanel.ts b/src/newProject/newProjectPanel.ts index 55e5cddb9..5814b3003 100644 --- a/src/newProject/newProjectPanel.ts +++ b/src/newProject/newProjectPanel.ts @@ -22,8 +22,8 @@ import * as utils from "../utils"; import { IExample } from "../examples/Example"; import { setCurrentSettingsInTemplate } from "./utils"; import { NotificationMode, readParameter } from "../idfConfiguration"; -import { IdfSetup } from "../views/setup/types"; import { createClangdFile } from "../clang"; +import { IdfSetup } from "../eim/types"; export class NewProjectPanel { public static currentPanel: NewProjectPanel | undefined; @@ -304,8 +304,8 @@ export class NewProjectPanel { idfSetup, port, selectedIdfTarget, - openOcdConfigs, - vscode.Uri.file(newProjectPath) + vscode.Uri.file(newProjectPath), + openOcdConfigs ); await createClangdFile(vscode.Uri.file(newProjectPath)); await writeJSON(settingsJsonPath, settingsJson, { diff --git a/src/newProject/utils.ts b/src/newProject/utils.ts index 122caab6d..4835a9a96 100644 --- a/src/newProject/utils.ts +++ b/src/newProject/utils.ts @@ -15,44 +15,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -import { readParameter } from "../idfConfiguration"; import { readJSON } from "fs-extra"; -import { Uri } from "vscode"; -import { IdfSetup } from "../views/setup/types"; -import { getSystemPythonFromSettings } from "../pythonManager"; import { setClangSettings } from "../clang/index"; +import { IdfSetup } from "../eim/types"; +import { Uri } from "vscode"; export async function setCurrentSettingsInTemplate( settingsJsonPath: string, idfSetup: IdfSetup, port: string, selectedIdfTarget: string, - openOcdConfigs?: string, - workspace?: Uri + workspace: Uri, + openOcdConfigs?: string ) { const settingsJson = await readJSON(settingsJsonPath); - const adfPathDir = readParameter("idf.espAdfPath", workspace); - const mdfPathDir = readParameter("idf.espMdfPath", workspace); const isWin = process.platform === "win32" ? "Win" : ""; - if (idfSetup.idfPath) { - settingsJson["idf.espIdfPath" + isWin] = idfSetup.idfPath; - } - if (idfSetup.python) { - settingsJson["idf.pythonInstallPath"] = await getSystemPythonFromSettings( - idfSetup.python, - idfSetup.idfPath, - idfSetup.toolsPath - ); - } else { - settingsJson["idf.pythonInstallPath"] = idfSetup.sysPythonPath; - } - if (adfPathDir) { - settingsJson["idf.espAdfPath" + isWin] = adfPathDir; - } - if (mdfPathDir) { - settingsJson["idf.espMdfPath" + isWin] = mdfPathDir; - } if (openOcdConfigs) { settingsJson["idf.openOcdConfigs"] = openOcdConfigs.indexOf(",") !== -1 @@ -62,11 +39,12 @@ export async function setCurrentSettingsInTemplate( if (port.indexOf("no port") === -1) { settingsJson["idf.port" + isWin] = port; } - if (idfSetup.toolsPath) { - settingsJson["idf.toolsPath" + isWin] = idfSetup.toolsPath; + if (idfSetup.idfPath) { + settingsJson["idf.currentSetup"] = idfSetup.idfPath; } if (selectedIdfTarget) { - settingsJson["idf.customExtraVars"] = settingsJson["idf.customExtraVars"] || {}; + settingsJson["idf.customExtraVars"] = + settingsJson["idf.customExtraVars"] || {}; settingsJson["idf.customExtraVars"]["IDF_TARGET"] = selectedIdfTarget; } await setClangSettings(settingsJson, workspace); diff --git a/src/pythonManager.ts b/src/pythonManager.ts index a82efbfdc..877db1e15 100644 --- a/src/pythonManager.ts +++ b/src/pythonManager.ts @@ -13,20 +13,14 @@ // limitations under the License. import { PyReqLog } from "./PyReqLog"; -import { - CancellationToken, - ConfigurationTarget, - ExtensionContext, - Uri, -} from "vscode"; +import { CancellationToken, Uri } from "vscode"; import * as utils from "./utils"; -import { constants, pathExists } from "fs-extra"; +import { constants } from "fs-extra"; import { Logger } from "./logger/logger"; -import { delimiter, dirname, join, sep } from "path"; +import { join } from "path"; import { OutputChannel } from "./logger/outputChannel"; -import { readParameter, writeParameter } from "./idfConfiguration"; -import { ESP } from "./config"; import { EOL } from "os"; +import { ESP } from "./config"; export async function installEspIdfToolFromIdf( espDir: string, @@ -108,152 +102,17 @@ export async function getEnvVarsFromIdfTools( } } -export async function installPythonEnvFromIdfTools( - espDir: string, - idfToolsDir: string, - pyTracker: PyReqLog, - pythonBinPath: string, - gitPath: string, - context: ExtensionContext, - cancelToken?: CancellationToken, - pypiIndexUrl?: string -) { - const idfToolsPyPath = join(espDir, "tools", "idf_tools.py"); - const modifiedEnv: { [key: string]: string } = <{ [key: string]: string }>( - Object.assign({}, process.env) - ); - modifiedEnv.IDF_TOOLS_PATH = idfToolsDir; - modifiedEnv.IDF_PATH = espDir; - if (pypiIndexUrl) { - modifiedEnv.PIP_INDEX_URL = pypiIndexUrl; - } - if (process.platform === "win32") { - let pathToGitDir: string; - if (gitPath && gitPath !== "git") { - pathToGitDir = dirname(gitPath); - } - const pathNameInEnv: string = Object.keys(process.env).find( - (k) => k.toUpperCase() == "PATH" - ); - if (pathToGitDir) { - modifiedEnv[pathNameInEnv] = - pathToGitDir + delimiter + modifiedEnv[pathNameInEnv]; - } - modifiedEnv.PYTHONNOUSERSITE = "1"; - modifiedEnv[pathNameInEnv] = - dirname(pythonBinPath) + - sep + - "Lib" + - delimiter + - modifiedEnv[pathNameInEnv]; - const collection = context.environmentVariableCollection; - collection.prepend(pathNameInEnv, join(dirname(pythonBinPath), "Lib"), { - applyAtShellIntegration: true, - applyAtProcessCreation: true, - }); - } - - await execProcessWithLog( - pythonBinPath, - [idfToolsPyPath, "install-python-env"], - pyTracker, - { env: modifiedEnv, cwd: idfToolsDir, cancelToken } - ); - - const virtualEnvPython = await getPythonEnvPath( - espDir, - idfToolsDir, - pythonBinPath - ); - return virtualEnvPython; -} - -export async function installExtensionPyReqs( - virtualEnvPython: string, - espDir: string, - idfToolsDir: string, - pyTracker?: PyReqLog, - opts?: { - env: NodeJS.ProcessEnv; - cwd: string; - cancelToken?: CancellationToken; - } -) { - const reqDoesNotExists = " doesn't exist. Make sure the path is correct."; - const debugAdapterRequirements = join( - utils.extensionContext.extensionPath, - "esp_debug_adapter", - "requirements.txt" - ); - if (!utils.canAccessFile(debugAdapterRequirements, constants.R_OK)) { - Logger.warnNotify(debugAdapterRequirements + reqDoesNotExists); - OutputChannel.appendLine(debugAdapterRequirements + reqDoesNotExists); - return; - } - const fullEspIdfVersion = await utils.getEspIdfFromCMake(espDir); - const majorMinorMatches = fullEspIdfVersion.match(/([0-9]+\.[0-9]+).*/); - const espIdfVersion = - majorMinorMatches && majorMinorMatches.length > 0 - ? majorMinorMatches[1] - : "x.x"; - const constrainsFile = join( - idfToolsDir, - `espidf.constraints.v${espIdfVersion}.txt` - ); - const constrainsFileExists = await pathExists(constrainsFile); - let constraintArg = []; - if (constrainsFileExists) { - constraintArg = ["--constraint", constrainsFile]; - } else { - const extensionConstraintsFile = join( - utils.extensionContext.extensionPath, - "espidf.constraints.txt" - ); - const extensionConstraintsFileExists = await pathExists( - extensionConstraintsFile - ); - if (extensionConstraintsFileExists) { - constraintArg = ["--constraint", extensionConstraintsFile]; - } - } - const installDAPyPkgsMsg = `Installing ESP-IDF Debug Adapter python packages in ${virtualEnvPython} ...\n`; - Logger.info(installDAPyPkgsMsg + "\n"); - if (pyTracker) { - pyTracker.Log = installDAPyPkgsMsg; - } - OutputChannel.appendLine(installDAPyPkgsMsg + "\n"); - const args = [ - "-m", - "pip", - "install", - "--upgrade", - ...constraintArg, - "--no-warn-script-location", - "-r", - debugAdapterRequirements, - "--extra-index-url", - "https://dl.espressif.com/pypi", - ]; - await execProcessWithLog(virtualEnvPython, args, pyTracker, opts); -} - export async function installEspMatterPyReqs( - espDir: string, - idfToolsDir: string, + workspaceFolder: Uri, espMatterDir: string, - pythonBinPath: string, pyTracker?: PyReqLog, cancelToken?: CancellationToken ) { const modifiedEnv: { [key: string]: string } = <{ [key: string]: string }>( Object.assign({}, process.env) ); - const opts = { env: modifiedEnv, cwd: idfToolsDir, cancelToken }; - const virtualEnvPython = await getPythonEnvPath( - espDir, - idfToolsDir, - pythonBinPath - ); + const opts = { env: modifiedEnv, cwd: workspaceFolder.fsPath }; + const virtualEnvPython = await getVirtualEnvPythonPath(); const reqDoesNotExists = " doesn't exist. Make sure the path is correct."; const matterRequirements = join(espMatterDir, "requirements.txt"); @@ -299,129 +158,23 @@ export async function execProcessWithLog( } } -export async function getVirtualEnvPythonPath(workspaceFolder: Uri) { - let pythonPath = readParameter( - "idf.pythonInstallPath", - workspaceFolder - ) as string; - let espIdfDir = readParameter("idf.espIdfPath", workspaceFolder) as string; - let idfToolsDir = readParameter("idf.toolsPath", workspaceFolder) as string; - const idfPathExists = await pathExists(espIdfDir); - const idfToolsPathExists = await pathExists(idfToolsDir); - const pythonPathExists = await pathExists(pythonPath); - if (!idfPathExists || !idfToolsPathExists || !pythonPathExists) { - return; - } - const virtualEnvPython = await getPythonEnvPath( - espIdfDir, - idfToolsDir, - pythonPath - ); - return virtualEnvPython; -} - -export async function getPythonPath(workspaceFolder: Uri) { - let sysPythonBinPath = readParameter( - "idf.pythonInstallPath", - workspaceFolder - ) as string; - const doesSysPythonBinPathExist = await pathExists(sysPythonBinPath); - if (!doesSysPythonBinPathExist) { - sysPythonBinPath = await getSystemPython(workspaceFolder); - if (sysPythonBinPath) { - await writeParameter( - "idf.pythonInstallPath", - sysPythonBinPath, - workspaceFolder - ? ConfigurationTarget.WorkspaceFolder - : ConfigurationTarget.Global, - workspaceFolder - ); - } - } - return sysPythonBinPath; -} - -export async function getSystemPythonFromSettings( - pythonBinPath: string, - espIdfPath: string, - espIdfToolsPath: string -) { - const pythonBinPathExists = await pathExists(pythonBinPath); - if (pythonBinPathExists) { - const pythonCode = `import sys; print('{}'.format(sys.base_prefix))`; - const args = ["-c", pythonCode]; - const pythonVersion = ( - await utils.execChildProcess(pythonBinPath, args, __dirname) - ).replace(/(\n|\r|\r\n)/gm, ""); +export async function getVirtualEnvPythonPath() { + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); + if (currentEnvVars["IDF_PYTHON_ENV_PATH"]) { const pyDir = - process.platform === "win32" ? ["python.exe"] : ["bin", "python3"]; - const sysPythonBinPath = join(pythonVersion, ...pyDir); - return sysPythonBinPath; - } - - if (process.platform !== "win32") { - const sysPythonBinPathList = await getUnixPythonList(__dirname); - return sysPythonBinPathList.length ? sysPythonBinPathList[0] : "python3"; - } else { - const idfVersion = await utils.getEspIdfFromCMake(espIdfPath); - const pythonVersionToUse = - idfVersion >= "5.0" - ? ESP.URL.IDF_EMBED_PYTHON.VERSION - : ESP.URL.OLD_IDF_EMBED_PYTHON.VERSION; - const idfPyDestPath = join( - espIdfToolsPath, - "tools", - "idf-python", - pythonVersionToUse, - "python.exe" + process.platform === "win32" + ? ["Scripts", "python.exe"] + : ["bin", "python3"]; + const venvPythonPath = join( + currentEnvVars["IDF_PYTHON_ENV_PATH"], + ...pyDir ); - const idfPyDestExists = await pathExists(idfPyDestPath); - return idfPyDestExists ? idfPyDestPath : ""; + return venvPythonPath; } } -export async function getSystemPython(workspaceFolder: Uri) { - let pythonBinPath = readParameter( - "idf.pythonBinPath", - workspaceFolder - ) as string; - const idfPathDir = readParameter("idf.espIdfPath", workspaceFolder); - const idfToolsDir = readParameter("idf.toolsPath", workspaceFolder) as string; - return await getSystemPythonFromSettings( - pythonBinPath, - idfPathDir, - idfToolsDir - ); -} - -export async function getPythonEnvPath( - espIdfDir: string, - idfToolsDir: string, - pythonBin: string -) { - const pythonCode = `import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))`; - const args = ["-c", pythonCode]; - const pythonVersion = ( - await utils.execChildProcess(pythonBin, args, espIdfDir) - ).replace(/(\n|\r|\r\n)/gm, ""); - const fullEspIdfVersion = await utils.getEspIdfFromCMake(espIdfDir); - const majorMinorMatches = fullEspIdfVersion.match(/([0-9]+\.[0-9]+).*/); - const espIdfVersion = - majorMinorMatches && majorMinorMatches.length > 0 - ? majorMinorMatches[1] - : "x.x"; - const resultVersion = `idf${espIdfVersion}_py${pythonVersion}_env`; - const idfPyEnvPath = join(idfToolsDir, "python_env", resultVersion); - const pyDir = - process.platform === "win32" - ? ["Scripts", "python.exe"] - : ["bin", "python"]; - const fullIdfPyEnvPath = join(idfPyEnvPath, ...pyDir); - const pyEnvPathExists = await pathExists(fullIdfPyEnvPath); - return pyEnvPathExists ? fullIdfPyEnvPath : ""; -} - export async function checkPythonExists(pythonBin: string, workingDir: string) { try { const versionResult = await utils.execChildProcess( diff --git a/src/qemu/qemuManager.ts b/src/qemu/qemuManager.ts index 239c51b1f..5c512a0de 100644 --- a/src/qemu/qemuManager.ts +++ b/src/qemu/qemuManager.ts @@ -32,10 +32,11 @@ import { readParameter } from "../idfConfiguration"; import { Logger } from "../logger/logger"; import { statusBarItems } from "../statusBar"; import { CommandKeys, createCommandDictionary } from "../cmdTreeView/cmdStore"; -import { appendIdfAndToolsToPath, isBinInPath } from "../utils"; +import { isBinInPath } from "../utils"; import { IdfToolsManager } from "../idfToolsManager"; -import { getVirtualEnvPythonPath } from "../pythonManager"; +import { configureEnvVariables } from "../common/prepareEnv"; import { join } from "path"; +import { getVirtualEnvPythonPath } from "../pythonManager"; export enum QemuLaunchMode { Debug, @@ -107,16 +108,14 @@ export class QemuManager extends EventEmitter { } } - public getLaunchArguments(mode: QemuLaunchMode, workspaceFolder: Uri) { + public async getLaunchArguments(mode: QemuLaunchMode, workspaceFolder: Uri) { const buildPath = readParameter("idf.buildPath", workspaceFolder) as string; const extraArgs = readParameter( "idf.qemuExtraArgs", workspaceFolder ) as string[]; - const idfPathDir = readParameter( - "idf.espIdfPath", - workspaceFolder - ) as string; + const modifiedEnv = await configureEnvVariables(workspaceFolder); + const idfPathDir = modifiedEnv["IDF_PATH"]; const idfPy = join(idfPathDir, "tools", "idf.py"); let launchArgs = [idfPy, "-B", buildPath, "qemu"]; @@ -172,7 +171,7 @@ export class QemuManager extends EventEmitter { if (this.isRunning()) { return; } - const modifiedEnv = await appendIdfAndToolsToPath(workspaceFolder); + const modifiedEnv = await configureEnvVariables(workspaceFolder); const qemuExecutableDict = await this.getQemuExecutable( modifiedEnv.IDF_PATH ); @@ -192,7 +191,7 @@ export class QemuManager extends EventEmitter { ); } - const qemuArgs: string[] = this.getLaunchArguments(mode, workspaceFolder); + const qemuArgs: string[] = await this.getLaunchArguments(mode, workspaceFolder); if (typeof qemuArgs === "undefined" || qemuArgs.length < 1) { throw new Error("No QEMU launch arguments found."); } @@ -212,7 +211,7 @@ export class QemuManager extends EventEmitter { } }); } - const pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); + const pythonBinPath = await getVirtualEnvPythonPath(); this.qemuTerminal.sendText(`${pythonBinPath} ${qemuArgs.join(" ")}`); this.qemuTerminal.show(true); this.updateStatusText("❇️ QEMU Server (Running)"); diff --git a/src/rainmaker/download/espRainmakerDownload.ts b/src/rainmaker/download/espRainmakerDownload.ts index 522f58799..fbc7d5410 100644 --- a/src/rainmaker/download/espRainmakerDownload.ts +++ b/src/rainmaker/download/espRainmakerDownload.ts @@ -35,5 +35,5 @@ export class RainmakerCloning extends AbstractCloning { export async function getEspRainmaker(workspace?: Uri) { const gitPath = (readParameter("idf.gitPath", workspace) as string) || "git"; const rainmakerInstaller = new RainmakerCloning(gitPath); - await rainmakerInstaller.getRepository("idf.espRainmakerPath", workspace); + await rainmakerInstaller.getRepository("RMAKER_PATH", workspace); } diff --git a/src/setup/SetupPanel.ts b/src/setup/SetupPanel.ts deleted file mode 100644 index 9ffd3817f..000000000 --- a/src/setup/SetupPanel.ts +++ /dev/null @@ -1,794 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { ISetupInitArgs } from "./setupInit"; -import { - IEspIdfLink, - IEspIdfTool, - SetupMode, - StatusType, -} from "../views/setup/types"; -import { ESP } from "../config"; -import * as idfConf from "../idfConfiguration"; -import { ensureDir } from "fs-extra"; -import path from "path"; -import * as fs from "fs"; -import { - CancellationToken, - ConfigurationTarget, - Disposable, - ExtensionContext, - Progress, - ProgressLocation, - StatusBarItem, - Uri, - ViewColumn, - WebviewPanel, - commands, - l10n, - window, -} from "vscode"; -import { expressInstall } from "./espIdfDownloadStep"; -import { IdfToolsManager } from "../idfToolsManager"; -import { OutputChannel } from "../logger/outputChannel"; -import { Logger } from "../logger/logger"; -import { createPyReqs } from "./pyReqsInstallStep"; -import { downloadIdfTools } from "./toolsDownloadStep"; -import { installIdfGit, installIdfPython } from "./embedGitPy"; -import { getOpenOcdRules } from "./addOpenOcdRules"; -import { - checkSpacesInPath, - getEspIdfFromCMake, - canAccessFile, - compareVersion, -} from "../utils"; -import { useIdfSetupSettings } from "./setupValidation/espIdfSetup"; -import { clearPreviousIdfSetups } from "./existingIdfSetups"; - -export class SetupPanel { - public static currentPanel: SetupPanel | undefined; - - public static createOrShow( - context: ExtensionContext, - setupArgs?: ISetupInitArgs - ) { - const column = window.activeTextEditor - ? window.activeTextEditor.viewColumn - : ViewColumn.One; - if (SetupPanel.currentPanel) { - SetupPanel.currentPanel.panel.reveal(column); - } else { - SetupPanel.currentPanel = new SetupPanel(context, column, setupArgs); - } - } - - public static isCreatedAndHidden(): boolean { - return ( - SetupPanel.currentPanel && SetupPanel.currentPanel.panel.visible === false - ); - } - - public static postMessage(content: any) { - if (SetupPanel.currentPanel) { - SetupPanel.currentPanel.panel.webview.postMessage(content); - } - } - - private static readonly viewType = "setupPanel"; - private readonly panel: WebviewPanel; - private disposables: Disposable[] = []; - - constructor( - private context: ExtensionContext, - column: ViewColumn, - setupArgs: ISetupInitArgs - ) { - const setupPanelTitle = l10n.t("ESP-IDF Setup"); - - this.panel = window.createWebviewPanel( - SetupPanel.viewType, - setupPanelTitle, - column, - { - enableScripts: true, - retainContextWhenHidden: true, - localResourceRoots: [ - Uri.file(path.join(this.context.extensionPath, "dist", "views")), - ], - } - ); - this.panel.iconPath = Uri.file( - path.join(context.extensionPath, "media", "espressif_icon.png") - ); - - const scriptPath = this.panel.webview.asWebviewUri( - Uri.file( - path.join(context.extensionPath, "dist", "views", "setup-bundle.js") - ) - ); - this.panel.webview.html = this.createSetupHtml(scriptPath); - - const containerPath = - process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME; - const defaultEspIdfPathContainer = path.join(containerPath, "esp"); - - this.panel.webview.onDidReceiveMessage(async (message) => { - switch (message.command) { - case "checkEspIdfTools": - if (message.espIdf && message.pyPath && message.toolsPath) { - await this.checkRequiredTools( - message.espIdf, - JSON.parse(message.toolsPath), - setupArgs.onReqPkgs - ); - } - break; - case "installEspIdf": - if ( - message.espIdfContainer && - message.selectedEspIdfVersion && - message.toolsPath && - message.saveScope && - typeof message.selectedPyPath !== undefined && - typeof message.manualEspIdfPath !== undefined && - typeof message.mirror !== undefined && - typeof message.setupMode !== undefined - ) { - if ( - message.selectedEspIdfVersion && - message.selectedEspIdfVersion.filename !== "manual" && - message.espIdfContainer === defaultEspIdfPathContainer - ) { - await ensureDir(defaultEspIdfPathContainer); - } - await this.autoInstall( - message.toolsPath, - JSON.parse(message.selectedEspIdfVersion), - message.selectedPyPath, - message.manualEspIdfPath, - message.espIdfContainer, - message.mirror, - message.saveScope, - message.setupMode, - context, - setupArgs.espIdfStatusBar, - setupArgs.workspaceFolder, - setupArgs.onReqPkgs, - message.pypiIndex - ); - } - break; - case "installEspIdfTools": - if ( - message.espIdf && - message.pyPath && - message.toolsPath && - message.saveScope && - typeof message.mirror !== undefined - ) { - await this.installEspIdfTools( - message.espIdf, - message.pyPath, - message.toolsPath, - setupArgs.gitPath, - message.mirror, - message.saveScope, - setupArgs.workspaceFolder, - context, - setupArgs.espIdfStatusBar, - setupArgs.onReqPkgs, - message.pypiIndex - ); - } - break; - case "openEspIdfFolder": - const selectedFolder = await this.openFolder(); - this.panel.webview.postMessage({ - command: "updateEspIdfFolder", - selectedFolder, - }); - break; - case "openEspIdfContainerFolder": - const selectedContainerFolder = await this.openFolder(); - this.panel.webview.postMessage({ - command: "updateEspIdfContainerFolder", - selectedContainerFolder, - }); - break; - case "openEspIdfToolsFolder": - const selectedToolsFolder = await this.openFolder(); - this.panel.webview.postMessage({ - command: "updateEspIdfToolsFolder", - selectedToolsFolder, - }); - break; - case "openPythonPath": - const selectedPyPath = await this.openFile(); - this.panel.webview.postMessage({ - command: "updatePythonPath", - selectedPyPath, - }); - break; - case "requestInitialValues": - const pathSep = path.sep; - this.panel.webview.postMessage({ - command: "initialLoad", - downloadMirror: setupArgs.downloadMirror, - espIdfContainer: defaultEspIdfPathContainer, - espIdf: setupArgs.espIdfPath, - extensionVersion: setupArgs.extensionVersion, - espToolsPath: setupArgs.espToolsPath, - gitVersion: setupArgs.gitVersion, - hasPrerequisites: setupArgs.hasPrerequisites, - idfVersions: setupArgs.espIdfVersionsList, - idfTags: setupArgs.espIdfTagsList, - idfSetups: setupArgs.existingIdfSetups, - pathSep, - platform: process.platform, - pyVersionList: setupArgs.pythonVersions, - saveScope: setupArgs.saveScope, - }); - break; - case "saveCustomSettings": - if ( - message.espIdfPath && - message.toolsPath && - message.pyBinPath && - message.tools && - message.saveScope && - typeof message.mirror !== undefined - ) { - this.panel.webview.postMessage({ - command: "updateEspIdfToolsStatus", - status: StatusType.installed, - }); - await this.installPyReqs( - message.espIdfPath, - message.toolsPath, - message.pyBinPath, - setupArgs.gitPath, - message.saveScope, - context, - setupArgs.workspaceFolder, - setupArgs.espIdfStatusBar, - message.mirror, - message.pypiIndex - ); - } - break; - case "useIdfSetup": - if ( - typeof message.selectedIdfSetup !== undefined && - message.saveScope - ) { - this.panel.webview.postMessage({ - command: "updateIdfGitStatus", - status: StatusType.installed, - }); - this.panel.webview.postMessage({ - command: "updateIdfPythonStatus", - status: StatusType.installed, - }); - this.panel.webview.postMessage({ - command: "updateEspIdfStatus", - status: StatusType.installed, - }); - SetupPanel.postMessage({ - command: "setEspIdfErrorStatus", - errorMsg: `ESP-IDF is installed in ${ - setupArgs.existingIdfSetups[message.selectedIdfSetup].idfPath - }`, - }); - this.panel.webview.postMessage({ - command: "updateEspIdfToolsStatus", - status: StatusType.installed, - }); - this.panel.webview.postMessage({ - command: "updatePyVEnvStatus", - status: StatusType.started, - }); - this.panel.webview.postMessage({ - command: "goToCustomPage", - installing: true, - page: "/status", - }); - await useIdfSetupSettings( - setupArgs.existingIdfSetups[message.selectedIdfSetup], - message.saveScope, - setupArgs.workspaceFolder, - setupArgs.espIdfStatusBar - ); - this.panel.webview.postMessage({ - command: "setIsInstalled", - isInstalled: true, - }); - await this.getOpenOcdRulesPath(); - } - break; - case "cleanIdfSetups": - await clearPreviousIdfSetups(); - break; - case "newProject": - await commands.executeCommand("espIdf.newProject.start"); - break; - case "importProject": - await commands.executeCommand("espIdf.importProject"); - break; - case "exploreComponents": - await commands.executeCommand("esp.component-manager.ui.show"); - break; - case "canAccessFile": - if (!message.path) { - break; - } - - const pathIdfPy = path.join(message.path, "tools", "idf.py"); - // Only require read and execute permissions - const fileExists = await canAccessFile( - pathIdfPy, - fs.constants.R_OK | fs.constants.X_OK - ); - if (!fileExists) { - this.panel.webview.postMessage({ - command: "canAccessFileResponse", - path: pathIdfPy, - exists: fileExists, - }); - break; - } - - let versionEspIdf: string; - if ( - message.currentVersion && - typeof message.currentVersion === "string" - ) { - versionEspIdf = message.currentVersion; - } else { - versionEspIdf = await getEspIdfFromCMake(message.path); - } - // compareVersion returns a negative value if versionEspIdf is less than "5.0" - const noWhiteSpaceSupport = compareVersion(versionEspIdf, "5.0") < 0; - const hasWhitespace = /\s/.test(message.path); - this.panel.webview.postMessage({ - command: "canAccessFileResponse", - path: pathIdfPy, - exists: fileExists, - noWhiteSpaceSupport, - hasWhitespace, - }); - break; - - default: - break; - } - }); - - this.panel.onDidDispose(() => this.dispose(), null, this.disposables); - } - - setupErrHandler(error: Error) { - const errMsg = - error && error.message ? error.message : "Error during ESP-IDF setup"; - if ( - errMsg.indexOf("ERROR_EXISTING_ESP_IDF") !== -1 || - errMsg.indexOf("IDF_PATH_WITH_SPACES") !== -1 || - errMsg.indexOf("IDF_TOOLS_PATH_WITH_SPACES") !== -1 || - errMsg.indexOf("ERROR_SAME_IDF_PATH_AND__IDF_TOOLS_PATH") !== -1 - ) { - SetupPanel.postMessage({ - command: "setEspIdfErrorStatus", - errorMsg: error.message, - }); - } else if ( - errMsg.indexOf("ERROR_INVALID_PYTHON") !== -1 || - errMsg.indexOf("ERROR_INVALID_PIP") !== -1 || - errMsg.indexOf("ERROR_INVALID_VENV") !== -1 || - errMsg.indexOf("PYTHON_BIN_PATH_WITH_SPACES") !== -1 - ) { - SetupPanel.postMessage({ - command: "setPyExecErrorStatus", - errorMsg: error.message, - }); - } else { - SetupPanel.postMessage({ - command: "setEspIdfErrorStatus", - errorMsg: "", - }); - } - OutputChannel.appendLine(errMsg); - Logger.errorNotify(errMsg, error, "SetupPanel error handler"); - OutputChannel.show(); - SetupPanel.postMessage({ - command: "goToCustomPage", - installing: false, - page: "/autoinstall", - }); - } - - private async autoInstall( - toolsPath: string, - selectedIdfVersion: IEspIdfLink, - pyPath: string, - espIdfPath: string, - idfContainerPath: string, - mirror: ESP.IdfMirror, - saveScope: ConfigurationTarget, - setupMode: SetupMode, - context: ExtensionContext, - espIdfStatusBar: StatusBarItem, - workspaceFolderUri: Uri, - onReqPkgs?: string[], - pypiIndex?: string - ) { - const notificationMode = idfConf.readParameter( - "idf.notificationMode" - ) as string; - const progressLocation = - notificationMode === idfConf.NotificationMode.All || - notificationMode === idfConf.NotificationMode.Notifications - ? ProgressLocation.Notification - : ProgressLocation.Window; - return await window.withProgress( - { - location: progressLocation, - title: "ESP-IDF Setup:", - cancellable: true, - }, - async ( - progress: Progress<{ message: string; increment?: number }>, - cancelToken: CancellationToken - ) => { - try { - SetupPanel.postMessage({ - command: "goToCustomPage", - installing: true, - page: "/status", - }); - let idfPythonPath = pyPath, - idfGitPath = "git"; - if (process.platform === "win32") { - let idfVersion = ""; - if (selectedIdfVersion.filename === "manual") { - idfVersion = await getEspIdfFromCMake(espIdfPath); - } else if (selectedIdfVersion.filename === "master") { - idfVersion = "5.1"; - } else { - const matches = selectedIdfVersion.name - .split(" ")[0] - .match(/v(.+)/); - if (matches && matches.length) { - idfVersion = matches[1]; - } else { - idfVersion = "5.0"; - } - } - const embedPaths = await this.installEmbedPyGit( - toolsPath, - idfVersion, - mirror, - progress, - cancelToken - ); - idfGitPath = embedPaths.idfGitPath; - idfPythonPath = embedPaths.idfPythonPath; - } - const idfPathToCheck = - selectedIdfVersion.filename === "manual" - ? espIdfPath - : idfContainerPath; - this.checkSpacesInPaths(toolsPath); - if (idfPathToCheck === toolsPath) { - const idfPathSameIdfToolsPathMsg = `IDF_PATH and IDF_TOOLS_PATH can't be the same. Please use another location. (ERROR_SAME_IDF_PATH_AND__IDF_TOOLS_PATH)`; - throw new Error(idfPathSameIdfToolsPathMsg); - } - await expressInstall( - selectedIdfVersion, - idfPythonPath, - espIdfPath, - idfContainerPath, - toolsPath, - mirror, - saveScope, - setupMode, - context, - espIdfStatusBar, - workspaceFolderUri, - idfGitPath, - progress, - cancelToken, - onReqPkgs, - pypiIndex - ); - } catch (error) { - this.setupErrHandler(error); - } - } - ); - } - - private async checkRequiredTools( - idfPath: string, - toolsInfo: IEspIdfTool[], - onReqPkgs?: string[] - ) { - const toolsManager = await IdfToolsManager.createIdfToolsManager(idfPath); - const pathToVerify = toolsInfo - .reduce((prev, curr, i) => { - return prev + path.delimiter + curr.path; - }, "") - .slice(1); - - const foundVersions = await toolsManager.verifyPackages( - pathToVerify, - onReqPkgs - ); - const updatedToolsInfo = toolsInfo.map((tool) => { - const isToolVersionCorrect = - tool.expected.indexOf(foundVersions[tool.name]) > -1 || - (foundVersions[tool.name] && - foundVersions[tool.name] === "No command version"); - tool.doesToolExist = isToolVersionCorrect; - if (isToolVersionCorrect) { - tool.progress = "100.00%"; - tool.hashResult = true; - } else { - tool.progress = "0.00%"; - tool.hashResult = false; - } - return tool; - }); - this.panel.webview.postMessage({ - command: "setRequiredToolsInfo", - toolsInfo: updatedToolsInfo, - }); - } - - private async installEspIdfTools( - idfPath: string, - pyPath: string, - toolsPath: string, - gitPath: string, - mirror: ESP.IdfMirror, - saveScope: ConfigurationTarget, - workspaceFolderUri: Uri, - context: ExtensionContext, - espIdfStatusBar: StatusBarItem, - onReqPkgs?: string[], - pypiIndex?: string - ) { - const notificationMode = idfConf.readParameter( - "idf.notificationMode" - ) as string; - const progressLocation = - notificationMode === idfConf.NotificationMode.All || - notificationMode === idfConf.NotificationMode.Notifications - ? ProgressLocation.Notification - : ProgressLocation.Window; - return await window.withProgress( - { - location: progressLocation, - title: "ESP-IDF Tools Setup:", - cancellable: true, - }, - async ( - progress: Progress<{ message: string; increment?: number }>, - cancelToken: CancellationToken - ) => { - try { - SetupPanel.postMessage({ - command: "goToCustomPage", - installing: true, - page: "/status", - }); - let idfPythonPath = pyPath, - idfGitPath = gitPath || "/usr/bin/git"; - if (process.platform === "win32") { - const idfVersion = await getEspIdfFromCMake(idfPath); - const embedPaths = await this.installEmbedPyGit( - toolsPath, - idfVersion, - mirror, - progress, - cancelToken - ); - idfGitPath = embedPaths.idfGitPath; - idfPythonPath = embedPaths.idfPythonPath; - } - this.checkSpacesInPaths(toolsPath); - await downloadIdfTools( - idfPath, - toolsPath, - idfPythonPath, - idfGitPath, - mirror, - saveScope, - workspaceFolderUri, - context, - espIdfStatusBar, - progress, - cancelToken, - onReqPkgs, - pypiIndex - ); - } catch (error) { - this.setupErrHandler(error); - } - } - ); - } - - private async installPyReqs( - idfPath: string, - toolsPath: string, - pyPath: string, - gitPath: string, - saveScope: ConfigurationTarget, - context: ExtensionContext, - workspaceFolderUri: Uri, - espIdfStatusBar: StatusBarItem, - mirror: ESP.IdfMirror, - pypiIndex?: string - ) { - const notificationMode = idfConf.readParameter( - "idf.notificationMode" - ) as string; - const progressLocation = - notificationMode === idfConf.NotificationMode.All || - notificationMode === idfConf.NotificationMode.Notifications - ? ProgressLocation.Notification - : ProgressLocation.Window; - return await window.withProgress( - { - location: progressLocation, - title: "ESP-IDF Python Requirements:", - cancellable: true, - }, - async ( - progress: Progress<{ message: string; increment?: number }>, - cancelToken: CancellationToken - ) => { - try { - SetupPanel.postMessage({ - command: "goToCustomPage", - installing: true, - page: "/status", - }); - await createPyReqs( - idfPath, - toolsPath, - pyPath, - gitPath, - saveScope, - context, - progress, - cancelToken, - workspaceFolderUri, - espIdfStatusBar, - pypiIndex - ); - } catch (error) { - this.setupErrHandler(error); - } - } - ); - } - - private async installEmbedPyGit( - toolsPath: string, - idfVersion: string, - mirror: ESP.IdfMirror, - progress: Progress<{ message: string; increment?: number }>, - cancelToken: CancellationToken - ) { - const idfGitPath = await installIdfGit( - toolsPath, - mirror, - progress, - cancelToken - ); - SetupPanel.postMessage({ - command: "updateIdfGitStatus", - status: StatusType.installed, - }); - const idfPythonPath = await installIdfPython( - toolsPath, - idfVersion, - mirror, - progress, - cancelToken - ); - SetupPanel.postMessage({ - command: "updateIdfPythonStatus", - status: StatusType.installed, - }); - await idfConf.writeParameter( - "idf.pythonInstallPath", - idfPythonPath, - ConfigurationTarget.Global - ); - await idfConf.writeParameter( - "idf.gitPath", - idfGitPath, - ConfigurationTarget.Global - ); - return { idfPythonPath, idfGitPath }; - } - - private async getOpenOcdRulesPath() { - try { - await getOpenOcdRules(Uri.file(this.context.extensionPath)); - } catch (error) { - this.setupErrHandler(error); - } - } - - private checkSpacesInPaths(idfToolsPath: string) { - const doesIdfToolsPathHasSpaces = checkSpacesInPath(idfToolsPath); - let pathHasSpaces = ""; - if (doesIdfToolsPathHasSpaces) { - pathHasSpaces = `${idfToolsPath} has spaces. Use another location. (IDF_TOOLS_PATH_WITH_SPACES)`; - } - if (pathHasSpaces) { - OutputChannel.appendLine(pathHasSpaces); - Logger.infoNotify(pathHasSpaces); - throw new Error(pathHasSpaces); - } - } - - private async openFolder() { - const selectedFolder = await window.showOpenDialog({ - canSelectFolders: true, - canSelectFiles: false, - canSelectMany: false, - }); - if (selectedFolder && selectedFolder.length > 0) { - return selectedFolder[0].fsPath; - } else { - window.showInformationMessage("No folder selected"); - } - } - - private async openFile() { - const selectedFolder = await window.showOpenDialog({ - canSelectFolders: false, - canSelectFiles: true, - canSelectMany: false, - }); - if (selectedFolder && selectedFolder.length > 0) { - return selectedFolder[0].fsPath; - } else { - window.showInformationMessage("No folder selected"); - } - } - - private createSetupHtml(scriptPath: Uri): string { - return ` - - - - - ESP-IDF Setup - - -
- - - `; - } - - public dispose() { - SetupPanel.currentPanel = undefined; - this.panel.dispose(); - } -} diff --git a/src/setup/addOpenOcdRules.ts b/src/setup/addOpenOcdRules.ts deleted file mode 100644 index 7539ca4dd..000000000 --- a/src/setup/addOpenOcdRules.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Thursday, 15th July 2021 4:20:36 pm - * Copyright 2021 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { pathExists } from "fs-extra"; -import { dirname, resolve } from "path"; -import { Uri } from "vscode"; -import { appendIdfAndToolsToPath } from "../utils"; -import { SetupPanel } from "./SetupPanel"; - -export async function getOpenOcdRules(workspace: Uri) { - if (process.platform !== "linux") { - return; - } - const modifiedEnv = await appendIdfAndToolsToPath(workspace); - if (!modifiedEnv.OPENOCD_SCRIPTS) { - throw new Error("OPENOCD_SCRIPTS environment variables is not defined"); - } - const openOCDRulesPath = resolve( - dirname(modifiedEnv.OPENOCD_SCRIPTS), - "contrib", - "60-openocd.rules", - ); - const doesRulesPathExists = await pathExists(openOCDRulesPath); - if (!doesRulesPathExists) { - throw new Error(`${openOCDRulesPath} doesn't exists.`); - - } - SetupPanel.postMessage({ - command: "setOpenOcdRulesPath", - openOCDRulesPath, - }); -} diff --git a/src/setup/embedGitPy.ts b/src/setup/embedGitPy.ts deleted file mode 100644 index ccb87f1bf..000000000 --- a/src/setup/embedGitPy.ts +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Monday, 24th May 2021 7:49:15 pm - * Copyright 2021 Espressif Systems (Shanghai) CO LTD - *  - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *  - * http://www.apache.org/licenses/LICENSE-2.0 - *  - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { DownloadManager } from "../downloadManager"; -import { CancellationToken, Progress } from "vscode"; -import { PackageProgress } from "../PackageProgress"; -import { InstallManager } from "../installManager"; -import { basename, join } from "path"; -import { - sendIdfGitDownloadDetail, - sendIdfGitDownloadProgress, - sendIdfPythonDownloadDetail, - sendIdfPythonDownloadProgress, -} from "./webviewMsgMethods"; -import { OutputChannel } from "../logger/outputChannel"; -import { pathExists } from "fs-extra"; -import { checkGitExists, spawn } from "../utils"; -import { checkPythonExists } from "../pythonManager"; -import { ESP } from "../config"; -import { Logger } from "../logger/logger"; - -export async function installIdfGit( - idfToolsDir: string, - mirror: ESP.IdfMirror, - progress?: Progress<{ message: string; increment?: number }>, - cancelToken?: CancellationToken -) { - const downloadManager = new DownloadManager(idfToolsDir); - const installManager = new InstallManager(idfToolsDir); - let gitURLToUse = - mirror === ESP.IdfMirror.Github - ? ESP.URL.IDF_EMBED_GIT.GITHUB_EMBED_GIT_URL - : ESP.URL.IDF_EMBED_GIT.IDF_EMBED_GIT_URL; - const gitSize: number = - mirror === ESP.IdfMirror.Github - ? ESP.URL.IDF_EMBED_GIT.GITHUB_EMBED_GIT_SIZE - : ESP.URL.IDF_EMBED_GIT.IDF_EMBED_GIT_SIZE; - const idfGitZipPath = join(idfToolsDir, "dist", basename(gitURLToUse)); - const idfGitDestPath = join( - idfToolsDir, - "tools", - "idf-git", - ESP.URL.IDF_EMBED_GIT.VERSION - ); - const resultGitPath = join(idfGitDestPath, "cmd", "git.exe"); - const pkgProgress = new PackageProgress( - basename(gitURLToUse), - sendIdfGitDownloadProgress, - null, - sendIdfGitDownloadDetail, - null - ); - - const gitPathExists = await pathExists(idfGitDestPath); - if (gitPathExists) { - const gitDirectory = join(idfGitDestPath, "cmd"); - const binVersion = await checkGitExists(gitDirectory, resultGitPath); - if (!binVersion || binVersion === "Not found") { - const msg = `Using existing ${idfGitDestPath}`; - OutputChannel.appendLine(msg); - Logger.info(msg); - return resultGitPath; - } - } - - const msgDownload = `Downloading ${idfGitZipPath}...`; - progress.report({ message: msgDownload }); - OutputChannel.appendLine(msgDownload); - Logger.info(msgDownload); - await downloadManager.downloadWithResume( - gitURLToUse, - join(idfToolsDir, "dist"), - pkgProgress, - cancelToken, - gitSize - ); - - const doesZipfileExist = await pathExists(idfGitZipPath); - if (!doesZipfileExist) { - throw new Error(`${idfGitZipPath} was not downloaded.`); - } - const installingMsg = `Installing ${idfGitDestPath} ...`; - progress.report({ message: installingMsg }); - OutputChannel.appendLine(installingMsg); - Logger.info(installingMsg); - await installManager.installZipFile( - idfGitZipPath, - idfGitDestPath, - cancelToken - ); - const extractedMsg = `Extracted ${idfGitDestPath} ...`; - progress.report({ message: extractedMsg }); - OutputChannel.appendLine(extractedMsg); - Logger.info(extractedMsg); - return resultGitPath; -} - -export async function installIdfPython( - idfToolsDir: string, - idfVersion: string, - mirror: ESP.IdfMirror, - progress?: Progress<{ message: string; increment?: number }>, - cancelToken?: CancellationToken -) { - const downloadManager = new DownloadManager(idfToolsDir); - const installManager = new InstallManager(idfToolsDir); - let pythonURLToUse: string; - let pythonSize: number; - if (idfVersion >= "5.0") { - pythonURLToUse = - mirror === ESP.IdfMirror.Github - ? ESP.URL.IDF_EMBED_PYTHON.GITHUB_EMBED_PYTHON_URL - : ESP.URL.IDF_EMBED_PYTHON.IDF_EMBED_PYTHON_URL; - pythonSize = - mirror === ESP.IdfMirror.Github - ? ESP.URL.IDF_EMBED_PYTHON.GITHUB_EMBED_PYTHON_SIZE - : ESP.URL.IDF_EMBED_PYTHON.IDF_EMBED_PYTHON_SIZE; - } else { - pythonURLToUse = - mirror === ESP.IdfMirror.Github - ? ESP.URL.OLD_IDF_EMBED_PYTHON.GITHUB_EMBED_PYTHON_URL - : ESP.URL.OLD_IDF_EMBED_PYTHON.IDF_EMBED_PYTHON_URL; - pythonSize = - mirror === ESP.IdfMirror.Github - ? ESP.URL.OLD_IDF_EMBED_PYTHON.GITHUB_EMBED_PYTHON_SIZE - : ESP.URL.OLD_IDF_EMBED_PYTHON.IDF_EMBED_PYTHON_SIZE; - } - const idfPyZipPath = join(idfToolsDir, "dist", basename(pythonURLToUse)); - const pkgProgress = new PackageProgress( - basename(pythonURLToUse), - sendIdfPythonDownloadProgress, - null, - sendIdfPythonDownloadDetail, - null - ); - const pythonVersionToUse = - idfVersion >= "5.0" - ? ESP.URL.IDF_EMBED_PYTHON.VERSION - : ESP.URL.OLD_IDF_EMBED_PYTHON.VERSION; - const idfPyDestPath = join( - idfToolsDir, - "tools", - "idf-python", - pythonVersionToUse - ); - const pyPathExists = await pathExists(idfPyDestPath); - if (pyPathExists) { - const binVersion = await checkPythonExists( - join(idfPyDestPath, "python.exe"), - idfPyDestPath - ); - if (binVersion) { - const usingExistingDestMsg = `Using existing ${idfPyDestPath}`; - OutputChannel.appendLine(usingExistingDestMsg); - Logger.info(usingExistingDestMsg); - return join(idfPyDestPath, "python.exe"); - } - } - progress.report({ message: `Downloading ${idfPyZipPath}...` }); - await downloadManager.downloadWithResume( - pythonURLToUse, - join(idfToolsDir, "dist"), - pkgProgress, - cancelToken, - pythonSize - ); - const doesZipfileExist = await pathExists(idfPyZipPath); - if (!doesZipfileExist) { - throw new Error(`${idfPyZipPath} was not downloaded.`); - } - progress.report({ message: `Installing ${idfPyDestPath}...` }); - await installManager.installZipFile(idfPyZipPath, idfPyDestPath, cancelToken); - const extractePyDestMsg = `Extracted ${idfPyDestPath} ...`; - progress.report({ message: extractePyDestMsg }); - OutputChannel.appendLine(extractePyDestMsg); - if (idfVersion >= "5.0") { - await spawn( - join(idfPyDestPath, "python.exe"), - ["-m", "ensurepip", "--upgrade"], - { cwd: idfPyDestPath } - ); - } else { - await spawn( - join(idfPyDestPath, "python.exe"), - ["-m", "pip", "install", "virtualenv"], - { cwd: idfPyDestPath } - ); - } - - return join(idfPyDestPath, "python.exe"); -} diff --git a/src/setup/espIdfDownload.ts b/src/setup/espIdfDownload.ts deleted file mode 100644 index f3d651204..000000000 --- a/src/setup/espIdfDownload.ts +++ /dev/null @@ -1,163 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as utils from "../utils"; -import { Logger } from "../logger/logger"; -import { ESP } from "../config"; -import { OutputChannel } from "../logger/outputChannel"; -import { DownloadManager } from "../downloadManager"; -import { InstallManager } from "../installManager"; -import { PackageProgress } from "../PackageProgress"; -import { IEspIdfLink } from "../views/setup/types"; -import { - sendEspIdfDownloadDetail, - sendEspIdfDownloadProgress, - sendDownloadedZip, - sendExtractedZip, -} from "./webviewMsgMethods"; -import { ensureDir, pathExists } from "fs-extra"; -import { AbstractCloning } from "../common/abstractCloning"; -import { CancellationToken, Disposable, Progress } from "vscode"; -import { dirname, join } from "path"; - -export class EspIdfCloning extends AbstractCloning { - constructor(branchName: string, gitBinPath: string = "git") { - super( - "https://github.com/espressif/esp-idf.git", - "ESP-IDF", - branchName, - gitBinPath, - "https://gitee.com/EspressifSystems/esp-idf.git" - ); - } -} - - - -export async function downloadInstallIdfVersion( - idfVersion: IEspIdfLink, - destPath: string, - mirror: ESP.IdfMirror, - gitPath?: string, - progress?: Progress<{ message: string; increment?: number }>, - cancelToken?: CancellationToken -) { - const downloadedZipPath = join(destPath, idfVersion.filename); - const extractedDirectory = downloadedZipPath.replace(".zip", ""); - const expectedDirectory = join( - destPath, - idfVersion.version.replace("release/", ""), - "esp-idf" - ); - await ensureDir(destPath); - const expectedDirExists = await utils.dirExistPromise(expectedDirectory); - if (expectedDirExists) { - const espExistsMsg = `${expectedDirectory} already exists. Delete it or use another location. (ERROR_EXISTING_ESP_IDF)`; - OutputChannel.appendLine(espExistsMsg); - Logger.infoNotify(espExistsMsg); - throw new Error(espExistsMsg); - } - const downloadManager = new DownloadManager(destPath); - const installManager = new InstallManager(destPath); - const pkgProgress = new PackageProgress( - idfVersion.name, - sendEspIdfDownloadProgress, - null, - sendEspIdfDownloadDetail, - null - ); - pkgProgress.Progress = `0.00%`; - - if ( - idfVersion.version === "master" || - idfVersion.version.startsWith("release") - || idfVersion.version.endsWith("-dev") - ) { - const downloadByCloneMsg = `Downloading ESP-IDF ${idfVersion.version} using git clone...\n`; - OutputChannel.appendLine(downloadByCloneMsg); - Logger.info(downloadByCloneMsg); - if (progress) { - progress.report({ message: downloadByCloneMsg }); - } - const espIdfCloning = new EspIdfCloning(idfVersion.version, gitPath); - let cancelDisposable: Disposable; - if (cancelToken) { - cancelDisposable = cancelToken.onCancellationRequested(() => { - espIdfCloning.cancel(); - }); - } - - await ensureDir(dirname(expectedDirectory)); - await espIdfCloning.downloadByCloning( - dirname(expectedDirectory), - pkgProgress, - progress, - mirror !== ESP.IdfMirror.Espressif, - mirror - ); - if (mirror === ESP.IdfMirror.Espressif) { - await espIdfCloning.updateSubmodules( - expectedDirectory, - pkgProgress, - progress - ); - } - cancelDisposable.dispose(); - } else { - const downloadByHttpMsg = `Downloading ESP-IDF ${idfVersion.name}...`; - OutputChannel.appendLine(downloadByHttpMsg); - Logger.info(downloadByHttpMsg); - if (progress) { - progress.report({ message: downloadByHttpMsg }); - } - const urlToUse = - mirror === ESP.IdfMirror.Github ? idfVersion.url : idfVersion.mirror; - - OutputChannel.appendLine( - `Using mirror ${ - mirror == ESP.IdfMirror.Espressif ? "Espressif" : "Github" - } with URL ${urlToUse}` - ); - await downloadManager.downloadWithResume( - urlToUse, - destPath, - pkgProgress, - cancelToken - ); - const doesZipfileExist = await pathExists(downloadedZipPath); - if (!doesZipfileExist) { - throw new Error(`${downloadedZipPath} was not downloaded.`); - } - const downloadedMsg = `Downloaded ${idfVersion.name}. Extracting...\n`; - OutputChannel.appendLine(downloadedMsg); - Logger.info(downloadedMsg); - sendDownloadedZip(downloadedZipPath); - await installManager.installZipFile( - downloadedZipPath, - destPath, - cancelToken - ); - const extractedMsg = `Extracted ${downloadedZipPath} in ${destPath}.\n`; - OutputChannel.appendLine(extractedMsg); - Logger.info(extractedMsg); - await utils.robustMove(extractedDirectory, expectedDirectory); - sendExtractedZip(expectedDirectory); - - if (gitPath) { - await utils.fixFileModeGitRepository(expectedDirectory, gitPath); - await utils.cleanDirtyGitRepository(expectedDirectory, gitPath); - } - } - return expectedDirectory; -} diff --git a/src/setup/espIdfDownloadStep.ts b/src/setup/espIdfDownloadStep.ts deleted file mode 100644 index f449b7851..000000000 --- a/src/setup/espIdfDownloadStep.ts +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { pathExists } from "fs-extra"; -import * as vscode from "vscode"; -import { ESP } from "../config"; -import { checkPythonExists } from "../pythonManager"; -import { SetupPanel } from "./SetupPanel"; -import * as utils from "../utils"; -import { IEspIdfLink, SetupMode, StatusType } from "../views/setup/types"; -import { downloadInstallIdfVersion } from "./espIdfDownload"; -import { Logger } from "../logger/logger"; -import { downloadIdfTools } from "./toolsDownloadStep"; -import { join } from "path"; -import { IdfToolsManager } from "../idfToolsManager"; - -export async function expressInstall( - selectedIdfVersion: IEspIdfLink, - pyPath: string, - espIdfPath: string, - idfContainerPath: string, - toolsPath: string, - mirror: ESP.IdfMirror, - saveScope: vscode.ConfigurationTarget, - setupMode: SetupMode, - context: vscode.ExtensionContext, - espIdfStatusBar: vscode.StatusBarItem, - workspaceFolderUri: vscode.Uri, - gitPath?: string, - progress?: vscode.Progress<{ message: string; increment?: number }>, - cancelToken?: vscode.CancellationToken, - onReqPkgs?: string[], - pypiIndexUrl?: string -) { - const pyExists = pyPath === "python" ? true : await pathExists(pyPath); - const doesPythonExists = await checkPythonExists(pyPath, __dirname); - if (!(pyExists && doesPythonExists)) { - const containerNotFoundMsg = `${pyPath} is not valid. (ERROR_INVALID_PYTHON)`; - Logger.infoNotify(containerNotFoundMsg); - throw new Error(containerNotFoundMsg); - } - let idfPath: string; - if (selectedIdfVersion.filename === "manual") { - idfPath = espIdfPath; - } else { - idfPath = await downloadInstallIdfVersion( - selectedIdfVersion, - idfContainerPath, - mirror, - gitPath, - progress, - cancelToken - ); - } - const idfVersion = await utils.getEspIdfFromCMake(idfPath); - if (idfVersion === "x.x") { - throw new Error("Invalid ESP-IDF"); - } - SetupPanel.postMessage({ - command: "updateEspIdfFolder", - selectedFolder: idfPath, - }); - SetupPanel.postMessage({ - command: "updateEspIdfStatus", - status: StatusType.installed, - }); - SetupPanel.postMessage({ - command: "setEspIdfErrorStatus", - errorMsg: `ESP-IDF is installed in ${idfPath}`, - }); - SetupPanel.postMessage({ - command: "updateEspIdfToolsStatus", - status: StatusType.started, - }); - if (setupMode === SetupMode.advanced) { - SetupPanel.postMessage({ - command: "updatePythonPath", - selectedPyPath: pyPath, - }); - const idfToolsManager = await IdfToolsManager.createIdfToolsManager( - espIdfPath - ); - const toolsInfo = await idfToolsManager.getRequiredToolsInfo( - join(toolsPath, "tools"), - undefined, - onReqPkgs - ); - SetupPanel.postMessage({ - command: "setRequiredToolsInfo", - toolsInfo, - }); - SetupPanel.postMessage({ - command: "goToCustomPage", - installing: false, - page: "/custom", - }); - return; - } - await downloadIdfTools( - idfPath, - toolsPath, - pyPath, - gitPath, - mirror, - saveScope, - workspaceFolderUri, - context, - espIdfStatusBar, - progress, - cancelToken, - onReqPkgs, - pypiIndexUrl - ); -} diff --git a/src/setup/espIdfJson.ts b/src/setup/espIdfJson.ts deleted file mode 100644 index 03876dd1e..000000000 --- a/src/setup/espIdfJson.ts +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Monday, 31st May 2021 7:18:37 pm - * Copyright 2021 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { createHash } from "crypto"; -import { pathExists, readJson, writeJson } from "fs-extra"; -import { join } from "path"; -import { getEspIdfFromCMake, isBinInPath } from "../utils"; - -export interface EspIdfJson { - $schema: string; - $id: string; - _comment: string; - _warning: string; - gitPath: string; - idfToolsPath: string; - idfSelectedId: string; - idfInstalled: { [key: string]: IdfInstalled }; -} - -export interface IdfInstalled { - version: string; - python: string; - path: string; -} - -export function getEspIdfJsonTemplate(toolsPath: string) { - return { - $schema: "http://json-schema.org/schema#", - $id: "http://dl.espressif.com/dl/schemas/esp_idf", - _comment: "Configuration file for ESP-IDF IDEs.", - _warning: - "Use / or \\ when specifying path. Single backslash is not allowed by JSON format.", - gitPath: "", - idfToolsPath: toolsPath, - idfSelectedId: "", - idfInstalled: {}, - } as EspIdfJson; -} - -export function getIdfMd5sum(idfPath: string) { - const md5Value = createHash("md5") - .update(idfPath.replace(/\\/g, "/")) - .digest("hex"); - return `esp-idf-${md5Value}`; -} - -export async function loadEspIdfJson(toolsPath: string) { - const espIdfJsonPath = join(toolsPath, "esp_idf.json"); - const espIdfJsonExists = await pathExists(espIdfJsonPath); - let espIdfJson: EspIdfJson; - try { - if (!espIdfJsonExists) { - throw new Error(`${espIdfJsonPath} doesn't exists.`); - } - espIdfJson = await readJson(espIdfJsonPath); - } catch (error) { - espIdfJson = getEspIdfJsonTemplate(toolsPath); - } - return espIdfJson; -} - -export async function addIdfPath( - idfPath: string, - pythonPath: string, - toolsPath: string, - gitPath: string -) { - const idfVersion = await getEspIdfFromCMake(idfPath); - const newIdfPathObj: IdfInstalled = { - version: idfVersion, - python: pythonPath, - path: idfPath, - }; - const idfId = getIdfMd5sum(idfPath); - const espIdfObj = await loadEspIdfJson(toolsPath); - - espIdfObj["idfInstalled"][idfId] = newIdfPathObj; - espIdfObj["idfSelectedId"] = idfId; - if (!espIdfObj.gitPath) { - if (gitPath === "git") { - gitPath = await isBinInPath(gitPath, process.env); - } - espIdfObj.gitPath = gitPath; - } - const espIdfJsonPath = join(toolsPath, "esp_idf.json"); - await writeJson(espIdfJsonPath, espIdfObj, { spaces: 2 }); -} - -export async function getPropertyFromJson(toolsPath: string, property: string) { - const espIdfObj = await loadEspIdfJson(toolsPath); - return Object.keys(espIdfObj).indexOf(property) !== -1 - ? espIdfObj[property] - : undefined; -} - -export async function getSelectedEspIdfId(toolsPath: string) { - return await getPropertyFromJson(toolsPath, "idfSelectedId"); -} - -export async function getPropertyWithId( - toolsPath: string, - property: string, - id: string -) { - const espIdfObj = await loadEspIdfJson(toolsPath); - return espIdfObj["idfInstalled"][id][property]; -} - -export async function getSelectedEspIdfPath(toolsPath: string) { - const selectedIdfId = await getSelectedEspIdfId(toolsPath); - return await getPropertyWithId(toolsPath, "path", selectedIdfId); -} - -export async function getSelectedIdfInstalled( - toolsPath: string -): Promise { - const espIdfObj = await loadEspIdfJson(toolsPath); - const emptyIDfInstalled = { - version: "", - python: "", - path: "", - }; - return espIdfObj && - espIdfObj.idfSelectedId && - espIdfObj.idfInstalled && - espIdfObj.idfInstalled[espIdfObj.idfSelectedId] - ? espIdfObj.idfInstalled[espIdfObj.idfSelectedId] - : emptyIDfInstalled; -} diff --git a/src/setup/espIdfVersionList.ts b/src/setup/espIdfVersionList.ts deleted file mode 100644 index 3acb1f670..000000000 --- a/src/setup/espIdfVersionList.ts +++ /dev/null @@ -1,323 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { DownloadManager } from "../downloadManager"; -import path from "path"; -import { EOL, tmpdir } from "os"; -import { Logger } from "../logger/logger"; -import { readFile, writeFile, pathExists } from "fs-extra"; -import * as del from "del"; -import { OutputChannel } from "../logger/outputChannel"; -import { IEspIdfLink, IdfMirror } from "../views/setup/types"; -import { ESP } from "../config"; -import axios, { AxiosRequestConfig } from "axios"; - - - -// Cache configuration -const CACHE_DURATION = 24 * 60 * 60 * 1000; // 24 hours in milliseconds -const CACHE_FILE = "esp_idf_versions_cache.json"; - -const axiosConfig: AxiosRequestConfig = { - timeout: 30000, // 30 seconds timeout - headers: { - 'User-Agent': ESP.HTTP_USER_AGENT - }, - validateStatus: (status) => status === 200, - maxRedirects: 5 -}; - -interface VersionCache { - content: string; - timestamp: number; - source: string; -} - -function isCacheValid(cache: VersionCache): boolean { - return Date.now() - cache.timestamp < CACHE_DURATION; -} - -function getCacheFilePath(extensionPath: string): string { - return path.join(extensionPath, CACHE_FILE); -} - -async function loadCache(extensionPath: string): Promise { - try { - const cachePath = getCacheFilePath(extensionPath); - if (await pathExists(cachePath)) { - const cacheData = await readFile(cachePath, 'utf8'); - const cache: VersionCache = JSON.parse(cacheData); - if (isCacheValid(cache)) { - OutputChannel.appendLine(`Using cached version list from ${cache.source} (cached ${Math.round((Date.now() - cache.timestamp) / 60000)} minutes ago)`); - return cache; - } - } - } catch (error) { - OutputChannel.appendLine(`Cache load error: ${error.message}`); - } - return null; -} - -async function saveCache(extensionPath: string, content: string, source: string): Promise { - try { - const cache: VersionCache = { - content, - timestamp: Date.now(), - source - }; - const cachePath = getCacheFilePath(extensionPath); - await writeFile(cachePath, JSON.stringify(cache, null, 2)); - OutputChannel.appendLine(`Cached version list from ${source}`); - } catch (error) { - OutputChannel.appendLine(`Cache save error: ${error.message}`); - } -} - -async function checkNetworkConnectivity(): Promise { - try { - await axios.get('https://httpbin.org/get', { timeout: 5000 }); - return true; - } catch (error) { - OutputChannel.appendLine(`Network connectivity check failed: ${error.message}`); - return false; - } -} - -export async function clearVersionCache(extensionPath: string): Promise { - try { - const cachePath = getCacheFilePath(extensionPath); - if (await pathExists(cachePath)) { - await writeFile(cachePath, ''); - OutputChannel.appendLine('Version cache cleared'); - } - } catch (error) { - OutputChannel.appendLine(`Error clearing cache: ${error.message}`); - } -} - -export async function getEspIdfVersions(extensionPath: string) { - const downloadManager = new DownloadManager(extensionPath); - const versionList = await downloadEspIdfVersionList( - downloadManager, - extensionPath - ); - const manualVersion = { - name: "Find ESP-IDF in your system", - filename: "manual", - } as IEspIdfLink; - return [manualVersion, ...versionList]; -} - -export async function downloadEspIdfVersionList( - downloadManager: DownloadManager, - extensionPath: string -) { - // First, try to load from cache - const cachedData = await loadCache(extensionPath); - if (cachedData) { - const versionList = cachedData.content.trim().split("\n"); - return createEspIdfLinkList(versionList); - } - - // Check network connectivity before attempting downloads - const isNetworkAvailable = await checkNetworkConnectivity(); - if (!isNetworkAvailable) { - OutputChannel.appendLine("Network connectivity check failed, using fallback methods"); - } - - // Try primary URL using the enhanced DownloadManager - try { - OutputChannel.appendLine(`Attempting to download ESP-IDF versions from ${ESP.URL.IDF_VERSIONS} using enhanced DownloadManager...`); - - // Create a temporary file path for the version list - const tempDir = tmpdir(); - const tempFilePath = path.join(tempDir, "idf_versions.txt"); - - await downloadManager.downloadWithResume( - ESP.URL.IDF_VERSIONS, - tempDir, - undefined, - undefined, - undefined - ); - - // Read the downloaded content - const fileContent = await readFile(tempFilePath); - const content = fileContent.toString(); - const versionList = content.trim().split("\n"); - - // Save to cache for future use - await saveCache(extensionPath, content, ESP.URL.IDF_VERSIONS); - - // Clean up temporary file - try { - await del(tempFilePath, { force: true }); - } catch (cleanupError) { - // Ignore cleanup errors - } - - OutputChannel.appendLine(`Successfully downloaded ESP-IDF versions from ${ESP.URL.IDF_VERSIONS} using enhanced DownloadManager`); - return createEspIdfLinkList(versionList); - } catch (error) { - const errorMsg = `Failed to download ESP-IDF versions from ${ESP.URL.IDF_VERSIONS}: ${error.message}`; - OutputChannel.appendLine(errorMsg); - Logger.errorNotify(errorMsg, error, "espIdfVersionList downloadEspIdfVersionList"); - } - - // If primary URL fails, try GitHub releases API as fallback - try { - OutputChannel.appendLine("Primary URL failed, trying GitHub releases API as fallback..."); - const githubReleases = await getEspIdfTags("releases"); - if (githubReleases.length > 0) { - OutputChannel.appendLine(`Successfully retrieved ${githubReleases.length} versions from GitHub releases API`); - return githubReleases; - } - } catch (error) { - const errorMsg = `GitHub releases API fallback failed: ${error.message}`; - OutputChannel.appendLine(errorMsg); - Logger.error(errorMsg, error, "espIdfVersionList downloadEspIdfVersionList github fallback"); - } - - // Try local fallback file - try { - const idfVersionListFallBack = path.join( - extensionPath, - "idf_versions.txt" - ); - const fallbackContent = await readFile(idfVersionListFallBack); - const versionList = fallbackContent.toString().trim().split(EOL); - OutputChannel.appendLine("Using local fallback version list file"); - return createEspIdfLinkList(versionList); - } catch (fallbackError) { - const fallBackErrMsg = `Error opening esp-idf fallback version list file. ${fallbackError.message}`; - OutputChannel.appendLine(fallBackErrMsg); - Logger.errorNotify(fallBackErrMsg, fallbackError, "espIdfVersionList downloadEspIdfVersionList fallback"); - - // Return a minimal version list as last resort - OutputChannel.appendLine("All download methods failed, returning minimal version list"); - return createEspIdfLinkList([ - "v5.5-rc1", - "v5.4.2", - "v5.3.3", - "v5.2.5", - "v5.1.6", - "release/v5.5", - "release/v5.4", - "release/v5.3", - "release/v5.2", - "release/v5.1", - "master" - ]); - } -} - -export async function getEspIdfTags(type: 'releases' | 'tags' = 'releases') { - // Define sources based on the requested type - const sources = type === 'releases' - ? [ - { - url: "https://api.github.com/repos/espressif/esp-idf/releases?per_page=100", - name: "GitHub Releases API" - } - ] - : [ - { - url: "https://api.github.com/repos/espressif/esp-idf/tags?per_page=100", - name: "GitHub Tags API" - } - ]; - - for (const source of sources) { - try { - OutputChannel.appendLine(`Attempting to get ESP-IDF ${type} from ${source.name}...`); - const response = await axios.get(source.url, axiosConfig); - - let versionsList: string[] = []; - if (type === 'releases') { - // Handle releases - versionsList = response.data.map((item) => item.tag_name); - } else { - // Handle tags - versionsList = response.data.map((item) => item.name); - } - - OutputChannel.appendLine(`Successfully retrieved ${versionsList.length} ${type} from ${source.name}`); - return createEspIdfLinkList(versionsList); - } catch (error) { - const errorMsg = `Error getting ESP-IDF ${type} from ${source.name}: ${error.message}`; - OutputChannel.appendLine(errorMsg); - Logger.error(errorMsg, error, "espIdfVersionList getEspIdfTags"); - continue; // Try next source - } - } - - // If all sources fail, return empty list - OutputChannel.appendLine(`All ${type} sources failed, returning empty ${type} list`); - return []; -} - -export function createEspIdfLinkList(versionList: string[]) { - const versionZip = - "https://github.com/espressif/esp-idf/releases/download/IDFZIPFileVersion/esp-idf-IDFZIPFileVersion.zip"; - const mirrorZip = `${ESP.URL.IDF_GITHUB_ASSETS}/espressif/esp-idf/releases/download/IDFZIPFileVersion/esp-idf-IDFZIPFileVersion.zip`; - const versionRegex = /\b(IDFZIPFileVersion)\b/g; - const espIdfMasterZip = - "https://github.com/espressif/esp-idf/archive/master.zip"; - const preReleaseRegex = /v.+-rc/g; - const betaRegex = /v.+-beta/g; - const downloadList: IEspIdfLink[] = versionList.map((version) => { - if (version.startsWith("release/")) { - return { - filename: `${version}`, - name: version + " (release branch)", - url: `https://github.com/espressif/esp-idf/archive/refs/heads/${version}.zip`, - mirror: "", - version, - }; - } else if (version.startsWith("v")) { - return { - filename: `esp-idf-${version}.zip`, - name: version + " (release version)", - url: versionZip.replace(versionRegex, version), - mirror: mirrorZip.replace(versionRegex, version), - version, - }; - } else if (preReleaseRegex.test(version)) { - return { - filename: `esp-idf-${version}.zip`, - name: version + " (pre-release version)", - url: versionZip.replace(versionRegex, version), - mirror: mirrorZip.replace(versionRegex, version), - version, - }; - } else if (version === "master") { - return { - filename: `master`, - name: version + " (development branch)", - url: `https://github.com/espressif/esp-idf/archive/refs/heads/${version}.zip`, - mirror: espIdfMasterZip, - version, - }; - } else if (betaRegex.test(version)) { - return { - filename: `esp-idf-${version}.zip`, - name: version + " (beta version)", - url: versionZip.replace(versionRegex, version), - mirror: mirrorZip.replace(versionRegex, version), - version, - }; - } - }); - return downloadList; -} diff --git a/src/setup/existingIdfSetups.ts b/src/setup/existingIdfSetups.ts deleted file mode 100644 index 99b7dcf83..000000000 --- a/src/setup/existingIdfSetups.ts +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Friday, 24th February 2023 10:30:49 pm - * Copyright 2023 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ESP } from "../config"; -import { Logger } from "../logger/logger"; -import { getEspIdfFromCMake } from "../utils"; -import { IdfSetup } from "../views/setup/types"; -import { getIdfMd5sum, loadEspIdfJson } from "./espIdfJson"; -import { checkIdfSetup } from "./setupValidation/espIdfSetup"; - -export async function getPreviousIdfSetups(logToChannel: boolean = true) { - const setupKeys = ESP.GlobalConfiguration.store.getIdfSetupKeys(); - const idfSetups: IdfSetup[] = []; - for (let idfSetupKey of setupKeys) { - let idfSetup = ESP.GlobalConfiguration.store.get( - idfSetupKey, - undefined - ); - if (idfSetup && idfSetup.idfPath) { - try { - idfSetup.isValid = await checkIdfSetup(idfSetup, logToChannel); - idfSetup.version = await getEspIdfFromCMake(idfSetup.idfPath); - idfSetups.push(idfSetup); - } catch (err) { - const msg = err.message - ? err.message - : "Error checkIdfSetup in getPreviousIdfSetups"; - Logger.error(msg, err, "getPreviousIdfSetups"); - ESP.GlobalConfiguration.store.clearIdfSetup(idfSetup.id); - } - } - } - return idfSetups; -} - -export async function clearPreviousIdfSetups() { - const setupKeys = ESP.GlobalConfiguration.store.getIdfSetupKeys(); - for (let idfSetupKey of setupKeys) { - ESP.GlobalConfiguration.store.clear(idfSetupKey); - } - ESP.GlobalConfiguration.store.clear(ESP.GlobalConfiguration.IDF_SETUPS); -} - -export async function createIdfSetup( - idfPath: string, - toolsPath: string, - sysPythonBinPath: string, - gitPath: string -) { - const idfSetupId = getIdfMd5sum(idfPath); - const idfVersion = await getEspIdfFromCMake(idfPath); - const newIdfSetup: IdfSetup = { - id: idfSetupId, - idfPath, - gitPath, - toolsPath, - sysPythonPath: sysPythonBinPath, - version: idfVersion, - isValid: false, - }; - newIdfSetup.isValid = await checkIdfSetup(newIdfSetup); - addIdfSetup(newIdfSetup); - return newIdfSetup; -} - -export function addIdfSetup(newIdfSetup: IdfSetup) { - const setupKeys = ESP.GlobalConfiguration.store.getIdfSetupKeys(); - if (setupKeys.indexOf(newIdfSetup.id) === -1) { - setupKeys.push(newIdfSetup.id); - ESP.GlobalConfiguration.store.updateIdfSetupKeys(setupKeys); - } - ESP.GlobalConfiguration.store.set(newIdfSetup.id, newIdfSetup); -} - -export async function loadIdfSetupsFromEspIdfJson(toolsPath: string) { - const espIdfJson = await loadEspIdfJson(toolsPath); - let idfSetups: IdfSetup[] = []; - if ( - espIdfJson && - espIdfJson.idfInstalled && - Object.keys(espIdfJson.idfInstalled).length - ) { - for (let idfInstalledKey of Object.keys(espIdfJson.idfInstalled)) { - let setupConf: IdfSetup = { - id: idfInstalledKey, - idfPath: espIdfJson.idfInstalled[idfInstalledKey].path, - gitPath: espIdfJson.gitPath, - version: espIdfJson.idfInstalled[idfInstalledKey].version, - python: espIdfJson.idfInstalled[idfInstalledKey].python, - toolsPath: toolsPath, - isValid: false, - } as IdfSetup; - try { - setupConf.isValid = await checkIdfSetup(setupConf, false); - } catch (err) { - const msg = err.message - ? err.message - : "Error checkIdfSetup in loadIdfSetupsFromEspIdfJson"; - Logger.error(msg, err, "loadIdfSetupsFromEspIdfJson"); - setupConf.isValid = false; - } - idfSetups.push(setupConf); - } - } - return idfSetups; -} diff --git a/src/setup/installPyReqs.ts b/src/setup/installPyReqs.ts deleted file mode 100644 index c5b86ed65..000000000 --- a/src/setup/installPyReqs.ts +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { pathExists } from "fs-extra"; -import * as pythonManager from "../pythonManager"; -import { SetupPanel } from "./SetupPanel"; -import { OutputChannel } from "../logger/outputChannel"; -import { PyReqLog } from "../PyReqLog"; -import { CancellationToken, ExtensionContext, Progress } from "vscode"; -import { Logger } from "../logger/logger"; - -export async function installPyReqs( - espIdfPath: string, - workingDir: string, - sysPyBinPath: string, - gitPath: string, - context: ExtensionContext, - progress: Progress<{ message: string; increment?: number }>, - cancelToken?: CancellationToken, - pypiIndexUrl?: string -) { - progress.report({ - message: `Checking Python and pip exists...`, - }); - const pyExists = - sysPyBinPath === "python" ? true : await pathExists(sysPyBinPath); - const doesPythonExists = await pythonManager.checkPythonExists( - sysPyBinPath, - workingDir - ); - if (!(pyExists && doesPythonExists)) { - const msg = "Python have not been found in your environment."; - sendPyReqLog(msg); - OutputChannel.appendLine(msg); - Logger.info(msg); - return; - } - const isNotVirtualEnv = await pythonManager.checkIfNotVirtualEnv( - sysPyBinPath, - workingDir - ); - if (!isNotVirtualEnv) { - const msg = - "Selected python is from a virtual environment. Choose system python"; - sendPyReqLog(msg); - OutputChannel.appendLine(msg); - Logger.info(msg); - return; - } - const logTracker = new PyReqLog(sendPyReqLog); - progress.report({ - message: `Installing python virtualenv and ESP-IDF python requirements...`, - }); - const virtualEnvPyBin = await pythonManager.installPythonEnvFromIdfTools( - espIdfPath, - workingDir, - logTracker, - sysPyBinPath, - gitPath, - context, - cancelToken, - pypiIndexUrl - ); - if (virtualEnvPyBin) { - if (logTracker.Log.indexOf("Exception") < 0) { - const msg = "Python requirements has been installed"; - OutputChannel.appendLine(msg); - Logger.info(msg); - return virtualEnvPyBin; - } - } - const msg = "Python requirements has not been installed"; - OutputChannel.appendLine(msg); - Logger.info(msg); - return; -} - -export function sendPyReqLog(log: string) { - SetupPanel.postMessage({ - command: "updatePyReqsLog", - pyReqsLog: log, - }); -} - -export async function getPythonList(workingDir: string) { - const pyVersionList = await pythonManager.getPythonBinList(workingDir); - pyVersionList.push("Provide python executable path"); - return pyVersionList; -} diff --git a/src/setup/pyReqsInstallStep.ts b/src/setup/pyReqsInstallStep.ts deleted file mode 100644 index 4ad1119b5..000000000 --- a/src/setup/pyReqsInstallStep.ts +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as vscode from "vscode"; -import { StatusType } from "../views/setup/types"; -import { installPyReqs } from "./installPyReqs"; -import { SetupPanel } from "./SetupPanel"; -import { saveSettings } from "./setupInit"; -import { getOpenOcdRules } from "./addOpenOcdRules"; -import { addIdfPath } from "./espIdfJson"; - -export async function createPyReqs( - idfPath: string, - toolsPath: string, - pyPath: string, - gitPath: string, - saveScope: vscode.ConfigurationTarget, - context: vscode.ExtensionContext, - progress: vscode.Progress<{ message: string; increment?: number }>, - cancelToken: vscode.CancellationToken, - workspaceFolderUri: vscode.Uri, - espIdfStatusBar: vscode.StatusBarItem, - pypiIndexUrl?: string -) { - SetupPanel.postMessage({ - command: "updatePyVEnvStatus", - status: StatusType.started, - }); - const virtualEnvPath = await installPyReqs( - idfPath, - toolsPath, - pyPath, - gitPath, - context, - progress, - cancelToken, - pypiIndexUrl - ); - await saveSettings( - idfPath, - toolsPath, - gitPath, - pyPath, - saveScope, - workspaceFolderUri, - espIdfStatusBar - ); - await addIdfPath(idfPath, virtualEnvPath, toolsPath, gitPath); - SetupPanel.postMessage({ - command: "updatePyVEnvStatus", - status: StatusType.installed, - }); - SetupPanel.postMessage({ - command: "setIsInstalled", - isInstalled: true, - }); - SetupPanel.postMessage({ - command: "setIsIdfInstalling", - installing: false, - }); - await getOpenOcdRules(vscode.Uri.file(idfPath)); -} diff --git a/src/setup/setupInit.ts b/src/setup/setupInit.ts deleted file mode 100644 index 3887d7d1e..000000000 --- a/src/setup/setupInit.ts +++ /dev/null @@ -1,349 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { ConfigurationTarget, Progress, StatusBarItem, Uri, env } from "vscode"; -import { IdfToolsManager } from "../idfToolsManager"; -import * as utils from "../utils"; -import { getEspIdfTags, getEspIdfVersions } from "./espIdfVersionList"; -import { IdfMirror, IdfSetup, IEspIdfLink } from "../views/setup/types"; -import { getPythonList } from "./installPyReqs"; -import { pathExists } from "fs-extra"; -import path from "path"; -import { Logger } from "../logger/logger"; -import * as idfConf from "../idfConfiguration"; -import { getPropertyFromJson, getSelectedIdfInstalled } from "./espIdfJson"; -import { - createIdfSetup, - getPreviousIdfSetups, - loadIdfSetupsFromEspIdfJson, -} from "./existingIdfSetups"; -import { checkPyVenv } from "./setupValidation/pythonEnv"; -import { packageJson } from "../utils"; -import { getPythonPath, getVirtualEnvPythonPath } from "../pythonManager"; -import { CommandKeys, createCommandDictionary } from "../cmdTreeView/cmdStore"; - -export interface ISetupInitArgs { - downloadMirror: IdfMirror; - espIdfPath: string; - espToolsPath: string; - existingIdfSetups: IdfSetup[]; - extensionVersion: string; - espIdfVersionsList: IEspIdfLink[]; - espIdfTagsList: IEspIdfLink[]; - gitPath: string; - gitVersion: string; - hasPrerequisites: boolean; - onReqPkgs?: string[]; - pythonVersions: string[]; - saveScope: number; - workspaceFolder: Uri; - espIdfStatusBar: StatusBarItem; -} - -export interface IPreviousInstallResult { - espIdfPath: string; - toolsPath: string; - gitPath: string; - gitVersion: string; - existingIdfSetups: IdfSetup[]; -} - -export async function checkPreviousInstall( - workspaceFolder: Uri -): Promise { - const containerPath = - process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME; - - const confEspIdfPath = idfConf.readParameter( - "idf.espIdfPath", - workspaceFolder - ) as string; - const confToolsPath = idfConf.readParameter( - "idf.toolsPath", - workspaceFolder - ) as string; - - const toolsPath = - confToolsPath || - process.env.IDF_TOOLS_PATH || - path.join(containerPath, ".espressif"); - let espIdfPath = - confEspIdfPath || - process.env.IDF_PATH || - path.join(containerPath, "esp", "esp-idf"); - - let idfPathExists = await pathExists(espIdfPath); - if (!idfPathExists && process.platform === "win32") { - espIdfPath = path.join(process.env.USERPROFILE, "Desktop", "esp-idf"); - } - - const espIdfJsonPath = path.join(toolsPath, "esp_idf.json"); - const espIdfJsonExists = await pathExists(espIdfJsonPath); - let gitPath = - idfConf.readParameter("idf.gitPath", workspaceFolder) || "/usr/bin/git"; - let existingIdfSetups: IdfSetup[] = []; - if (espIdfJsonExists) { - const idfInstalled = await getSelectedIdfInstalled(toolsPath); - if (idfInstalled && idfInstalled.path) { - espIdfPath = idfInstalled.path; - } - const gitPathFromJson = (await getPropertyFromJson( - toolsPath, - "gitPath" - )) as string; - const gitPathExists = await pathExists(gitPathFromJson); - if (gitPathExists) { - gitPath = gitPathFromJson; - } - existingIdfSetups = await loadIdfSetupsFromEspIdfJson(toolsPath); - if (process.env.IDF_TOOLS_PATH && toolsPath !== process.env.IDF_TOOLS_PATH) { - const systemIdfSetups = await loadIdfSetupsFromEspIdfJson(process.env.IDF_TOOLS_PATH); - existingIdfSetups = [...existingIdfSetups, ...systemIdfSetups]; - } - } - - const gitVersion = await utils.checkGitExists(containerPath, gitPath); - - return { - espIdfPath, - toolsPath, - gitPath, - gitVersion, - existingIdfSetups, - }; -} - -export async function getSetupInitialValues( - extensionPath: string, - progress: Progress<{ message: string; increment: number }>, - workspaceFolder: Uri -) { - progress.report({ increment: 20, message: "Getting ESP-IDF versions..." }); - const espIdfVersionsList = await getEspIdfVersions(extensionPath); - progress.report({ increment: 10, message: "Getting ESP-IDF Tags" }); - const espIdfTagsList = await getEspIdfTags("tags"); - progress.report({ increment: 10, message: "Getting Python versions..." }); - const pythonVersions = await getPythonList(extensionPath); - const idfSetups = await getPreviousIdfSetups(false); - const extensionVersion = packageJson.version as string; - const saveScope = idfConf.readParameter("idf.saveScope") as number; - const initialDownloadMirror = - env.language.toLowerCase().indexOf("zh-cn") !== -1 || - env.language.toLowerCase().indexOf("zh-tw") !== -1 - ? IdfMirror.Espressif - : IdfMirror.Github; - const setupInitArgs = { - downloadMirror: initialDownloadMirror, - espIdfVersionsList, - espIdfTagsList, - extensionVersion, - existingIdfSetups: idfSetups, - pythonVersions, - saveScope, - workspaceFolder, - onReqPkgs: ["esp-clang"], - } as ISetupInitArgs; - - try { - progress.report({ - increment: 10, - message: "Checking for previous install...", - }); - - // Get initial paths - const prevInstall = await checkPreviousInstall(workspaceFolder); - if (process.platform !== "win32") { - setupInitArgs.hasPrerequisites = - prevInstall.gitVersion !== "Not found" && - pythonVersions && - pythonVersions.length > 0; - - const canAccessCMake = await utils.isBinInPath( - "cmake", - process.env - ); - - if (canAccessCMake === "") { - setupInitArgs.onReqPkgs = setupInitArgs.onReqPkgs - ? [...setupInitArgs.onReqPkgs, "cmake"] - : ["cmake"]; - } - - const canAccessNinja = await utils.isBinInPath( - "ninja", - process.env - ); - - if (canAccessNinja === "") { - setupInitArgs.onReqPkgs = setupInitArgs.onReqPkgs - ? [...setupInitArgs.onReqPkgs, "ninja"] - : ["ninja"]; - } - } else { - setupInitArgs.hasPrerequisites = true; - } - progress.report({ increment: 20, message: "Preparing setup view..." }); - if (prevInstall) { - setupInitArgs.espIdfPath = prevInstall.espIdfPath; - setupInitArgs.espToolsPath = prevInstall.toolsPath; - setupInitArgs.gitPath = prevInstall.gitPath; - setupInitArgs.gitVersion = prevInstall.gitVersion; - if (prevInstall.existingIdfSetups) { - for (let espIdfJsonSetup of prevInstall.existingIdfSetups) { - const alreadyInExtensionSetup = idfSetups.find((s) => { - return s.idfPath === espIdfJsonSetup.idfPath; - }); - if (typeof alreadyInExtensionSetup === "undefined") { - setupInitArgs.existingIdfSetups.push(espIdfJsonSetup); - } - } - } - } - } catch (error) { - Logger.error(error.message, error, "setupInit getSetupInitialValues"); - } - return setupInitArgs; -} - -export async function isCurrentInstallValid(workspaceFolder: Uri) { - const containerPath = - process.platform === "win32" ? process.env.USERPROFILE : process.env.HOME; - const confToolsPath = idfConf.readParameter( - "idf.toolsPath", - workspaceFolder - ) as string; - const toolsPath = - confToolsPath || - process.env.IDF_TOOLS_PATH || - path.join(containerPath, ".espressif"); - - let espIdfPath = idfConf.readParameter("idf.espIdfPath", workspaceFolder); - let idfPathVersion = await utils.getEspIdfFromCMake(espIdfPath); - if (idfPathVersion === "x.x" && process.platform === "win32") { - espIdfPath = path.join(process.env.USERPROFILE, "Desktop", "esp-idf"); - idfPathVersion = await utils.getEspIdfFromCMake(espIdfPath); - } - if (idfPathVersion === "x.x") { - return false; - } - const idfToolsManager = await IdfToolsManager.createIdfToolsManager( - espIdfPath - ); - let extraReqPaths = []; - if (process.platform !== "win32") { - const canAccessCMake = await utils.isBinInPath( - "cmake", - process.env - ); - if (!canAccessCMake) { - extraReqPaths.push("cmake"); - } - const canAccessNinja = await utils.isBinInPath( - "ninja", - process.env - ); - if (!canAccessNinja) { - extraReqPaths.push("ninja"); - } - } - const extraPaths = await idfToolsManager.exportPathsInString( - path.join(toolsPath, "tools"), - extraReqPaths - ); - const toolsInfo = await idfToolsManager.getRequiredToolsInfo( - path.join(toolsPath, "tools"), - extraPaths, - extraReqPaths, - false - ); - const failedToolsResult = toolsInfo.filter( - (tInfo) => - tInfo.actual.indexOf("No match") !== -1 && - tInfo.actual.indexOf("Error") !== -1 - ); - - if (failedToolsResult.length !== 0) { - return false; - } - // FIX use system Python path as setting instead venv - // REMOVE this line after next release - const sysPythonBinPath = await getPythonPath(workspaceFolder); - - let pythonBinPath: string = ""; - if (sysPythonBinPath) { - pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); - } - if (!pythonBinPath) { - pythonBinPath = idfConf.readParameter( - "idf.pythonBinPath", - workspaceFolder - ) as string; - } - const isPyEnvValid = await checkPyVenv(pythonBinPath, espIdfPath); - return isPyEnvValid; -} - -export async function saveSettings( - espIdfPath: string, - toolsPath: string, - gitPath: string, - sysPythonBinPath: string, - saveScope: ConfigurationTarget, - workspaceFolderUri: Uri, - espIdfStatusBar: StatusBarItem, - saveGlobalState: boolean = true -) { - const confTarget = - saveScope || - (idfConf.readParameter("idf.saveScope") as ConfigurationTarget); - let workspaceFolder: Uri; - if (confTarget === ConfigurationTarget.WorkspaceFolder) { - workspaceFolder = workspaceFolderUri; - } - await idfConf.writeParameter( - "idf.espIdfPath", - espIdfPath, - confTarget, - workspaceFolder - ); - await idfConf.writeParameter( - "idf.toolsPath", - toolsPath, - confTarget, - workspaceFolder - ); - await idfConf.writeParameter( - "idf.gitPath", - gitPath, - ConfigurationTarget.Global - ); - await idfConf.writeParameter( - "idf.pythonInstallPath", - sysPythonBinPath, - confTarget, - workspaceFolder - ); - const idfPathVersion = await utils.getEspIdfFromCMake(espIdfPath); - if (saveGlobalState) { - await createIdfSetup(espIdfPath, toolsPath, sysPythonBinPath, gitPath); - } - if (espIdfStatusBar) { - const commandDictionary = createCommandDictionary(); - espIdfStatusBar.text = - `$(${ - commandDictionary[CommandKeys.SelectCurrentIdfVersion].iconId - }) ESP-IDF v` + idfPathVersion; - } - Logger.infoNotify("ESP-IDF has been configured"); -} diff --git a/src/setup/setupValidation/espIdfSetup.ts b/src/setup/setupValidation/espIdfSetup.ts deleted file mode 100644 index ee888c4ce..000000000 --- a/src/setup/setupValidation/espIdfSetup.ts +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Monday, 27th February 2023 3:00:15 pm - * Copyright 2023 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { join } from "path"; -import { IdfSetup } from "../../views/setup/types"; -import { IdfToolsManager } from "../../idfToolsManager"; -import { saveSettings } from "../setupInit"; -import { pathExists } from "fs-extra"; -import { Logger } from "../../logger/logger"; -import { checkPyVenv } from "./pythonEnv"; -import { ConfigurationTarget, StatusBarItem, Uri } from "vscode"; -import { - getPythonEnvPath, - getSystemPythonFromSettings, -} from "../../pythonManager"; - -export async function useIdfSetupSettings( - setupConf: IdfSetup, - saveScope: ConfigurationTarget, - workspaceFolderUri: Uri, - espIdfStatusBar: StatusBarItem -) { - let sysPythonBinPath = ""; - if (setupConf.python) { - sysPythonBinPath = await getSystemPythonFromSettings( - setupConf.python, - setupConf.idfPath, - setupConf.toolsPath - ); - } else { - sysPythonBinPath = setupConf.sysPythonPath; - } - await saveSettings( - setupConf.idfPath, - setupConf.toolsPath, - setupConf.gitPath, - sysPythonBinPath, - saveScope, - workspaceFolderUri, - espIdfStatusBar, - false - ); -} - -export async function checkIdfSetup( - setupConf: IdfSetup, - logToChannel: boolean = true -) { - try { - if (!setupConf.idfPath) { - return false; - } - const doesIdfPathExists = await pathExists(setupConf.idfPath); - if (!doesIdfPathExists) { - return false; - } - const idfToolsManager = await IdfToolsManager.createIdfToolsManager( - setupConf.idfPath - ); - const exportedToolsPaths = await idfToolsManager.exportPathsInString( - join(setupConf.toolsPath, "tools"), - ["cmake", "ninja"] - ); - const toolsInfo = await idfToolsManager.getRequiredToolsInfo( - join(setupConf.toolsPath, "tools"), - exportedToolsPaths, - ["cmake", "ninja"], - logToChannel - ); - - const failedToolsResult = toolsInfo.filter( - (tInfo) => - !tInfo.doesToolExist && ["cmake", "ninja"].indexOf(tInfo.name) === -1 - ); - - if (failedToolsResult.length) { - return false; - } - let virtualEnvPython = ""; - if (setupConf.python) { - virtualEnvPython = setupConf.python; - } else { - if (!setupConf.sysPythonPath) { - setupConf.sysPythonPath = await getSystemPythonFromSettings( - "", - setupConf.idfPath, - setupConf.toolsPath - ); - } - virtualEnvPython = await getPythonEnvPath( - setupConf.idfPath, - setupConf.toolsPath, - setupConf.sysPythonPath - ); - } - - const pyEnvReqs = await checkPyVenv(virtualEnvPython, setupConf.idfPath); - return pyEnvReqs; - } catch (error) { - const msg = - error && error.message - ? error.message - : `Error checking Idf Setup ${setupConf.idfPath}`; - Logger.error(msg, error, "espIdfSetup checkIdfSetup"); - return false; - } -} diff --git a/src/setup/setupValidation/pythonEnv.ts b/src/setup/setupValidation/pythonEnv.ts deleted file mode 100644 index 3c94cd13c..000000000 --- a/src/setup/setupValidation/pythonEnv.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Monday, 27th February 2023 7:13:29 pm - * Copyright 2023 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { pathExists } from "fs-extra"; -import { join } from "path"; -import { startPythonReqsProcess } from "../../utils"; - -export async function checkPyVenv(pyVenvPath: string, espIdfPath: string) { - const pyExists = await pathExists(pyVenvPath); - if (!pyExists) { - return false; - } - let requirements: string; - requirements = join( - espIdfPath, - "tools", - "requirements", - "requirements.core.txt" - ); - const coreRequirementsExists = await pathExists(requirements); - if (!coreRequirementsExists) { - requirements = join(espIdfPath, "requirements.txt"); - const requirementsExists = await pathExists(requirements); - if (!requirementsExists) { - return false; - } - } - const reqsResults = await startPythonReqsProcess( - pyVenvPath, - espIdfPath, - requirements - ); - if (reqsResults.indexOf("are not satisfied") > -1) { - return false; - } - return true; -} diff --git a/src/setup/toolInstall.ts b/src/setup/toolInstall.ts deleted file mode 100644 index 27be8f877..000000000 --- a/src/setup/toolInstall.ts +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -import { delimiter } from "path"; -import { ESP } from "../config"; -import { Logger } from "../logger/logger"; -import { OutputChannel } from "../logger/outputChannel"; -import { DownloadManager } from "../downloadManager"; -import { InstallManager } from "../installManager"; -import { IdfToolsManager } from "../idfToolsManager"; -import { PackageProgress } from "../PackageProgress"; -import { - sendPkgDownloadPercentage, - sendPkgChecksumResult, - sendPkgDownloadDetail, - sendPkgDownloadFailed, -} from "./webviewMsgMethods"; -import { CancellationToken, Progress } from "vscode"; - -export async function downloadEspIdfTools( - installDir: string, - idfToolsManager: IdfToolsManager, - mirror: ESP.IdfMirror, - progress: Progress<{ message: string; increment?: number }>, - pythonBinPath: string, - cancelToken?: CancellationToken, - onReqPkgs?: string[] -) { - const manyPathsInInstallDir = installDir.split(delimiter); - if (manyPathsInInstallDir.length > 1) { - Logger.infoNotify("Introduce a single path"); - return; - } - const downloadManager = new DownloadManager(installDir); - const installManager = new InstallManager(installDir); - - const packages = await idfToolsManager.getPackageList(onReqPkgs); - const pkgProgress = packages.map((p) => { - return new PackageProgress( - p.name, - sendPkgDownloadPercentage, - sendPkgChecksumResult, - sendPkgDownloadDetail, - sendPkgDownloadFailed - ); - }); - OutputChannel.appendLine(""); - Logger.info(""); - await downloadManager.downloadPackages( - idfToolsManager, - progress, - mirror, - pkgProgress, - cancelToken, - onReqPkgs - ); - OutputChannel.appendLine(""); - Logger.info(""); - await installManager.installPackages( - idfToolsManager, - progress, - pythonBinPath, - cancelToken, - onReqPkgs - ); - OutputChannel.appendLine(""); - Logger.info(""); -} diff --git a/src/setup/toolsDownloadStep.ts b/src/setup/toolsDownloadStep.ts deleted file mode 100644 index aa3b933c3..000000000 --- a/src/setup/toolsDownloadStep.ts +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import * as path from "path"; -import * as vscode from "vscode"; -import { ESP } from "../config"; -import { IdfToolsManager } from "../idfToolsManager"; -import { SetupPanel } from "./SetupPanel"; -import { downloadEspIdfTools } from "./toolInstall"; -import { StatusType } from "../views/setup/types"; -import { createPyReqs } from "./pyReqsInstallStep"; - -export async function downloadIdfTools( - idfPath: string, - toolsPath: string, - pyPath: string, - gitPath: string, - mirror: ESP.IdfMirror, - saveScope: vscode.ConfigurationTarget, - workspaceFolderUri: vscode.Uri, - context: vscode.ExtensionContext, - espIdfStatusBar: vscode.StatusBarItem, - progress?: vscode.Progress<{ message: string; increment?: number }>, - cancelToken?: vscode.CancellationToken, - onReqPkgs?: string[], - pypiIndexUrl?: string -) { - const idfToolsManager = await IdfToolsManager.createIdfToolsManager(idfPath); - const requiredTools = await idfToolsManager.getRequiredToolsInfo( - toolsPath, - undefined, - onReqPkgs - ); - SetupPanel.postMessage({ - command: "setRequiredToolsInfo", - toolsInfo: requiredTools, - }); - await downloadEspIdfTools( - toolsPath, - idfToolsManager, - mirror, - progress, - pyPath, - cancelToken, - onReqPkgs - ); - SetupPanel.postMessage({ - command: "updateEspIdfToolsStatus", - status: StatusType.installed, - }); - await createPyReqs( - idfPath, - toolsPath, - pyPath, - gitPath, - saveScope, - context, - progress, - cancelToken, - workspaceFolderUri, - espIdfStatusBar, - pypiIndexUrl - ); -} diff --git a/src/setup/webviewMsgMethods.ts b/src/setup/webviewMsgMethods.ts deleted file mode 100644 index 406ad85d7..000000000 --- a/src/setup/webviewMsgMethods.ts +++ /dev/null @@ -1,124 +0,0 @@ -// Copyright 2019 Espressif Systems (Shanghai) CO LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import { SetupPanel } from "./SetupPanel"; - -export function sendEspIdfDownloadProgress( - id: string, - updatedPercentage: string -) { - SetupPanel.postMessage({ - command: "updateIdfDownloadStatusPercentage", - id, - percentage: updatedPercentage, - }); -} - -export function sendEspIdfDownloadDetail(id: string, updatedDetail: string) { - SetupPanel.postMessage({ - command: "updateIdfDownloadStatusDetail", - detail: updatedDetail, - id, - }); -} - -export function sendDownloadedZip(downloadedPath: string) { - SetupPanel.postMessage({ - command: "setEspIdfErrorStatus", - errorMsg: `ESP-IDF is downloaded in ${downloadedPath}`, - }); -} - -export function sendExtractedZip(extractedPath: string) { - SetupPanel.postMessage({ - command: "setEspIdfErrorStatus", - errorMsg: `ESP-IDF is extracted in ${extractedPath}`, - }); -} - -export function sendPkgDownloadPercentage( - pkgName: string, - updatedPercentage: string -) { - SetupPanel.postMessage({ - command: "updatePkgDownloadPercentage", - id: pkgName, - percentage: updatedPercentage, - }); -} - -export function sendPkgChecksumResult( - pkgName: string, - updatedChecksumResult: boolean -) { - SetupPanel.postMessage({ - command: "updatePkgChecksumResult", - id: pkgName, - hashResult: updatedChecksumResult, - }); -} - -export function sendPkgDownloadDetail(pkgName: string, updatedDetail: string) { - SetupPanel.postMessage({ - command: "updatePkgDownloadDetail", - id: pkgName, - progressDetail: updatedDetail, - }); -} - -export function sendPkgDownloadFailed(pkgName: string, failedFlag: boolean) { - SetupPanel.postMessage({ - command: "updatePkgDownloadFailed", - id: pkgName, - hasFailed: failedFlag, - }); -} - -export function sendIdfGitDownloadProgress( - id: string, - updatedPercentage: string -) { - SetupPanel.postMessage({ - command: "updateIdfGitDownloadPercentage", - id, - percentage: updatedPercentage, - }); -} - -export function sendIdfGitDownloadDetail(id: string, updatedDetail: string) { - SetupPanel.postMessage({ - command: "updateIdfGitDownloadDetail", - detail: updatedDetail, - id, - }); -} - -export function sendIdfPythonDownloadProgress( - id: string, - updatedPercentage: string -) { - SetupPanel.postMessage({ - command: "updateIdfPythonDownloadPercentage", - id, - percentage: updatedPercentage, - }); -} - -export function sendIdfPythonDownloadDetail(id: string, updatedDetail: string) { - SetupPanel.postMessage({ - command: "updateIdfPythonDownloadDetail", - detail: updatedDetail, - id, - }); -} \ No newline at end of file diff --git a/src/statusBar/index.ts b/src/statusBar/index.ts index 3844b928d..cc5e0cdcd 100644 --- a/src/statusBar/index.ts +++ b/src/statusBar/index.ts @@ -28,13 +28,13 @@ import { l10n, ThemeColor, } from "vscode"; -import { getCurrentIdfSetup } from "../versionSwitcher"; import { readParameter } from "../idfConfiguration"; import { ESP } from "../config"; import { CommandItem } from "../cmdTreeView/cmdTreeDataProvider"; import { CommandKeys, createCommandDictionary } from "../cmdTreeView/cmdStore"; import { getIdfTargetFromSdkconfig } from "../workspaceConfig"; import { pathExists } from "fs-extra"; +import { getEspIdfFromCMake } from "../utils"; export const statusBarItems: { [key: string]: StatusBarItem } = {}; @@ -74,8 +74,9 @@ export async function createCmdsStatusBarItems(workspaceFolder: Uri) { ESP.ProjectConfiguration.PROJECT_CONFIGURATION_FILENAME ); let projectConfExists = await pathExists(projectConfPath); - - let currentIdfVersion = await getCurrentIdfSetup(workspaceFolder, false); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); statusBarItems["workspace"] = createStatusBarItem( `$(${commandDictionary[CommandKeys.pickWorkspace].iconId})`, @@ -85,10 +86,11 @@ export async function createCmdsStatusBarItems(workspaceFolder: Uri) { commandDictionary[CommandKeys.pickWorkspace].checkboxState ); + const idfVersion = await getEspIdfFromCMake(currentEnvVars["IDF_PATH"]); statusBarItems["currentIdfVersion"] = createStatusBarItem( `$(${ commandDictionary[CommandKeys.SelectCurrentIdfVersion].iconId - }) ESP-IDF v${currentIdfVersion.version}`, + }) ESP-IDF v${idfVersion}`, commandDictionary[CommandKeys.SelectCurrentIdfVersion].tooltip, CommandKeys.SelectCurrentIdfVersion, 103, diff --git a/src/support/checkExtensionRequirements.ts b/src/support/checkExtensionRequirements.ts deleted file mode 100644 index 536d5f6d6..000000000 --- a/src/support/checkExtensionRequirements.ts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Wednesday, 30th December 2020 4:47:28 pm - * Copyright 2020 Espressif Systems (Shanghai) CO LTD - *  - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *  - * http://www.apache.org/licenses/LICENSE-2.0 - *  - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { join } from "path"; -import * as vscode from "vscode"; -import { reportObj } from "./types"; -import { checkRequirements } from "./checkEspIdfRequirements"; - -export async function checkDebugAdapterRequirements( - reportedResult: reportObj, - context: vscode.ExtensionContext -) { - try { - const requirementsPath = join( - context.extensionPath, - "esp_debug_adapter", - "requirements.txt" - ); - const result = await checkRequirements( - context, - reportedResult, - requirementsPath - ); - reportedResult.debugAdapterRequirements.output = result; - reportedResult.debugAdapterRequirements.result = result; - } catch (error) { - reportedResult.debugAdapterRequirements.result = "Error"; - reportedResult.latestError = error; - } -} diff --git a/src/support/checkIdfSetups.ts b/src/support/checkIdfSetups.ts new file mode 100644 index 000000000..f7399a055 --- /dev/null +++ b/src/support/checkIdfSetups.ts @@ -0,0 +1,38 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Tuesday, 1st April 2025 4:57:08 pm + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Uri } from "vscode"; +import { getIdfSetups } from "../eim/getExistingSetups"; +import { isIdfSetupValid } from "../eim/verifySetup"; +import { reportObj } from "./types"; + +export async function checkIDFSetups(reportedResult: reportObj, workspaceFolder: Uri) { + const idfSetups = await getIdfSetups(workspaceFolder); + + for (const idfSetup of idfSetups) { + const extendedIdfSetup = { + ...idfSetup, + reason: "", + }; + [extendedIdfSetup.isValid, extendedIdfSetup.reason] = await isIdfSetupValid( + idfSetup, + false + ); + reportedResult.espIdfSetups.push(extendedIdfSetup); + } +} diff --git a/src/support/checkSpacesInSettings.ts b/src/support/checkSpacesInSettings.ts index 0109b4be1..47f17c419 100644 --- a/src/support/checkSpacesInSettings.ts +++ b/src/support/checkSpacesInSettings.ts @@ -40,10 +40,6 @@ export function checkSpacesInSettings(reportedResult: reportObj) { reportedResult.configurationSettings.espHomeKitPath ); - reportedResult.configurationSpacesValidation.sysPythonBinPath = checkSpacesInPath( - reportedResult.configurationSettings.sysPythonBinPath - ); - reportedResult.configurationSpacesValidation.pythonBinPath = checkSpacesInPath( reportedResult.configurationSettings.pythonBinPath ); diff --git a/src/support/configurationAccess.ts b/src/support/configurationAccess.ts index 5b9db7e06..4871433ab 100644 --- a/src/support/configurationAccess.ts +++ b/src/support/configurationAccess.ts @@ -50,10 +50,6 @@ export async function getConfigurationAccess( reportedResult.configurationSettings.espHomeKitPath, constants.R_OK ); - reportedResult.configurationAccess.sysPythonBinPath = canAccessFile( - reportedResult.configurationSettings.sysPythonBinPath, - constants.X_OK - ); reportedResult.configurationAccess.pythonBinPath = canAccessFile( reportedResult.configurationSettings.pythonBinPath, constants.X_OK diff --git a/src/support/configurationSettings.ts b/src/support/configurationSettings.ts index dbb6567a9..6fced2336 100644 --- a/src/support/configurationSettings.ts +++ b/src/support/configurationSettings.ts @@ -16,10 +16,9 @@ * limitations under the License. */ import { join } from "path"; -import { IdfToolsManager } from "../idfToolsManager"; -import { getEnvVarsFromIdfTools, getPythonEnvPath } from "../pythonManager"; import { reportObj } from "./types"; import { Uri, workspace } from "vscode"; +import { ESP } from "../config"; export async function getConfigurationSettings( reportedResult: reportObj, @@ -30,69 +29,49 @@ export async function getConfigurationSettings( reportedResult.workspaceFolder = scope ? scope.fsPath : "No workspace folder is open"; - const idfToolsManager = await IdfToolsManager.createIdfToolsManager( - conf.get("idf.espIdfPath" + winFlag) - ); - const extraPaths = await idfToolsManager.exportPathsInString( - join(conf.get("idf.toolsPath" + winFlag), "tools"), - ["cmake", "ninja"] - ); - const customVars = await idfToolsManager.exportVars( - join(conf.get("idf.toolsPath" + winFlag), "tools") - ); - const pythonVenvPath = await getPythonEnvPath( - conf - .get("idf.espIdfPath" + winFlag) - .replace("${env:IDF_PATH}", process.env.IDF_PATH), - conf - .get("idf.toolsPath" + winFlag) - .replace("${env:IDF_TOOLS_PATH}", process.env.IDF_TOOLS_PATH), - conf.get("idf.pythonInstallPath") - ); + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); - const idfToolsExportVars = await getEnvVarsFromIdfTools( - conf - .get("idf.espIdfPath" + winFlag) - .replace("${env:IDF_PATH}", process.env.IDF_PATH), - conf - .get("idf.toolsPath" + winFlag) - .replace("${env:IDF_TOOLS_PATH}", process.env.IDF_TOOLS_PATH), - pythonVenvPath - ); + const customExtraVars = conf.get("idf.customExtraVars") as { + [key: string]: string; + }; + const idfPathDir = currentEnvVars["IDF_PATH"] || process.env.IDF_PATH; + const idfToolsPath = + currentEnvVars["IDF_TOOLS_PATH"] || process.env.IDF_TOOLS_PATH; - if (idfToolsExportVars) { - for (const envVar in idfToolsExportVars) { - if (envVar) { - customVars[envVar] = idfToolsExportVars[envVar]; - } - } - } + const pyDir = + process.platform === "win32" + ? ["Scripts", "python.exe"] + : ["bin", "python3"]; + const idfPythonEnvPath = + currentEnvVars["IDF_PYTHON_ENV_PATH"] || process.env.IDF_PYTHON_ENV_PATH; + const venvPythonPath = join(idfPythonEnvPath, ...pyDir); reportedResult.configurationSettings = { - espAdfPath: conf.get("idf.espAdfPath" + winFlag), - espIdfPath: conf.get("idf.espIdfPath" + winFlag), - espMdfPath: conf.get("idf.espMdfPath" + winFlag), - espMatterPath: conf.get("idf.espMatterPath"), - espHomeKitPath: conf.get("idf.espHomeKitSdkPath" + winFlag), + espAdfPath: customExtraVars["ADF_PATH"], + espIdfPath: idfPathDir, + espMdfPath: customExtraVars["MDF_PATH"], + espMatterPath: customExtraVars["ESP_MATTER_PATH"], + espHomeKitPath: customExtraVars["HOMEKIT_PATH"], customTerminalExecutable: conf.get("idf.customTerminalExecutable"), customTerminalExecutableArgs: conf.get("idf.customTerminalExecutableArgs"), flashType: conf.get("idf.flashType"), flashPartitionToUse: conf.get("idf.flashPartitionToUse"), - customExtraPaths: extraPaths, - idfExtraVars: customVars, - userExtraVars: conf.get("idf.customExtraVars"), + customExtraPaths: currentEnvVars["PATH"], + idfExtraVars: currentEnvVars, + userExtraVars: customExtraVars, notificationMode: conf.get("idf.notificationMode"), - pythonBinPath: pythonVenvPath, + pythonBinPath: venvPythonPath, pythonPackages: [], serialPort: conf.get("idf.port" + winFlag), openOCDDebugLevel: conf.get("idf.openOcdDebugLevel") || "2", openOcdConfigs: conf.get("idf.openOcdConfigs") || [], openOcdLaunchArgs: conf.get("idf.openOcdLaunchArgs") || [], - toolsPath: conf.get("idf.toolsPath" + winFlag), + toolsPath: idfToolsPath, systemEnvPath: process.platform === "win32" ? process.env.Path : process.env.PATH, - sysPythonBinPath: conf.get("idf.pythonInstallPath"), gitPath: conf.get("idf.gitPath" + winFlag), }; } diff --git a/src/support/index.ts b/src/support/index.ts index 487cec995..4b7df376b 100644 --- a/src/support/index.ts +++ b/src/support/index.ts @@ -27,7 +27,6 @@ import { getPipVersion } from "./pipVersion"; import { getPythonPackages } from "./pythonPackages"; import { checkEspIdfTools } from "./checkEspIdfTools"; import { checkEspIdfRequirements } from "./checkEspIdfRequirements"; -import { checkDebugAdapterRequirements } from "./checkExtensionRequirements"; import { writeTextReport } from "./writeReport"; import { checkSystemInfo } from "./checkSystemInfo"; import { checkCCppPropertiesJson, checkLaunchJson } from "./checkVscodeFiles"; @@ -36,28 +35,98 @@ import { getProjectConfigurations, getSelectedProjectConfiguration, } from "./projectConfiguration"; +import { checkIDFSetups } from "./checkIdfSetups"; export async function generateConfigurationReport( context: vscode.ExtensionContext, currentWorkspace: vscode.Uri, - reportedResult: reportObj + reportedResult: reportObj, + progress: vscode.Progress<{ message: string; increment: number }> ) { + progress.report({ + message: "Generating configuration report...", + increment: 0, + }); await getConfigurationSettings(reportedResult, currentWorkspace); + progress.report({ + message: "Checking system information...", + increment: 7, + }); await checkSystemInfo(reportedResult); + progress.report({ + message: "Checking configuration access...", + increment: 13, + }); await getConfigurationAccess(reportedResult, context); + progress.report({ + message: "Checking spaces in settings...", + increment: 20, + }); checkSpacesInSettings(reportedResult); + progress.report({ + message: "Checking git version...", + increment: 27, + }); await getGitVersion(reportedResult, context); + progress.report({ + message: "Checking ESP-IDF version...", + increment: 33, + }); await getEspIdfVersion(reportedResult); + progress.report({ + message: "Checking Python version...", + increment: 40, + }); await getPythonVersion(reportedResult, context); + progress.report({ + message: "Checking pip version...", + increment: 47, + }); await getPipVersion(reportedResult, context); + progress.report({ + message: "Checking Python packages...", + increment: 53, + }); await getPythonPackages(reportedResult, context); + progress.report({ + message: "Checking ESP-IDF tools...", + increment: 60, + }); await checkEspIdfTools(reportedResult, context); + progress.report({ + message: "Checking ESP-IDF requirements...", + increment: 67, + }); await checkEspIdfRequirements(reportedResult, context); - await checkDebugAdapterRequirements(reportedResult, context); + progress.report({ + message: "Checking Visual Studio Code files...", + increment: 73, + }); await checkLaunchJson(reportedResult, currentWorkspace); + progress.report({ + message: "Checking C/C++ properties...", + increment: 80, + }); await checkCCppPropertiesJson(reportedResult, currentWorkspace); + progress.report({ + message: "Checking project configurations...", + increment: 87, + }); getProjectConfigurations(reportedResult); + progress.report({ + message: "Getting selected project configuration...", + increment: 93, + }); getSelectedProjectConfiguration(reportedResult); + progress.report({ + message: "Checking ESP-IDF setups...", + increment: 97, + }); + await checkIDFSetups(reportedResult, currentWorkspace); + progress.report({ + message: "Generating report...", + increment: 100, + }); const reportOutput = await writeTextReport(reportedResult, context); await vscode.env.clipboard.writeText(reportOutput); reportedResult.formatedOutput = reportOutput; diff --git a/src/support/initReportObj.ts b/src/support/initReportObj.ts index b3fa43727..a2e1b2c30 100644 --- a/src/support/initReportObj.ts +++ b/src/support/initReportObj.ts @@ -37,7 +37,6 @@ export function initializeReportObject() { pythonBinPath: undefined, pythonPackages: undefined, serialPort: undefined, - sysPythonBinPath: undefined, openOcdConfigs: undefined, openOCDDebugLevel: undefined, openOcdLaunchArgs: undefined, @@ -56,7 +55,6 @@ export function initializeReportObject() { cmakeInEnv: undefined, ninjaInEnv: undefined, toolsPath: undefined, - sysPythonBinPath: undefined, }; report.configurationSpacesValidation = { customExtraPaths: undefined, @@ -69,12 +67,8 @@ export function initializeReportObject() { pythonBinPath: undefined, toolsPath: undefined, systemEnvPath: undefined, - sysPythonBinPath: undefined, - }; - report.debugAdapterRequirements = { - output: undefined, - result: undefined, }; + report.espIdfSetups = []; report.espIdfToolsVersions = undefined; report.espIdfVersion = { output: undefined, diff --git a/src/support/projectConfiguration.ts b/src/support/projectConfiguration.ts index d5865e196..87beb3481 100644 --- a/src/support/projectConfiguration.ts +++ b/src/support/projectConfiguration.ts @@ -20,7 +20,7 @@ import { ESP } from "../config"; import { ProjectConfElement } from "../project-conf/projectConfiguration"; import { reportObj } from "./types"; -export async function getProjectConfigurations(reportedResult: reportObj) { +export function getProjectConfigurations(reportedResult: reportObj) { const currentProjectConfKey = ESP.ProjectConfiguration.store.get( ESP.ProjectConfiguration.SELECTED_CONFIG ); diff --git a/src/support/troubleshootPanel.ts b/src/support/troubleshootPanel.ts index ee8610958..61997b9da 100644 --- a/src/support/troubleshootPanel.ts +++ b/src/support/troubleshootPanel.ts @@ -141,12 +141,12 @@ export class TroubleshootingPanel { { cancellable: false, location: progressLoc, - title: l10n.t("ESP-IDF: Preparing ESP-IDF extension report"), + title: l10n.t("ESP-IDF Doctor"), }, async (progress: Progress<{ message: string; increment: number }>) => { const reportedResult = initializeReportObject(); try { - await generateConfigurationReport(context, workspace, reportedResult); + await generateConfigurationReport(context, workspace, reportedResult, progress); const reportOutput = await writeTextReport(reportedResult, context); troubleshootOutput += reportOutput; await env.clipboard.writeText(troubleshootOutput); diff --git a/src/support/types.ts b/src/support/types.ts index d6ed11c24..180677059 100644 --- a/src/support/types.ts +++ b/src/support/types.ts @@ -16,6 +16,7 @@ * limitations under the License. */ +import { IdfSetup } from "../eim/types"; import { ProjectConfElement } from "../project-conf/projectConfiguration"; export class ConfigurationAccess { @@ -29,7 +30,6 @@ export class ConfigurationAccess { cmakeInEnv: boolean; ninjaInEnv: boolean; toolsPath: boolean; - sysPythonBinPath: boolean; } export class Configuration { systemEnvPath: string; @@ -47,7 +47,6 @@ export class Configuration { pythonBinPath: string; pythonPackages: pyPkgVersion[]; serialPort: string; - sysPythonBinPath: string; openOcdLaunchArgs: string[]; openOcdConfigs: string[]; openOCDDebugLevel: string; @@ -66,7 +65,6 @@ export class ConfigurationSpacesValidation { espHomeKitPath: boolean; customExtraPaths: { [key: string]: boolean }; pythonBinPath: boolean; - sysPythonBinPath: boolean; toolsPath: boolean; gitPath: boolean; } @@ -95,7 +93,7 @@ export class idfToolResult { actual: string; doesToolExist: boolean; expected: string; - id: string; + name: string; } export class execResult { @@ -103,10 +101,15 @@ export class execResult { result: string; } +export interface ExtendedIdfSetup extends IdfSetup { + reason: string; +} + export class reportObj { configurationSettings: Configuration; configurationAccess: ConfigurationAccess; configurationSpacesValidation: ConfigurationSpacesValidation; + espIdfSetups: ExtendedIdfSetup[]; espIdfToolsVersions: idfToolResult[]; espIdfVersion: execResult; gitVersion: execResult; @@ -118,7 +121,6 @@ export class reportObj { pythonVersion: execResult; pythonPackages: execResult; idfCheckRequirements: execResult; - debugAdapterRequirements: execResult; formatedOutput: string; selectedProjectConfiguration: string; systemInfo: SystemInfo; diff --git a/src/support/writeReport.ts b/src/support/writeReport.ts index ac4a49416..08145ad8d 100644 --- a/src/support/writeReport.ts +++ b/src/support/writeReport.ts @@ -41,17 +41,17 @@ export async function writeTextReport( output += `ESP-IDF Extension version ${reportedResult.systemInfo.extensionVersion} ${EOL}`; output += `Workspace folder ${reportedResult.workspaceFolder} ${EOL}`; output += `---------------------------------------------------- Extension configuration settings ------------------------------------------------------${EOL}`; - output += `ESP-ADF Path (idf.espAdfPath) ${reportedResult.configurationSettings.espAdfPath}${EOL}`; - output += `ESP-IDF Path (idf.espIdfPath) ${reportedResult.configurationSettings.espIdfPath}${EOL}`; - output += `ESP-MDF Path (idf.espMdfPath) ${reportedResult.configurationSettings.espMdfPath}${EOL}`; - output += `ESP-Matter Path (idf.espMatterPath) ${reportedResult.configurationSettings.espMatterPath}${EOL}`; - output += `ESP-HomeKit-SDK Path (idf.espHomeKitSdkPath) ${reportedResult.configurationSettings.espHomeKitPath}${EOL}`; + output += `ESP-ADF Path (idf.customExtraVars["ADF_PATH"]) ${reportedResult.configurationSettings.espAdfPath}${EOL}`; + output += `ESP-IDF Path (Project setup IDF_PATH) ${reportedResult.configurationSettings.espIdfPath}${EOL}`; + output += `ESP-MDF Path (idf.customExtraVars["MDF_PATH"]) ${reportedResult.configurationSettings.espMdfPath}${EOL}`; + output += `ESP-Matter Path (idf.customExtraVars["ESP_MATTER_PATH"]) ${reportedResult.configurationSettings.espMatterPath}${EOL}`; + output += `ESP-HomeKit-SDK Path (idf.customExtraVars["HOMEKIT_PATH"]) ${reportedResult.configurationSettings.espHomeKitPath}${EOL}`; output += `Custom extra paths ${reportedResult.configurationSettings.customExtraPaths}${EOL}`; if ( reportedResult.configurationSettings.idfExtraVars && Object.keys(reportedResult.configurationSettings.idfExtraVars) ) { - output += `ESP-IDF extra vars${EOL}`; + output += `ESP-IDF Project Setup Variables${EOL}`; for (let key in reportedResult.configurationSettings.idfExtraVars) { output += ` ${key}: ${reportedResult.configurationSettings.idfExtraVars[key]}${EOL}`; } @@ -65,13 +65,12 @@ export async function writeTextReport( output += ` ${key}: ${reportedResult.configurationSettings.userExtraVars[key]}${EOL}`; } } - output += `System python Path (idf.pythonInstallPath) ${reportedResult.configurationSettings.sysPythonBinPath}${EOL}`; output += `Virtual environment Python path (computed) ${reportedResult.configurationSettings.pythonBinPath}${EOL}`; output += `Serial port (idf.port) ${reportedResult.configurationSettings.serialPort}${EOL}`; output += `OpenOCD Configs (idf.openOcdConfigs) ${reportedResult.configurationSettings.openOcdConfigs}${EOL}`; output += `OpenOCD log level (idf.openOcdDebugLevel) ${reportedResult.configurationSettings.openOCDDebugLevel}${EOL}`; output += `OpenOCD launch arguments (idf.openOcdLaunchArgs) ${reportedResult.configurationSettings.openOcdLaunchArgs}${EOL}`; - output += `ESP-IDF Tools Path (idf.toolsPath) ${reportedResult.configurationSettings.toolsPath}${EOL}`; + output += `ESP-IDF Tools Path ${reportedResult.configurationSettings.toolsPath}${EOL}`; output += `Git Path (idf.gitPath) ${reportedResult.configurationSettings.gitPath}${EOL}`; output += `Notification Mode (idf.notificationMode) ${reportedResult.configurationSettings.notificationMode}${EOL}`; output += `Flash type (idf.flashType) ${reportedResult.configurationSettings.flashType}${EOL}`; @@ -86,35 +85,33 @@ export async function writeTextReport( output += `Custom terminal executable args (idf.customTerminalExecutableArgs)${reportedResult.configurationSettings.customTerminalExecutableArgs}${EOL}`; } output += `-------------------------------------------------------- Configurations access -------------------------------------------------------------${EOL}`; - output += `Access to ESP-ADF Path (idf.espAdfPath) ${reportedResult.configurationAccess.espAdfPath}${EOL}`; - output += `Access to ESP-IDF Path (idf.espIdfPath) ${reportedResult.configurationAccess.espIdfPath}${EOL}`; - output += `Access to ESP-MDF Path (idf.espMdfPath) ${reportedResult.configurationAccess.espMdfPath}${EOL}`; - output += `Access to ESP-Matter Path (idf.espMatterPath) ${reportedResult.configurationAccess.espMatterPath}${EOL}`; - output += `Access to ESP-HomeKit Path (idf.espHomeKitSdkPath) ${reportedResult.configurationAccess.espHomeKitPath}${EOL}`; + output += `Access to ESP-ADF Path (idf.customExtraVars["ADF_PATH"]) ${reportedResult.configurationAccess.espAdfPath}${EOL}`; + output += `Access to ESP-IDF Path (Project setup IDF_PATH) ${reportedResult.configurationAccess.espIdfPath}${EOL}`; + output += `Access to ESP-MDF Path (idf.customExtraVars["MDF_PATH"]) ${reportedResult.configurationAccess.espMdfPath}${EOL}`; + output += `Access to ESP-Matter Path (idf.customExtraVars["ESP_MATTER_PATH"]) ${reportedResult.configurationAccess.espMatterPath}${EOL}`; + output += `Access to ESP-HomeKit Path (idf.customExtraVars["HOMEKIT_PATH"]) ${reportedResult.configurationAccess.espHomeKitPath}${EOL}`; output += `Access to ESP-IDF Custom extra paths${EOL}`; for (let key in reportedResult.configurationAccess.espIdfToolsPaths) { output += `Access to ${key}: ${reportedResult.configurationAccess.espIdfToolsPaths[key]}${EOL}`; } - output += `Access to System python Path (idf.pythonInstallPath) ${reportedResult.configurationAccess.sysPythonBinPath}${EOL}`; output += `Access to Virtual environment Python path (computed) ${reportedResult.configurationAccess.pythonBinPath}${EOL}`; output += `Access to CMake in environment PATH ${reportedResult.configurationAccess.cmakeInEnv}${EOL}`; output += `Access to Ninja in environment PATH ${reportedResult.configurationAccess.ninjaInEnv}${EOL}`; - output += `Access to ESP-IDF Tools Path (idf.toolsPath) ${reportedResult.configurationAccess.toolsPath}${EOL}`; + output += `Access to ESP-IDF Tools Path ${reportedResult.configurationAccess.toolsPath}${EOL}`; output += `-------------------------------------------------------- Configurations has spaces -------------------------------------------------------------${EOL}`; output += `Spaces in system environment Path ${reportedResult.configurationSpacesValidation.systemEnvPath}${EOL}`; - output += `Spaces in ESP-ADF Path (idf.espAdfPath) ${reportedResult.configurationSpacesValidation.espAdfPath}${EOL}`; - output += `Spaces in ESP-IDF Path (idf.espIdfPath) ${reportedResult.configurationSpacesValidation.espIdfPath}${EOL}`; - output += `Spaces in ESP-MDF Path (idf.espMdfPath) ${reportedResult.configurationSpacesValidation.espMdfPath}${EOL}`; - output += `Spaces in ESP-Matter Path (idf.espMatterPath) ${reportedResult.configurationSpacesValidation.espMatterPath}${EOL}`; - output += `Spaces in ESP-HomeKit-SDK Path (idf.espHomeKitSdkPath) ${reportedResult.configurationSpacesValidation.espHomeKitPath}${EOL}`; + output += `Spaces in ESP-ADF Path (idf.customExtraVars["ADF_PATH"]) ${reportedResult.configurationSpacesValidation.espAdfPath}${EOL}`; + output += `Spaces in ESP-IDF Path (Project setup IDF_PATH) ${reportedResult.configurationSpacesValidation.espIdfPath}${EOL}`; + output += `Spaces in ESP-MDF Path (idf.customExtraVars["MDF_PATH"]) ${reportedResult.configurationSpacesValidation.espMdfPath}${EOL}`; + output += `Spaces in ESP-Matter Path (idf.customExtraVars["ESP_MATTER_PATH"]) ${reportedResult.configurationSpacesValidation.espMatterPath}${EOL}`; + output += `Spaces in ESP-HomeKit-SDK Path (idf.customExtraVars["HOMEKIT_PATH"]) ${reportedResult.configurationSpacesValidation.espHomeKitPath}${EOL}`; output += `Spaces in ESP-IDF Custom extra paths${EOL}`; for (let key in reportedResult.configurationSpacesValidation .customExtraPaths) { output += `Spaces in ${key}: ${reportedResult.configurationSpacesValidation.customExtraPaths[key]}${EOL}`; } - output += `Spaces in System python Path (idf.pythonInstallPath) ${reportedResult.configurationSpacesValidation.sysPythonBinPath}${EOL}`; output += `Spaces in Virtual environment Python path (computed) ${reportedResult.configurationSpacesValidation.pythonBinPath}${EOL}`; - output += `Spaces in ESP-IDF Tools Path (idf.toolsPath) ${reportedResult.configurationSpacesValidation.toolsPath}${EOL}`; + output += `Spaces in ESP-IDF Tools Path ${reportedResult.configurationSpacesValidation.toolsPath}${EOL}`; output += `----------------------------------------------------------- Executables Versions -----------------------------------------------------------${EOL}`; output += `Git version ${ reportedResult.gitVersion.result @@ -195,12 +192,27 @@ export async function writeTextReport( ? reportedResult.idfCheckRequirements.result : reportedResult.idfCheckRequirements.output }${EOL}`; - output += `---------------------------------------------------- Check ESP-IDF debug adapter requirements.txt ------------------------------------------${EOL}`; - output += `Check Debug AdapterPython packages ${ - reportedResult.debugAdapterRequirements.result - ? reportedResult.debugAdapterRequirements.result - : reportedResult.debugAdapterRequirements.output - }${EOL}`; + if (reportedResult.espIdfSetups) { + output += `---------------------------------------------------- ESP-IDF Setups ------------------------------------------------------------------------${EOL}`; + for (const idfSetup of reportedResult.espIdfSetups) { + output += `ESP-IDF setup IDF PATH: ${idfSetup.idfPath}${EOL}`; + output += `------- git path: ${idfSetup.gitPath}${EOL}`; + output += `------- IDF_TOOLS_PATH: ${idfSetup.toolsPath}${EOL}`; + output += `------- version: ${idfSetup.version}${EOL}`; + output += `------- python path: ${idfSetup.python}${EOL}`; + if (idfSetup.sysPythonPath) { + output += `------- system python path: ${idfSetup.sysPythonPath}${EOL}`; + } + if (idfSetup.activationScript) { + output += `------- activation script path: ${idfSetup.sysPythonPath}${EOL}`; + } + output += `------- is valid? ${idfSetup.isValid}${EOL}`; + if (idfSetup.reason) { + output += `------- reason: ${idfSetup.reason}${EOL}`; + } + output += `--------------------------------------------------------${EOL}`; + } + } if (reportedResult.launchJson) { output += `---------------------------------------------------- Visual Studio Code launch.json --------------------------------------------------------${EOL}`; output += `${reportedResult.launchJson} ${EOL}`; diff --git a/src/taskManager/customExecution.ts b/src/taskManager/customExecution.ts index ed31c4bcf..82f0b4ea8 100644 --- a/src/taskManager/customExecution.ts +++ b/src/taskManager/customExecution.ts @@ -17,7 +17,12 @@ */ import * as vscode from "vscode"; -import * as childProcess from "child_process"; +import { + ChildProcess, + execFile as originalExecFile, + ExecFileOptions, + spawn, +} from "child_process"; export interface CustomExecutionTaskResult { continueFlag: boolean; @@ -78,12 +83,12 @@ export class OutputCapturingExecution extends vscode.CustomExecution { private resolveOutput: ((output: CapturedTaskOutput) => void) | undefined; private rejectOutput: ((error: Error) => void) | undefined; private writeEmitter: vscode.EventEmitter | undefined; - private childProcess: childProcess.ChildProcess | undefined; + private childProcess: ChildProcess | undefined; constructor( private command: string, private args: string[], - private options: childProcess.ExecFileOptions + private options: ExecFileOptions ) { super(async (resolvedDefinition) => { this.outputPromise = new Promise( @@ -114,11 +119,12 @@ export class OutputCapturingExecution extends vscode.CustomExecution { this.options.env.COLORTERM = "truecolor"; } - this.childProcess = childProcess.execFile( - this.command, - this.args, - this.options - ); + const execFile: ( + file: string, + args: readonly string[], + options: ExecFileOptions + ) => ChildProcess = originalExecFile; + this.childProcess = execFile(this.command, this.args, this.options); // Stream stdout in real-time this.childProcess.stdout?.on("data", (data: Buffer) => { @@ -182,7 +188,7 @@ export class OutputCapturingExecution extends vscode.CustomExecution { public static create( command: string, args: string[], - options: childProcess.ExecFileOptions + options: ExecFileOptions ): OutputCapturingExecution { return new OutputCapturingExecution(command, args, options); } @@ -193,7 +199,7 @@ export class ShellOutputCapturingExecution extends vscode.CustomExecution { private resolveOutput: ((output: CapturedTaskOutput) => void) | undefined; private rejectOutput: ((error: Error) => void) | undefined; private writeEmitter: vscode.EventEmitter | undefined; - private childProcess: childProcess.ChildProcess | undefined; + private childProcess: ChildProcess | undefined; constructor( private command: string, @@ -241,7 +247,7 @@ export class ShellOutputCapturingExecution extends vscode.CustomExecution { execOptions.shellArgs = this.options.shellArgs; } - this.childProcess = childProcess.spawn( + this.childProcess = spawn( this.options.executable || process.env.SHELL || "sh", this.options.shellArgs || [], { diff --git a/src/test/adapter.test.ts b/src/test/adapter.test.ts deleted file mode 100644 index 7b428b292..000000000 --- a/src/test/adapter.test.ts +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Wednesday, 5th June 2019 2:03:34 pm - * Copyright 2019 Espressif Systems (Shanghai) CO LTD - *  - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *  - * http://www.apache.org/licenses/LICENSE-2.0 - *  - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from "assert"; -import * as path from "path"; -import { EspIdfDebugClient } from "./espIdfDebugClient"; - -suite("Debug Adapter Tests", () => { - const DEBUG_ADAPTER = path.join( - __dirname, - "..", - "..", - "esp_debug_adapter", - "debug_adapter_main.py" - ); - const portToUse = 43474; // To use in server mode, i.e. start debug adapter yourself - - let debugClient: EspIdfDebugClient; - - setup((done) => { - debugClient = new EspIdfDebugClient( - "python", - ["-u", DEBUG_ADAPTER, "--developer-mode", "connection-check"], - "espidf", - { cwd: __dirname }, - true - ); - // Use portToUse here to attach to existing server. May be easier to debug initially - debugClient.startClient().then(() => done()); - }); - - suite("initialize", () => { - test("should return supported features", async () => { - const initArgs = { - adapterID: "espidf", - clientID: "vscode", - columnsStartAt1: true, - linesStartAt1: true, - }; - await debugClient.initializeRequest(initArgs).then((response) => { - response.body = response.body || {}; - assert.equal(response.body.supportsConfigurationDoneRequest, true); - }); - }).timeout(10000); - }); -}); diff --git a/src/test/doctor.test.ts b/src/test/doctor.test.ts index 6f8dd9194..1e65fb6b9 100644 --- a/src/test/doctor.test.ts +++ b/src/test/doctor.test.ts @@ -31,7 +31,6 @@ import { getConfigurationSettings } from "../support/configurationSettings"; import { readFile, readJSON } from "fs-extra"; import { getPipVersion } from "../support/pipVersion"; import { checkEspIdfRequirements } from "../support/checkEspIdfRequirements"; -import { checkDebugAdapterRequirements } from "../support/checkExtensionRequirements"; import { checkCCppPropertiesJson, checkLaunchJson, @@ -39,6 +38,9 @@ import { import { getPythonPackages } from "../support/pythonPackages"; import { getGitVersion } from "../support/gitVersion"; import { writeTextReport } from "../support/writeReport"; +import { ProjectConfigStore } from "../project-conf"; +import { createMockMemento } from "./mockUtils"; +import { Logger } from "../logger/logger"; suite("Doctor Command tests", () => { const reportObj = initializeReportObject(); @@ -46,7 +48,11 @@ suite("Doctor Command tests", () => { const mockUpContext: vscode.ExtensionContext = { extensionPath: resolve(__dirname, "..", ".."), asAbsolutePath: absPath, + workspaceState: createMockMemento(), + globalState: createMockMemento(), } as vscode.ExtensionContext; + Logger.init(mockUpContext); + ESP.ProjectConfiguration.store = ProjectConfigStore.init(mockUpContext); setup(async () => { setExtensionContext(mockUpContext); }); @@ -72,9 +78,9 @@ suite("Doctor Command tests", () => { assert.equal(reportObj.systemInfo.appName, vscode.env.appName); }); - test("Wrong access to ESP-IDF path", () => { + test("Wrong access to ESP-IDF path", async () => { reportObj.configurationSettings.espIdfPath = "/some/non-existing-path"; - getConfigurationAccess(reportObj, mockUpContext); + await getConfigurationAccess(reportObj, mockUpContext); assert.equal(reportObj.configurationAccess.espIdfPath, false); }); @@ -84,9 +90,9 @@ suite("Doctor Command tests", () => { assert.equal(reportObj.espIdfVersion.result, "x.x"); }); - test("Wrong access to Python path", () => { + test("Wrong access to Python path", async () => { reportObj.configurationSettings.pythonBinPath = "/some/non-existing-path"; - getConfigurationAccess(reportObj, mockUpContext); + await getConfigurationAccess(reportObj, mockUpContext); assert.equal(reportObj.configurationAccess.pythonBinPath, false); }); @@ -102,12 +108,6 @@ suite("Doctor Command tests", () => { assert.equal(reportObj.pipVersion.result, "Not found"); }); - test("Wrong debug adapter py requirements", async () => { - reportObj.configurationSettings.pythonBinPath = "/my/wrong/python/path"; - await checkDebugAdapterRequirements(reportObj, mockUpContext); - assert.equal(reportObj.debugAdapterRequirements.result, "Error"); - }); - test("Wrong esp-idf py requirements", async () => { reportObj.configurationSettings.pythonBinPath = "/my/wrong/python/path"; await checkEspIdfRequirements(reportObj, mockUpContext); @@ -146,18 +146,6 @@ suite("Doctor Command tests", () => { reportObj, vscode.Uri.file(join(__dirname, "../../testFiles/testWorkspace")) ); - assert.equal( - reportObj.configurationSettings.espAdfPath, - settingsJsonObj["idf.espAdfPath"] - ); - assert.equal( - reportObj.configurationSettings.espIdfPath, - settingsJsonObj["idf.espIdfPath"] - ); - assert.equal( - reportObj.configurationSettings.espMdfPath, - settingsJsonObj["idf.espMdfPath"] - ); assert.equal( reportObj.configurationSettings.serialPort, settingsJsonObj["idf.port"] @@ -166,36 +154,19 @@ suite("Doctor Command tests", () => { reportObj.configurationSettings.openOcdConfigs, settingsJsonObj["idf.openOcdConfigs"] ); - assert.equal( - reportObj.configurationSettings.toolsPath, - settingsJsonObj["idf.toolsPath"] - ); assert.equal( reportObj.configurationSettings.notificationMode, settingsJsonObj["idf.notificationMode"] ); }); - test("Good debug adapter py requirements", async () => { - reportObj.configurationSettings.pythonBinPath = `${process.env.IDF_PYTHON_ENV_PATH}/bin/python`; - reportObj.configurationSettings.espIdfPath = process.env.IDF_PATH; - await checkDebugAdapterRequirements(reportObj, mockUpContext); - assert.equal( - reportObj.debugAdapterRequirements.result, - `Python requirements from ${join( - __dirname, - "../../esp_debug_adapter/requirements.txt" - )} are satisfied.` - ); - }); - test("Good esp-idf py requirements", async () => { reportObj.configurationSettings.pythonBinPath = `${process.env.IDF_PYTHON_ENV_PATH}/bin/python`; reportObj.configurationSettings.espIdfPath = process.env.IDF_PATH; await checkEspIdfRequirements(reportObj, mockUpContext); assert.equal( reportObj.idfCheckRequirements.result, - `Python requirements from ${process.env.IDF_PATH}/requirements.txt are satisfied.` + `Python requirements are satisfied.` ); }); @@ -206,7 +177,7 @@ suite("Doctor Command tests", () => { delimiter + process.env.OLD_PATH, "" ); - getConfigurationAccess(reportObj, mockUpContext); + await getConfigurationAccess(reportObj, mockUpContext); assert.equal(reportObj.configurationAccess.pythonBinPath, true); assert.equal(reportObj.configurationAccess.espIdfPath, true); for (let toolPath in reportObj.configurationAccess.espIdfToolsPaths) { @@ -252,6 +223,12 @@ suite("Doctor Command tests", () => { ); }); + function replaceUserPathInStr(strReport: string) { + const escapedHome = process.env.HOME.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); + const re = new RegExp(escapedHome, "g"); + return strReport.replace(re, ""); + } + test("Match written report", async () => { const customExtraPaths = process.env.PATH.replace( delimiter + process.env.OLD_PATH, @@ -275,17 +252,17 @@ suite("Doctor Command tests", () => { expectedOutput += `ESP-IDF Extension version ${extensionObj.packageJSON.version} ${os.EOL}`; expectedOutput += `Workspace folder ${reportObj.workspaceFolder} ${os.EOL}`; expectedOutput += `---------------------------------------------------- Extension configuration settings ------------------------------------------------------${os.EOL}`; - expectedOutput += `ESP-ADF Path (idf.espAdfPath) ${reportObj.configurationSettings.espAdfPath}${os.EOL}`; - expectedOutput += `ESP-IDF Path (idf.espIdfPath) ${process.env.IDF_PATH}${os.EOL}`; - expectedOutput += `ESP-MDF Path (idf.espMdfPath) ${reportObj.configurationSettings.espMdfPath}${os.EOL}`; - expectedOutput += `ESP-Matter Path (idf.espMatterPath) ${reportObj.configurationSettings.espMatterPath}${os.EOL}`; - expectedOutput += `ESP-HomeKit-SDK Path (idf.espHomeKitSdkPath) ${reportObj.configurationSettings.espHomeKitPath}${os.EOL}`; + expectedOutput += `ESP-ADF Path (idf.customExtraVars["ADF_PATH"]) ${reportObj.configurationSettings.espAdfPath}${os.EOL}`; + expectedOutput += `ESP-IDF Path (Project setup IDF_PATH) ${process.env.IDF_PATH}${os.EOL}`; + expectedOutput += `ESP-MDF Path (idf.customExtraVars["MDF_PATH"]) ${reportObj.configurationSettings.espMdfPath}${os.EOL}`; + expectedOutput += `ESP-Matter Path (idf.customExtraVars["ESP_MATTER_PATH"]) ${reportObj.configurationSettings.espMatterPath}${os.EOL}`; + expectedOutput += `ESP-HomeKit-SDK Path (idf.customExtraVars["HOMEKIT_PATH"]) ${reportObj.configurationSettings.espHomeKitPath}${os.EOL}`; expectedOutput += `Custom extra paths ${customExtraPaths}${os.EOL}`; if ( reportObj.configurationSettings.idfExtraVars && Object.keys(reportObj.configurationSettings.idfExtraVars) ) { - expectedOutput += `ESP-IDF extra vars${os.EOL}`; + expectedOutput += `ESP-IDF Project Setup Variables${os.EOL}`; for (let key in reportObj.configurationSettings.idfExtraVars) { expectedOutput += ` ${key}: ${reportObj.configurationSettings.idfExtraVars[key]}${os.EOL}`; } @@ -299,7 +276,6 @@ suite("Doctor Command tests", () => { expectedOutput += ` ${key}: ${reportObj.configurationSettings.userExtraVars[key]}${os.EOL}`; } } - expectedOutput += `System python Path (idf.pythonInstallPath) ${reportObj.configurationSettings.sysPythonBinPath}${os.EOL}`; expectedOutput += `Virtual environment Python path (computed) ${ process.env.IDF_PYTHON_ENV_PATH + "/bin/python" }${os.EOL}`; @@ -307,11 +283,12 @@ suite("Doctor Command tests", () => { expectedOutput += `OpenOCD Configs (idf.openOcdConfigs) ${reportObj.configurationSettings.openOcdConfigs}${os.EOL}`; expectedOutput += `OpenOCD log level (idf.openOcdDebugLevel) ${reportObj.configurationSettings.openOCDDebugLevel}${os.EOL}`; expectedOutput += `OpenOCD launch arguments (idf.openOcdLaunchArgs) ${reportObj.configurationSettings.openOcdLaunchArgs}${os.EOL}`; - expectedOutput += `ESP-IDF Tools Path (idf.toolsPath) ${reportObj.configurationSettings.toolsPath}${os.EOL}`; + expectedOutput += `ESP-IDF Tools Path ${reportObj.configurationSettings.toolsPath}${os.EOL}`; expectedOutput += `Git Path (idf.gitPath) ${reportObj.configurationSettings.gitPath}${os.EOL}`; expectedOutput += `Notification Mode (idf.notificationMode) ${reportObj.configurationSettings.notificationMode}${os.EOL}`; expectedOutput += `Flash type (idf.flashType) ${reportObj.configurationSettings.flashType}${os.EOL}`; expectedOutput += `Flash partition to use (idf.flashPartitionToUse) ${reportObj.configurationSettings.flashPartitionToUse}${os.EOL}`; + expectedOutput = replaceUserPathInStr(expectedOutput); const actualReport = await writeTextReport(reportObj, mockUpContext); const subReport = actualReport.slice( 0, diff --git a/src/test/espIdfDebugClient.ts b/src/test/espIdfDebugClient.ts deleted file mode 100644 index 93c873963..000000000 --- a/src/test/espIdfDebugClient.ts +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Wednesday, 5th June 2019 2:03:34 pm - * Copyright 2019 Espressif Systems (Shanghai) CO LTD - *  - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *  - * http://www.apache.org/licenses/LICENSE-2.0 - *  - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as cp from "child_process"; -import * as net from "net"; -import { ProtocolClient } from "@vscode/debugadapter-testsupport/lib/protocolClient"; -import { DebugProtocol } from "@vscode/debugprotocol"; - -export class EspIdfDebugClient extends ProtocolClient { - private runtime: string; - private execArgs: string[]; - private adapterProcess: cp.ChildProcess; - private spawnOptions: cp.SpawnOptions; - private enableStderr: boolean; - private debugType: string; - private socket: net.Socket; - private defaultPort: number = 43474; - - constructor( - runtime: string, - execArgs: string[], - debugType: string, - spawnOptions: cp.SpawnOptions, - enableStderr: boolean, - defaultPort?: number - ) { - super(); - this.runtime = runtime; - this.execArgs = execArgs; - this.spawnOptions = spawnOptions; - this.enableStderr = enableStderr; - this.debugType = debugType; - if (defaultPort) { - this.defaultPort = defaultPort; - } - } - /** - * Starts a new debug adapter and sets up communication via stdin/stdout. - * When port number is specified, this class will not execute the debug adapter - * and it will connect to specified port directly. - */ - public startClient(port?: number): Promise { - return new Promise((resolve, reject) => { - if (typeof port === "number") { - this.socket = net.createConnection(port, "127.0.0.1", () => { - this.connect(this.socket, this.socket); - resolve(); - }); - } else { - this.adapterProcess = cp.spawn( - this.runtime, - this.execArgs, - this.spawnOptions - ); - const sanitize = (s: string) => s.toString().replace(/\r?\n$/gm, ""); - this.adapterProcess.stderr.on("data", (data: string) => { - // tslint:disable-next-line: no-console - console.log(data.toString()); - if (this.enableStderr) { - // tslint:disable-next-line: no-console - console.log(sanitize(data)); - } - }); - - this.adapterProcess.stdout.on("data", (data: Buffer) => { - // tslint:disable-next-line: no-console - console.log(data.toString()); - if (data.toString().trim().endsWith("DEBUG_ADAPTER_READY2CONNECT")) { - this.socket = net.createConnection( - this.defaultPort, - "127.0.0.1", - () => { - this.connect(this.socket, this.socket); - resolve(); - } - ); - } - }); - - this.adapterProcess.on("error", (err) => { - reject(err); - }); - this.adapterProcess.on("exit", (code: number, signal: string) => { - if (code) { - // tslint:disable-next-line: no-console - console.log(sanitize(`debug adapter exit code: ${code}`)); - } - }); - } - }); - } - - public stop(): Promise { - return this.disconnectRequest() - .then(() => { - this.stopAdapter(); - }) - .catch(() => { - this.stopAdapter(); - }); - } - - public initializeRequest( - args?: DebugProtocol.InitializeRequestArguments - ): Promise { - if (!args) { - args = { - adapterID: this.debugType, - columnsStartAt1: true, - linesStartAt1: true, - pathFormat: "path", - }; - } - return this.send("initialize", args); - } - - public waitForEvent(eventType: string): Promise { - return new Promise((resolve, reject) => { - this.on(eventType, (event) => { - resolve(event); - }); - }); - } - - public waitForResponse(): Promise { - return new Promise((resolve, reject) => { - this.on("responded", (response) => { - resolve(response); - }); - }); - } - - private stopAdapter() { - if (this.adapterProcess) { - this.adapterProcess.kill("SIGKILL"); - this.adapterProcess = null; - } - } - - private disconnectRequest( - args?: DebugProtocol.DisconnectArguments - ): Promise { - return this.send("disconnect", args); - } -} diff --git a/src/test/mockUtils.ts b/src/test/mockUtils.ts new file mode 100644 index 000000000..b84569c33 --- /dev/null +++ b/src/test/mockUtils.ts @@ -0,0 +1,40 @@ +/* + * Project: ESP-IDF VSCode Extension + * File Created: Thursday, 27th February 2025 12:28:08 pm + * Copyright 2025 Espressif Systems (Shanghai) CO LTD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { Memento } from "vscode"; + +export function createMockMemento(): Memento { + const storage = new Map(); + + return { + get: (key: string, defaultValue?: T): T | undefined => { + return storage.has(key) ? (storage.get(key) as T) : defaultValue; + }, + update: (key: string, value: any): Thenable => { + if (value === undefined) { + storage.delete(key); + } else { + storage.set(key, value); + } + return Promise.resolve(); + }, + keys: (): readonly string[] => { + return Array.from(storage.keys()); + }, + }; +} \ No newline at end of file diff --git a/src/test/project.test.ts b/src/test/project.test.ts index 30c7f3481..58d213219 100644 --- a/src/test/project.test.ts +++ b/src/test/project.test.ts @@ -2,13 +2,13 @@ * Project: ESP-IDF VSCode Extension * File Created: Wednesday, 21st July 2021 12:43:10 pm * Copyright 2021 Espressif Systems (Shanghai) CO LTD - *  + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *  + * * http://www.apache.org/licenses/LICENSE-2.0 - *  + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,14 +29,20 @@ import { setExtensionContext, updateProjectNameInCMakeLists, } from "../utils"; -import { IdfSetup } from "../views/setup/types"; +import { IdfSetup } from "../eim/types"; +import { ProjectConfigStore } from "../project-conf"; +import { ESP } from "../config"; +import { createMockMemento } from "./mockUtils"; suite("Project tests", () => { const absPath = (filename) => resolve(__dirname, "..", "..", filename); const mockUpContext: ExtensionContext = { extensionPath: resolve(__dirname, "..", ".."), asAbsolutePath: absPath, + workspaceState: createMockMemento(), + globalState: createMockMemento(), } as ExtensionContext; + ESP.ProjectConfiguration.store = ProjectConfigStore.init(mockUpContext); const templateFolder = join(mockUpContext.extensionPath, "templates"); const wsFolder = process.env.GITHUB_WORKSPACE ? join(process.env.GITHUB_WORKSPACE, "project-test") @@ -78,11 +84,7 @@ suite("Project tests", () => { "xtensa-esp32-elf-gcc", process.env ); - let compilerRelativePath = compilerAbsolutePath.split( - process.env.IDF_TOOLS_PATH - )[1]; - templateCCppPropertiesJsonJson.configurations[0].compilerPath = - "${config:idf.toolsPath}" + compilerRelativePath; + templateCCppPropertiesJsonJson.configurations[0].compilerPath = compilerAbsolutePath; const targetCCppPropertiesJsonJson = await readJson( join(targetFolder, ".vscode", "c_cpp_properties.json") ); @@ -144,27 +146,22 @@ suite("Project tests", () => { const projectPath = join(wsFolder, "new-project"); const settingsJsonPath = join(projectPath, ".vscode", "settings.json"); const settingsJson = await readJson(settingsJsonPath); - assert.equal(settingsJson["idf.espIdfPath"], undefined); const openOcdConfigs = "interface/ftdi/esp32_devkitj_v1.cfg,target/esp32.cfg"; const idfSetup = { idfPath: process.env.IDF_PATH, toolsPath: process.env.IDF_TOOLS_PATH, - sysPythonPath: "python" + python: `${process.env.IDF_PYTHON_ENV_PATH}/bin/python`, } as IdfSetup; const newSettingsJson = await setCurrentSettingsInTemplate( settingsJsonPath, idfSetup, "no port", "esp32", - openOcdConfigs, - Uri.file(projectPath) + Uri.file(wsFolder), + openOcdConfigs ); - assert.equal(newSettingsJson["idf.espIdfPath"], process.env.IDF_PATH); - assert.equal(newSettingsJson["idf.espAdfPath"], "/test/esp-adf"); - assert.equal(newSettingsJson["idf.espMdfPath"], "/test/esp-mdf"); - assert.equal(newSettingsJson["idf.toolsPath"], process.env.IDF_TOOLS_PATH); assert.equal(newSettingsJson["idf.openOcdConfigs"], openOcdConfigs); }); diff --git a/src/test/suite/downloadManager.test.ts b/src/test/suite/downloadManager.test.ts deleted file mode 100644 index a55f100f8..000000000 --- a/src/test/suite/downloadManager.test.ts +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Wednesday, 5th June 2019 2:03:34 pm - * Copyright 2019 Espressif Systems (Shanghai) CO LTD - *  - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *  - * http://www.apache.org/licenses/LICENSE-2.0 - *  - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from "assert"; -import * as path from "path"; -import { ExtensionContext } from "vscode"; -import { DownloadManager } from "../../downloadManager"; -import { IdfToolsManager } from "../../idfToolsManager"; -import { InstallManager } from "../../installManager"; -import { IPackage } from "../../IPackage"; -import { Logger } from "../../logger/logger"; -import { OutputChannel } from "../../logger/outputChannel"; -import { PlatformInformation } from "../../PlatformInformation"; -import * as utils from "../../utils"; - -suite("Download Manager Tests", () => { - // Common setup variables - const packageJsonMockUp = JSON.parse(`{ - "tools": [{ - "description": "Ninja build system", - "export_paths": [ - [ - "" - ] - ], - "export_vars": {}, - "install": "on_request", - "name": "ninja", - "platform_overrides": [ - { - "install": "always", - "platforms": [ - "win32", - "win64" - ] - } - ], - "version_cmd": [ - "ninja", - "--version" - ], - "version_regex": "([0-9.]+)", - "versions": [ - { - "linux-amd64": { - "sha256": "978fd9e26c2db8d33392c6daef50e9edac0a3db6680710a9f9ad47e01f3e49b7", - "size": 85276, - "url": "https://dl.espressif.com/dl/test.zip" - }, - "macos": { - "sha256": "9504cd1783ef3c242d06330a50d54dc8f838b605f5fc3e892c47254929f7350c", - "size": 91457, - "url": "https://dl.espressif.com/dl/test.zip" - }, - "name": "1.9.0", - "status": "recommended", - "win64": { - "sha256": "2d70010633ddaacc3af4ffbd21e22fae90d158674a09e132e06424ba3ab036e9", - "size": 254497, - "url": "https://dl.espressif.com/dl/test.zip" - } - } - ] - }]}`); - const absPath = (filename) => path.join(__dirname, filename); - const mockUpContext: ExtensionContext = { - extensionPath: __dirname, - asAbsolutePath: absPath, - } as ExtensionContext; - utils.setExtensionContext(mockUpContext); - Logger.init(mockUpContext); - const output = OutputChannel.init(); - const platInfo: PlatformInformation = { - architecture: "x86_64", - platform: "darwin", - platformToUse: "macos", - } as PlatformInformation; - const mockInstallPath = path.join(__dirname, "../../..", "testFiles"); - const idfToolsManager = new IdfToolsManager( - packageJsonMockUp, - platInfo, - output, - process.env.IDF_PATH - ); - const downloadManager = new DownloadManager(mockInstallPath); - const installManager = new InstallManager(mockInstallPath); - - test("Download correct", async function() { - this.timeout(10000); // Increase timeout to 10 seconds - - const pkgs = await idfToolsManager.getPackageList(["ninja"]); - const pkgUrl = idfToolsManager.obtainUrlInfoForPlatform(pkgs[0]); - const destPath = path.resolve(mockInstallPath, "dist"); - - // Mock the downloadWithResume method to return a mock response - const originalDownloadWithResume = downloadManager.downloadWithResume.bind(downloadManager); - downloadManager.downloadWithResume = async () => { - return { - headers: { - "content-length": "12345", - "content-disposition": "attachment; filename=ninja-win.zip", - "content-type": "application/octet-stream", - }, - status: 200 - }; - }; - - try { - const reply = await downloadManager.downloadWithResume(pkgUrl.url, destPath); - assert.equal(reply.headers["content-length"], "12345"); - } finally { - // Restore original method - downloadManager.downloadWithResume = originalDownloadWithResume; - } - }); - - test("Download fail", async function() { - this.timeout(10000); // Increase timeout to 10 seconds - - const pkgs = await idfToolsManager.getPackageList(["ninja"]); - const pkgUrl = idfToolsManager.obtainUrlInfoForPlatform(pkgs[0]); - const destPath = path.resolve(mockInstallPath, "dist"); - - // Mock the downloadWithResume method to throw an error - const originalDownloadWithResume = downloadManager.downloadWithResume.bind(downloadManager); - downloadManager.downloadWithResume = async () => { - throw new Error("HTTP/HTTPS Response Error"); - }; - - try { - await downloadManager.downloadWithResume(pkgUrl.url, destPath); - assert.fail("Expected an error, didn't receive it"); - } catch (reason) { - assert.equal(reason.message, "HTTP/HTTPS Response Error"); - } finally { - // Restore original method - downloadManager.downloadWithResume = originalDownloadWithResume; - } - }); - - test("Validate file checksum", async () => { - const testFile = path.join(mockInstallPath, "dist", "mytest.zip"); - const expectedHash = - "1e6c77c830842fe48c79d62f8aec25f29075551ecf50d4be948f5c197677ce5b"; - const testFileSize = 239; - await utils - .validateFileSizeAndChecksum(testFile, expectedHash, testFileSize) - .then((isValidFile) => { - assert.equal(isValidFile, true); - }); - }); - - test("Install zip", async () => { - const pkg = { - name: "tool", - version_cmd: ["ninja", "--version"], - versions: [ - { - macos: { - url: "https://dl.espressif.com/dl/mytest.zip", - sha256: - "1e6c77c830842fe48c79d62f8aec25f29075551ecf50d4be948f5c197677ce5b", - size: 239, - }, - name: "1.9.0", - status: "recommended", - }, - ], - } as IPackage; - const versionName = idfToolsManager.getVersionToUse(pkg); - const absolutePath: string = installManager.getToolPackagesPath([ - "tools", - pkg.name, - versionName, - ]); - await installManager - .installZipPackage(idfToolsManager, pkg, absolutePath) - .then(() => { - const fileIsExtracted = utils.fileExists( - downloadManager.getToolPackagesPath([ - "tools", - pkg.name, - pkg.versions[0].name, - "sample.txt", - ]) - ); - assert.equal(fileIsExtracted, true); - }); - }); - - test("Install targz", async () => { - const pkg = { - name: "tool", - version_cmd: ["ninja", "--version"], - versions: [ - { - macos: { - url: "https://dl.espressif.com/dl/tartest.tar.gz", - sha256: - "e506ea55c741db7727b8f4e6187d7f6dcc331f58b2e08dbd13b7fc862f7e1afb", - size: 306, - }, - name: "1.9.0", - status: "recommended", - }, - ], - } as IPackage; - await installManager - .installTarPackage(idfToolsManager, pkg, "gz") - .then(() => { - const isFileExtracted = utils.fileExists( - downloadManager.getToolPackagesPath([ - "tools", - pkg.name, - pkg.versions[0].name, - "tarsample.txt", - ]) - ); - assert.equal(isFileExtracted, true); - }); - }); -}); diff --git a/src/test/suite/idfToolsManager.test.ts b/src/test/suite/idfToolsManager.test.ts index 19fba3234..94a020479 100644 --- a/src/test/suite/idfToolsManager.test.ts +++ b/src/test/suite/idfToolsManager.test.ts @@ -23,6 +23,9 @@ import { IdfToolsManager } from "../../idfToolsManager"; import { OutputChannel } from "../../logger/outputChannel"; import { PlatformInformation } from "../../PlatformInformation"; import * as utils from "../../utils"; +import { ProjectConfigStore } from "../../project-conf"; +import { ESP } from "../../config"; +import { createMockMemento } from "../mockUtils"; suite("IDF Tools Manager Tests", async () => { // Common setup variables @@ -75,8 +78,11 @@ suite("IDF Tools Manager Tests", async () => { }]}`); const mockUpContext: ExtensionContext = { extensionPath: __dirname, + workspaceState: createMockMemento(), + globalState: createMockMemento(), } as ExtensionContext; utils.setExtensionContext(mockUpContext); + ESP.ProjectConfiguration.store = ProjectConfigStore.init(mockUpContext); const platInfo: PlatformInformation = { architecture: "x86_64", platform: "darwin", diff --git a/src/test/suite/index.ts b/src/test/suite/index.ts index d134be2ae..94bb8210e 100644 --- a/src/test/suite/index.ts +++ b/src/test/suite/index.ts @@ -2,13 +2,13 @@ * Project: ESP-IDF VSCode Extension * File Created: Wednesday, 5th June 2019 2:03:34 pm * Copyright 2019 Espressif Systems (Shanghai) CO LTD - *  + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - *  + * * http://www.apache.org/licenses/LICENSE-2.0 - *  + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,24 +18,15 @@ import * as glob from "glob"; import * as Mocha from "mocha"; -import * as ju from "mocha-junit-reporter"; import * as path from "path"; export function run(): Promise { // Create the mocha test const mocha = new Mocha({ ui: "tdd", - reporter: ju, + reporter: "json", reporterOptions: { - mochaFile: path.join( - __dirname, - "..", - "..", - "results", - "test-results.xml" - ), - toConsole: true, - outputs: true, + output: path.join(__dirname, "..", "..", "results", "test-results.json"), }, inlineDiffs: true, }); diff --git a/src/test/suite/nvsPartitionTable.test.ts b/src/test/suite/nvsPartitionTable.test.ts index a98cdbeec..7a0a68ee4 100644 --- a/src/test/suite/nvsPartitionTable.test.ts +++ b/src/test/suite/nvsPartitionTable.test.ts @@ -209,23 +209,40 @@ suite("NVS PartitionTable Suite", () => { }); }); - just64Types.forEach( i => { - test(`Value field invalid numbers for ${i}`, async() => { + just64Types.forEach(i => { + test(`Value field invalid numbers for ${i}`, async () => { + const min = minValues[i]; + const max = maxValues[i]; + let invalidMin: string; + let invalidMax: string; + + if (typeof min === "number") { + invalidMin = `${min - 1}`; + } else { + invalidMin = `${min.minus(1)}`; + } + + if (typeof max === "number") { + invalidMax = `${max + 1}`; + } else { + invalidMax = `${max.plus(1)}`; + } + let invalidRow1 = { key: "0123456789abcde", type: "test", encoding: `${i}`, - value: `${minValues[i] === 0 ? minValues[i] - 1 : (minValues[i]).minus(1)}`, + value: invalidMin, error: "" }; let invalidRow2 = { key: "0123456789abcde", type: "test", encoding: `${i}`, - value: `${(maxValues[i]).plus(1)}`, + value: invalidMax, error: "" }; - + await assert.equal(isInValidRow(invalidRow1), `Out of range for ${i}`); await assert.equal(isInValidRow(invalidRow2), `Out of range for ${i}`); }); diff --git a/src/ui-test/.mocharc-ci.js b/src/ui-test/.mocharc-ci.js new file mode 100644 index 000000000..bc8754bec --- /dev/null +++ b/src/ui-test/.mocharc-ci.js @@ -0,0 +1,5 @@ +module.exports = { + timeout: 99999999, + reporter: "json", + "reporter-option": ["output=./out/ui-test-results.json"] +}; diff --git a/src/ui-test/configure-test.ts b/src/ui-test/configure-test.ts deleted file mode 100644 index e928f063c..000000000 --- a/src/ui-test/configure-test.ts +++ /dev/null @@ -1,276 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Friday, 17th December 2021 2:20:05 pm - * Copyright 2021 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { expect } from "chai"; -import { pathExists, stat } from "fs-extra"; -import { delimiter, dirname, join, sep } from "path"; -import { By, EditorView, WebView, Workbench } from "vscode-extension-tester"; - -describe("Configure extension", () => { - let view: WebView; - const expectedDir = process.env.IDF_PATH - ? process.env.IDF_PATH - : join(process.env.HOME, "esp", "esp-idf"); - - before(async function () { - this.timeout(100000); - await new Promise((res) => setTimeout(res, 10000)); - const notifications = await new Workbench().getNotifications(); - for (let n of notifications) { - await n.dismiss(); - } - await new Workbench().executeCommand("espIdf.setup.start"); - await new Promise((res) => setTimeout(res, 12000)); - view = new WebView(); - await view.switchToFrame(); - }); - - async function isBinInPath( - binaryName: string, - workDirectory: string, - env: NodeJS.ProcessEnv - ) { - let pathNameInEnv: string = Object.keys(process.env).find( - (k) => k.toUpperCase() == "PATH" - ); - const pathDirs = env[pathNameInEnv].split(delimiter); - for (const pathDir of pathDirs) { - let binaryPath = join(pathDir, binaryName); - if (process.platform === "win32" && !binaryName.endsWith(".exe")) { - binaryPath = `${binaryPath}.exe`; - } - const doesPathExists = await pathExists(binaryPath); - if (doesPathExists) { - const pathStats = await stat(binaryPath); - if (pathStats.isFile() && pathStats.mode & 0o111) { - return binaryPath; - } - } - } - return ""; - } - - async function selectEspIdfVersion(view: WebView) { - const selectEspIdfElement = await view.findWebElement( - By.id("select-esp-idf") - ); - const idfChoices = await selectEspIdfElement.findElements(By.css("option")); - expect(idfChoices).to.be.an("array"); - await idfChoices[0].click(); - } - - async function checkGitVersion(view: WebView) { - const gitVersionElement = await view.findWebElement( - By.xpath(`.//label[@data-config-id='git-version']`) - ); - const gitVersionMsg = await gitVersionElement.getText(); - expect(gitVersionMsg).to.match(/Git version:.*/g); - } - - async function checkManualEspIdfPath(view: WebView) { - const manualIdfDirectory = await view.findWebElement( - By.xpath( - `.//div[@data-config-id='manual-idf-directory']//input[@type='text']` - ) - ); - const defaultIdfDirectory = await manualIdfDirectory.getAttribute("value"); - expect(defaultIdfDirectory).to.be.equal(expectedDir); - } - - async function selectPythonExecutable(view: WebView) { - const selectPythonElement = await view.findWebElement( - By.id("python-version-select") - ); - await new Promise((res) => setTimeout(res, 1000)); - const pyChoices = await selectPythonElement.findElements(By.css("option")); - for (const pyChoice of pyChoices) { - const pyText = await pyChoice.getText(); - if (pyText.indexOf("/usr/bin/python3") !== -1) { - await pyChoice.click(); - break; - } - } - // Start setup install - const startInstallBtn = await view.findWebElement( - By.xpath(`.//button[@data-config-id='start-install-btn']`) - ); - await startInstallBtn.click(); - await new Promise((res) => setTimeout(res, 3000)); - } - - it("Find install options", async () => { - const expressElement = await view.findWebElement( - By.xpath(`.//label[@data-config-id='express']`) - ); - expect(await expressElement.getText()).has.string("EXPRESS"); - - const advancedElement = await view.findWebElement( - By.xpath(`.//label[@data-config-id='advanced']`) - ); - expect(await advancedElement.getText()).has.string("ADVANCED"); - - const existingElement = await view.findWebElement( - By.xpath(`.//label[@data-config-id='existing-setup']`) - ); - expect(await existingElement.getText()).has.string("USE EXISTING SETUP"); - }); - - it("Configure using Express", async () => { - const expressElement = await view.findWebElement( - By.id("express-install-btn") - ); - await expressElement.click(); - await new Promise((res) => setTimeout(res, 1000)); - - await checkGitVersion(view); - await selectEspIdfVersion(view); - await checkManualEspIdfPath(view); - await selectPythonExecutable(view); - - // Status windows is loaded - const espIdfInstalledPath = await view.findWebElement( - By.xpath(`.//p[@data-config-id='esp-idf-download-status']`) - ); - const espIdfDestPathMsg = await espIdfInstalledPath.getText(); - const expectedEspIdfDestPath = `ESP-IDF is installed in ${expectedDir}`; - expect(espIdfDestPathMsg).to.be.equal(expectedEspIdfDestPath); - - await new Promise((res) => setTimeout(res, 100000)); - - // Show setup has finished - const setupFinishedElement = await view.findWebElement( - By.xpath(`.//h2[@data-config-id='setup-is-finished']`) - ); - const setupFinishedText = await setupFinishedElement.getText(); - expect(setupFinishedText).to.be.equal("All settings have been configured."); - if (view) { - await view.switchBack(); - await new EditorView().closeAllEditors(); - } - }).timeout(120000); - - it("Configure using Advanced", async () => { - await new Workbench().executeCommand("espIdf.setup.start"); - await new Promise((res) => setTimeout(res, 12000)); - view = new WebView(); - await view.switchToFrame(); - await new Promise((res) => setTimeout(res, 1000)); - const advancedElement = await view.findWebElement( - By.id("advanced-install-btn") - ); - await advancedElement.click(); - await new Promise((res) => setTimeout(res, 1000)); - await selectEspIdfVersion(view); - - await checkGitVersion(view); - - await checkManualEspIdfPath(view); - - await selectPythonExecutable(view); - - // select-esp-idf-tools - const idfToolSelect = await view.findWebElement( - By.xpath(`.//select[@data-config-id='select-esp-idf-tools']`) - ); - const idfToolsSelectChoices = await idfToolSelect.findElements( - By.css("option") - ); - await idfToolsSelectChoices[idfToolsSelectChoices.length - 1].click(); - - // Get current settings - const modifiedEnv: { [key: string]: string } = <{ [key: string]: string }>( - Object.assign({}, process.env) - ); - // openOCD-esp32 - const openOCDPath = await isBinInPath("openocd", __dirname, modifiedEnv); - const openOcdTool = await view.findWebElement(By.id("openocd-esp32")); - const expectedOpenOcdPath = openOCDPath - .trim() - .replace(sep + "bin" + sep + "openocd", sep + "bin"); - const actualOpenOcdPath = await openOcdTool.getAttribute("value"); - expect(expectedOpenOcdPath).to.be.equal(actualOpenOcdPath); - // xtensa-esp32-elf/ - const xtensaEsp32Path = await isBinInPath( - "xtensa-esp32-elf-gcc", - __dirname, - modifiedEnv - ); - const xtensaEsp32Tool = await view.findWebElement( - By.id("xtensa-esp-elf") - ); - const expectedXtensaEsp32Path = dirname(xtensaEsp32Path); - const actualXtensaEsp32Path = await xtensaEsp32Tool.getAttribute("value"); - expect(expectedXtensaEsp32Path).to.be.equal(actualXtensaEsp32Path); - - // save-existing-tools - const saveExistingToolsBtn = await view.findWebElement( - By.xpath(`.//button[@data-config-id='save-existing-tools']`) - ); - await saveExistingToolsBtn.click(); - - await new Promise((res) => setTimeout(res, 100000)); - - // Show setup has finished - const setupFinishedElement = await view.findWebElement( - By.xpath(`.//h2[@data-config-id='setup-is-finished']`) - ); - const setupFinishedText = await setupFinishedElement.getText(); - expect(setupFinishedText).to.be.equal("All settings have been configured."); - if (view) { - await view.switchBack(); - await new EditorView().closeAllEditors(); - } - }).timeout(130000); - - it("Configure using existing setup", async () => { - await new Workbench().executeCommand("espIdf.setup.start"); - await new Promise((res) => setTimeout(res, 12000)); - view = new WebView(); - await view.switchToFrame(); - await new Promise((res) => setTimeout(res, 1000)); - const existingSetupElement = await view.findWebElement( - By.id("existing-install-btn") - ); - await existingSetupElement.click(); - await new Promise((res) => setTimeout(res, 1000)); - // Status windows is loaded - const expectedDir = process.env.IDF_PATH - ? process.env.IDF_PATH - : join(process.env.HOME, "esp", "esp-idf"); - const espIdfInstalledPath = await view.findWebElement( - By.xpath(`.//div[@data-config-id='${expectedDir}']`) - ); - const espIdfDestPathMsg = await espIdfInstalledPath.getText(); - expect(espIdfDestPathMsg).to.include(expectedDir); - - await espIdfInstalledPath.click(); - - await new Promise((res) => setTimeout(res, 60000)); - - // Show setup has finished - const setupFinishedElement = await view.findWebElement( - By.xpath(`.//h2[@data-config-id='setup-is-finished']`) - ); - const setupFinishedText = await setupFinishedElement.getText(); - expect(setupFinishedText).to.be.equal("All settings have been configured."); - - if (view) { - await view.switchBack(); - } - }).timeout(100000); -}); diff --git a/src/ui-test/project-build-test.ts b/src/ui-test/project-build-test.ts index 53e1e2112..0dcb41b5f 100644 --- a/src/ui-test/project-build-test.ts +++ b/src/ui-test/project-build-test.ts @@ -16,7 +16,12 @@ * limitations under the License. */ -import { BottomBarPanel, EditorView, InputBox, Workbench } from "vscode-extension-tester"; +import { + BottomBarPanel, + EditorView, + InputBox, + Workbench, +} from "vscode-extension-tester"; import { expect } from "chai"; import { resolve } from "path"; import { pathExists } from "fs-extra"; @@ -26,18 +31,22 @@ describe("Build testing", async () => { before(async function () { this.timeout(100000); + const notifications = await new Workbench().getNotifications(); + for (let n of notifications) { + await n.dismiss(); + } await openTestProject(); }); it("Log Doctor command configuration", async () => { - await new Promise((res) => setTimeout(res, 3000)); - await new Workbench().executeCommand("ESP-IDF: Doctor Command"); - await new Promise((res) => setTimeout(res, 10000)); - const editorView = new EditorView(); - const editor = await editorView.openEditor("report.txt"); - const docCmdText = await editor.getText(); - console.log(docCmdText); - }).timeout(999999); + await new Promise((res) => setTimeout(res, 3000)); + await new Workbench().executeCommand("ESP-IDF: Doctor Command"); + await new Promise((res) => setTimeout(res, 10000)); + const editorView = new EditorView(); + const editor = await editorView.openEditor("report.txt"); + const docCmdText = await editor.getText(); + console.log(docCmdText); + }).timeout(999999); it("Build bin is generated", async () => { await new Workbench().executeCommand("ESP-IDF: Full Clean Project"); diff --git a/src/uninstall.ts b/src/uninstall.ts index 33b533383..bc54f3294 100644 --- a/src/uninstall.ts +++ b/src/uninstall.ts @@ -1,7 +1,7 @@ import * as vscode from "vscode"; import { Logger } from "./logger/logger"; import { OutputChannel } from "./logger/outputChannel"; -import { clearPreviousIdfSetups } from "./setup/existingIdfSetups"; +import { ESP } from "./config"; export async function asyncRemoveEspIdfSettings() { const config = vscode.workspace.getConfiguration(); @@ -134,8 +134,6 @@ export async function asyncRemoveEspIdfSettings() { } } - await clearPreviousIdfSetups(); - OutputChannel.appendLineAndShow( vscode.l10n.t("ESP-IDF settings removed successfully.") ); diff --git a/src/utils.ts b/src/utils.ts index d88f2a5ae..2711fed37 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -42,12 +42,12 @@ import { ESP } from "./config"; import * as sanitizedHtml from "sanitize-html"; import { getEnvVarsFromIdfTools, - getPythonPath, getVirtualEnvPythonPath, } from "./pythonManager"; import { IdfToolsManager } from "./idfToolsManager"; import { isFlashEncryptionEnabled } from "./flash/verifyFlashEncryption"; import { configureClangSettings } from "./clang"; +import { configureEnvVariables } from "./common/prepareEnv"; const currentFolderMsg = vscode.l10n.t("ESP-IDF: Current Project"); @@ -174,6 +174,7 @@ export interface ISpawnOptions extends childProcess.SpawnOptions { appendMode?: "appendLine" | "append"; /** Send error to telemetry */ sendToTelemetry?: boolean; + maxBuffer?: number; } export function spawn( @@ -318,24 +319,17 @@ export async function createGitignoreFile(destinationDir: vscode.Uri) { export async function setCCppPropertiesJsonCompilerPath( curWorkspaceFsPath: vscode.Uri ) { - const modifiedEnv = await appendIdfAndToolsToPath(curWorkspaceFsPath); + const modifiedEnv = await configureEnvVariables(curWorkspaceFsPath); const idfTarget = modifiedEnv.IDF_TARGET || "esp32"; const gccTool = getToolchainToolName(idfTarget, "gcc"); const compilerAbsolutePath = await isBinInPath(gccTool, modifiedEnv); if (!compilerAbsolutePath) { return; } - let compilerRelativePath = compilerAbsolutePath.split( - modifiedEnv.IDF_TOOLS_PATH - )[1]; - const settingToUse = - process.platform === "win32" - ? "${config:idf.toolsPathWin}" - : "${config:idf.toolsPath}"; await updateCCppPropertiesJson( curWorkspaceFsPath, "compilerPath", - settingToUse + compilerRelativePath + compilerAbsolutePath ); } @@ -386,14 +380,14 @@ export async function getToolchainPath( workspaceUri: vscode.Uri, tool: string = "gcc" ) { - const modifiedEnv = await appendIdfAndToolsToPath(workspaceUri); + const modifiedEnv = await configureEnvVariables(workspaceUri); const idfTarget = modifiedEnv.IDF_TARGET || "esp32"; const gccTool = getToolchainToolName(idfTarget, tool); try { return await isBinInPath(gccTool, modifiedEnv); } catch (error) { Logger.errorNotify( - `${tool} is not found in idf.toolsPath`, + `${tool} is not found in current IDF setup`, error, "utils getToolchainPath" ); @@ -846,6 +840,11 @@ export function getSubProjects(dir: string): string[] { } export async function getEspIdfFromCMake(espIdfPath: string) { + const doesIdfPathExists = await pathExists(espIdfPath); + if (!doesIdfPathExists) { + Logger.info(`${espIdfPath} does not exist to get ESP-IDF version.`); + return "x.x"; + } const versionFilePath = path.join( espIdfPath, "tools", @@ -916,7 +915,7 @@ export async function cleanDirtyGitRepository( return; } const workingDirUri = vscode.Uri.file(workingDir); - const modifiedEnv = await appendIdfAndToolsToPath(workingDirUri); + const modifiedEnv = await configureEnvVariables(workingDirUri); const resetResult = await execChildProcess( gitPath, ["reset", "--hard", "--recurse-submodule"], @@ -942,7 +941,7 @@ export async function fixFileModeGitRepository( return; } const workingDirUri = vscode.Uri.file(workingDir); - const modifiedEnv = await appendIdfAndToolsToPath(workingDirUri); + const modifiedEnv = await configureEnvVariables(workingDirUri); const fixFileModeResult = await execChildProcess( gitPath, ["config", "--local", "core.fileMode", "false"], @@ -1030,295 +1029,6 @@ export function validateFileSizeAndChecksum( }); } -export async function appendIdfAndToolsToPath(curWorkspace: vscode.Uri) { - const modifiedEnv: { [key: string]: string } = <{ [key: string]: string }>( - Object.assign({}, process.env) - ); - - const containerPath = - process.platform === "win32" ? modifiedEnv.USERPROFILE : modifiedEnv.HOME; - const defaultEspIdfPath = path.join(containerPath, "esp", "esp-idf"); - - const idfPathDir = idfConf.readParameter("idf.espIdfPath", curWorkspace); - modifiedEnv.IDF_PATH = - idfPathDir || modifiedEnv.IDF_PATH || defaultEspIdfPath; - - const adfPathDir = idfConf.readParameter("idf.espAdfPath", curWorkspace); - modifiedEnv.ADF_PATH = adfPathDir || modifiedEnv.ADF_PATH; - - const mdfPathDir = idfConf.readParameter("idf.espMdfPath", curWorkspace); - modifiedEnv.MDF_PATH = mdfPathDir || modifiedEnv.MDF_PATH; - - const homekitPathDir = idfConf.readParameter( - "idf.espHomeKitSdkPath", - curWorkspace - ); - modifiedEnv.HOMEKIT_PATH = homekitPathDir || modifiedEnv.HOMEKIT_PATH; - - const rainmakerPathDir = idfConf.readParameter( - "idf.espRainmakerPath", - curWorkspace - ); - modifiedEnv.RMAKER_PATH = rainmakerPathDir || modifiedEnv.RMAKER_PATH; - - const defaultToolsPath = path.join(containerPath, ".espressif"); - const toolsPath = idfConf.readParameter( - "idf.toolsPath", - curWorkspace - ) as string; - modifiedEnv.IDF_TOOLS_PATH = toolsPath || defaultToolsPath; - const matterPathDir = idfConf.readParameter( - "idf.espMatterPath", - curWorkspace - ) as string; - modifiedEnv.ESP_MATTER_PATH = matterPathDir || modifiedEnv.ESP_MATTER_PATH; - - const idfToolsManager = await IdfToolsManager.createIdfToolsManager( - modifiedEnv.IDF_PATH - ); - - const extraPaths = await idfToolsManager.exportPathsInString( - path.join(modifiedEnv.IDF_TOOLS_PATH, "tools"), - ["cmake", "ninja"] - ); - const customVars = await idfToolsManager.exportVars( - path.join(modifiedEnv.IDF_TOOLS_PATH, "tools") - ); - - if (customVars) { - try { - for (const envVar in customVars) { - if (envVar) { - modifiedEnv[envVar] = customVars[envVar]; - } - } - } catch (error) { - Logger.errorNotify( - "Invalid ESP-IDF environment variables format", - error, - "appendIdfAndToolsToPath idf tools env vars" - ); - } - } - - let pathToPigweed: string; - - if (modifiedEnv.ESP_MATTER_PATH) { - pathToPigweed = path.join( - modifiedEnv.ESP_MATTER_PATH, - "connectedhomeip", - "connectedhomeip", - ".environment", - "cipd", - "packages", - "pigweed" - ); - modifiedEnv.ZAP_INSTALL_PATH = path.join( - modifiedEnv.ESP_MATTER_PATH, - "connectedhomeip", - "connectedhomeip", - ".environment", - "cipd", - "packages", - "zap" - ); - } - const sysPythonPath = await getPythonPath(curWorkspace); - let pythonBinPath = ""; - if (sysPythonPath) { - pythonBinPath = await getVirtualEnvPythonPath(curWorkspace); - } - if (!pythonBinPath) { - pythonBinPath = idfConf.readParameter( - "idf.pythonBinPath", - curWorkspace - ) as string; - } - modifiedEnv.PYTHON = - pythonBinPath || - `${process.env.PYTHON}` || - `${path.join(process.env.IDF_PYTHON_ENV_PATH, "bin", "python")}`; - - const pythonBinPathExists = await pathExists(pythonBinPath); - - modifiedEnv.IDF_PYTHON_ENV_PATH = pythonBinPathExists - ? path.dirname(path.dirname(pythonBinPath)) - : process.env.IDF_PYTHON_ENV_PATH; - - const gitPath = idfConf.readParameter("idf.gitPath", curWorkspace) as string; - let pathToGitDir; - if (gitPath && gitPath !== "git") { - pathToGitDir = path.dirname(gitPath); - } - - let IDF_ADD_PATHS_EXTRAS = path.join( - modifiedEnv.IDF_PATH, - "components", - "espcoredump" - ); - IDF_ADD_PATHS_EXTRAS = `${IDF_ADD_PATHS_EXTRAS}${path.delimiter}${path.join( - modifiedEnv.IDF_PATH, - "components", - "partition_table" - )}`; - - let pathNameInEnv: string = Object.keys(process.env).find( - (k) => k.toUpperCase() == "PATH" - ); - - const idfPathExists = await pathExists(modifiedEnv.IDF_PATH); - const idfToolsPathExists = await pathExists(modifiedEnv.IDF_TOOLS_PATH); - - if (pythonBinPathExists && idfPathExists && idfToolsPathExists) { - const idfToolsExportVars = await getEnvVarsFromIdfTools( - modifiedEnv.IDF_PATH, - modifiedEnv.IDF_TOOLS_PATH, - pythonBinPath - ); - - if (idfToolsExportVars) { - try { - for (const envVar in idfToolsExportVars) { - if (envVar.toUpperCase() === pathNameInEnv.toUpperCase()) { - modifiedEnv[pathNameInEnv] = idfToolsExportVars[envVar] - .replace("%PATH%", modifiedEnv[pathNameInEnv]) - .replace("$PATH", modifiedEnv[pathNameInEnv]); - } else { - modifiedEnv[envVar] = idfToolsExportVars[envVar]; - } - } - } catch (error) { - Logger.errorNotify( - "Invalid ESP-IDF idf_tools.py export environment variables format", - error, - "appendIdfAndToolsToPath idf_tools export env vars" - ); - } - } - } - - const customExtraVars = idfConf.readParameter( - "idf.customExtraVars", - curWorkspace - ) as { [key: string]: string }; - if (customExtraVars) { - try { - for (const envVar in customExtraVars) { - if (envVar) { - modifiedEnv[envVar] = customExtraVars[envVar]; - } - } - } catch (error) { - Logger.errorNotify( - "Invalid user environment variables format", - error, - "appendIdfAndToolsToPath idf.customExtraVars" - ); - } - } - - try { - const openOcdPath = await isBinInPath("openocd", modifiedEnv, [ - "openocd-esp32", - ]); - if (openOcdPath) { - const openOcdDir = path.dirname(openOcdPath); - const openOcdScriptsPath = path.join( - openOcdDir, - "..", - "share", - "openocd", - "scripts" - ); - const scriptsExists = await pathExists(openOcdScriptsPath); - if (scriptsExists && modifiedEnv.OPENOCD_SCRIPTS !== openOcdScriptsPath) { - modifiedEnv.OPENOCD_SCRIPTS = openOcdScriptsPath; - } - } - } catch (error) { - Logger.error( - `Error processing OPENOCD_SCRIPTS path: ${error.message}`, - error, - "appendIdfAndToolsToPath OPENOCD_SCRIPTS" - ); - } - - if ( - pathToGitDir && - !modifiedEnv[pathNameInEnv].split(path.delimiter).includes(pathToGitDir) - ) { - modifiedEnv[pathNameInEnv] += path.delimiter + pathToGitDir; - } - if ( - pathToPigweed && - !modifiedEnv[pathNameInEnv].split(path.delimiter).includes(pathToPigweed) - ) { - modifiedEnv[pathNameInEnv] += path.delimiter + pathToPigweed; - } - - if ( - modifiedEnv[pathNameInEnv] && - !modifiedEnv[pathNameInEnv].includes(path.dirname(modifiedEnv.PYTHON)) - ) { - modifiedEnv[pathNameInEnv] = - path.dirname(modifiedEnv.PYTHON) + - path.delimiter + - modifiedEnv[pathNameInEnv]; - } - - if ( - modifiedEnv[pathNameInEnv] && - !modifiedEnv[pathNameInEnv].includes( - path.join(modifiedEnv.IDF_PATH, "tools") - ) - ) { - modifiedEnv[pathNameInEnv] = - path.join(modifiedEnv.IDF_PATH, "tools") + - path.delimiter + - modifiedEnv[pathNameInEnv]; - } - - const extraPathsArray = extraPaths.split(path.delimiter); - for (let extraPath of extraPathsArray) { - if ( - modifiedEnv[pathNameInEnv] && - !modifiedEnv[pathNameInEnv].includes(extraPath) - ) { - modifiedEnv[pathNameInEnv] = - extraPath + path.delimiter + modifiedEnv[pathNameInEnv]; - } - } - - modifiedEnv[ - pathNameInEnv - ] = `${IDF_ADD_PATHS_EXTRAS}${path.delimiter}${modifiedEnv[pathNameInEnv]}`; - - let idfTarget = await getIdfTargetFromSdkconfig(curWorkspace); - if (idfTarget) { - modifiedEnv.IDF_TARGET = - modifiedEnv.IDF_TARGET || idfTarget || process.env.IDF_TARGET; - } - - let enableComponentManager = idfConf.readParameter( - "idf.enableIdfComponentManager", - curWorkspace - ) as boolean; - - if (enableComponentManager) { - modifiedEnv.IDF_COMPONENT_MANAGER = "1"; - } - - let sdkconfigFilePath = idfConf.readParameter( - "idf.sdkconfigFilePath", - curWorkspace - ) as string; - if (sdkconfigFilePath) { - modifiedEnv.SDKCONFIG = sdkconfigFilePath; - } - - return modifiedEnv; -} - export async function getAllBinPathInEnvPath( binaryName: string, env: NodeJS.ProcessEnv diff --git a/src/versionSwitcher/index.ts b/src/versionSwitcher/index.ts index de55d61de..9065454d5 100644 --- a/src/versionSwitcher/index.ts +++ b/src/versionSwitcher/index.ts @@ -16,36 +16,24 @@ * limitations under the License. */ -import { ConfigurationTarget, StatusBarItem, Uri, window } from "vscode"; -import { - getPreviousIdfSetups, - loadIdfSetupsFromEspIdfJson, -} from "../setup/existingIdfSetups"; -import { - checkIdfSetup, - useIdfSetupSettings, -} from "../setup/setupValidation/espIdfSetup"; -import { readParameter } from "../idfConfiguration"; -import { getIdfMd5sum } from "../setup/espIdfJson"; -import { getEspIdfFromCMake } from "../utils"; -import { IdfSetup } from "../views/setup/types"; -import { getPythonPath, getVirtualEnvPythonPath } from "../pythonManager"; +import { commands, l10n, StatusBarItem, Uri, window } from "vscode"; +import { getIdfSetups } from "../eim/getExistingSetups"; +import { saveSettings } from "../eim/verifySetup"; export async function selectIdfSetup( workspaceFolder: Uri, espIdfStatusBar: StatusBarItem ) { - const globalStateSetups = await getPreviousIdfSetups(true); - const toolsPath = readParameter("idf.toolsPath", workspaceFolder) as string; - let existingIdfSetups = await loadIdfSetupsFromEspIdfJson(toolsPath); - if (process.env.IDF_TOOLS_PATH && toolsPath !== process.env.IDF_TOOLS_PATH) { - const systemIdfSetups = await loadIdfSetupsFromEspIdfJson( - process.env.IDF_TOOLS_PATH + let idfSetups = await getIdfSetups(workspaceFolder); + if (!idfSetups || (idfSetups && idfSetups.length === 0)) { + const action = await window.showInformationMessage( + l10n.t("No ESP-IDF Setups found"), + l10n.t("Open ESP-IDF Installation Manager") ); - existingIdfSetups = [...existingIdfSetups, ...systemIdfSetups]; + if (action && action === l10n.t("Open ESP-IDF Installation Manager")) { + commands.executeCommand("espIdf.installManager"); + } } - const currentIdfSetup = await getCurrentIdfSetup(workspaceFolder); - let idfSetups = [...globalStateSetups, ...existingIdfSetups, currentIdfSetup]; idfSetups = idfSetups.filter( (setup, index, self) => index === @@ -53,16 +41,7 @@ export async function selectIdfSetup( (s) => s.idfPath === setup.idfPath && s.toolsPath === setup.toolsPath ) ); - if (idfSetups.length === 0) { - await window.showInformationMessage("No ESP-IDF Setups found"); - return; - } - const onlyValidIdfSetups = [ - ...new Map( - idfSetups.filter((i) => i.isValid).map((item) => [item.idfPath, item]) - ).values(), - ]; - const idfSetupOptions = onlyValidIdfSetups.map((idfSetup) => { + const idfSetupOptions = idfSetups.map((idfSetup) => { return { label: `Version: v${idfSetup.version}`, description: `IDF_PATH: ${idfSetup.idfPath}`, @@ -76,49 +55,10 @@ export async function selectIdfSetup( if (!selectedIdfSetupOption) { return; } - await useIdfSetupSettings( + await saveSettings( selectedIdfSetupOption.target, - ConfigurationTarget.WorkspaceFolder, workspaceFolder, espIdfStatusBar ); return selectedIdfSetupOption.target; } - -export async function getCurrentIdfSetup( - workspaceFolder: Uri, - logToChannel: boolean = true -) { - const idfPath = readParameter("idf.espIdfPath", workspaceFolder); - const toolsPath = readParameter("idf.toolsPath", workspaceFolder) as string; - const gitPath = readParameter("idf.gitPath", workspaceFolder); - - // FIX use system Python path as setting instead venv - // REMOVE this line after neext release - const sysPythonBinPath = await getPythonPath(workspaceFolder); - let pythonBinPath = ""; - if (sysPythonBinPath) { - pythonBinPath = await getVirtualEnvPythonPath(workspaceFolder); - } - if (!pythonBinPath) { - pythonBinPath = readParameter( - "idf.pythonBinPath", - workspaceFolder - ) as string; - } - - const idfSetupId = getIdfMd5sum(idfPath); - const idfVersion = await getEspIdfFromCMake(idfPath); - const currentIdfSetup: IdfSetup = { - id: idfSetupId, - idfPath, - gitPath, - toolsPath, - sysPythonPath: sysPythonBinPath, - python: pythonBinPath, - version: idfVersion, - isValid: false, - }; - currentIdfSetup.isValid = await checkIdfSetup(currentIdfSetup, logToChannel); - return currentIdfSetup; -} diff --git a/src/views/commons/espCommons.scss b/src/views/commons/espCommons.scss index 1a5c38f06..8402b0815 100644 --- a/src/views/commons/espCommons.scss +++ b/src/views/commons/espCommons.scss @@ -1,5 +1,5 @@ @charset "utf-8"; -@import "~bulma/bulma"; +@use "~bulma/bulma" as bulma; html, body { diff --git a/src/views/menuconfig/Menuconfig.vue b/src/views/menuconfig/Menuconfig.vue index 1be91034a..675a83723 100644 --- a/src/views/menuconfig/Menuconfig.vue +++ b/src/views/menuconfig/Menuconfig.vue @@ -180,7 +180,7 @@ onUnmounted(() => { diff --git a/src/views/setup/ExistingSetup.vue b/src/views/setup/ExistingSetup.vue deleted file mode 100644 index 475373e55..000000000 --- a/src/views/setup/ExistingSetup.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - -./types \ No newline at end of file diff --git a/src/views/setup/Home.vue b/src/views/setup/Home.vue deleted file mode 100644 index 62f374f52..000000000 --- a/src/views/setup/Home.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - - - -./types diff --git a/src/views/setup/Install.vue b/src/views/setup/Install.vue deleted file mode 100644 index dc9b33847..000000000 --- a/src/views/setup/Install.vue +++ /dev/null @@ -1,213 +0,0 @@ - - - - - diff --git a/src/views/setup/Status.vue b/src/views/setup/Status.vue deleted file mode 100644 index fe6ef7b69..000000000 --- a/src/views/setup/Status.vue +++ /dev/null @@ -1,168 +0,0 @@ - - - - - diff --git a/src/views/setup/ToolsCustom.vue b/src/views/setup/ToolsCustom.vue deleted file mode 100644 index 34b4b7d5c..000000000 --- a/src/views/setup/ToolsCustom.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - - - diff --git a/src/views/setup/Welcome.vue b/src/views/setup/Welcome.vue deleted file mode 100644 index 5d3b79587..000000000 --- a/src/views/setup/Welcome.vue +++ /dev/null @@ -1,286 +0,0 @@ - - - - - diff --git a/src/views/setup/components/DownloadStatus.vue b/src/views/setup/components/DownloadStatus.vue deleted file mode 100644 index 25f02a174..000000000 --- a/src/views/setup/components/DownloadStatus.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/views/setup/components/folderOpen.vue b/src/views/setup/components/folderOpen.vue deleted file mode 100644 index c0198633c..000000000 --- a/src/views/setup/components/folderOpen.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - diff --git a/src/views/setup/components/logo.vue b/src/views/setup/components/logo.vue deleted file mode 100644 index 875c24cf0..000000000 --- a/src/views/setup/components/logo.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/views/setup/components/selectEspIdf.vue b/src/views/setup/components/selectEspIdf.vue deleted file mode 100644 index 1ed3e9c74..000000000 --- a/src/views/setup/components/selectEspIdf.vue +++ /dev/null @@ -1,222 +0,0 @@ - - - - - diff --git a/src/views/setup/components/selectPyVersion.vue b/src/views/setup/components/selectPyVersion.vue deleted file mode 100644 index ab12e2367..000000000 --- a/src/views/setup/components/selectPyVersion.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - - diff --git a/src/views/setup/components/selectSaveScope.vue b/src/views/setup/components/selectSaveScope.vue deleted file mode 100644 index 6e5107d69..000000000 --- a/src/views/setup/components/selectSaveScope.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/views/setup/components/statusSection/espIdf.vue b/src/views/setup/components/statusSection/espIdf.vue deleted file mode 100644 index 303328ab4..000000000 --- a/src/views/setup/components/statusSection/espIdf.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/src/views/setup/components/statusSection/espIdfTools.vue b/src/views/setup/components/statusSection/espIdfTools.vue deleted file mode 100644 index 4451fde67..000000000 --- a/src/views/setup/components/statusSection/espIdfTools.vue +++ /dev/null @@ -1,54 +0,0 @@ - - - - - diff --git a/src/views/setup/components/statusSection/prerequisites.vue b/src/views/setup/components/statusSection/prerequisites.vue deleted file mode 100644 index 6a90abfea..000000000 --- a/src/views/setup/components/statusSection/prerequisites.vue +++ /dev/null @@ -1,90 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/setup/components/statusSection/pyPkgs.vue b/src/views/setup/components/statusSection/pyPkgs.vue deleted file mode 100644 index d83ba619e..000000000 --- a/src/views/setup/components/statusSection/pyPkgs.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - diff --git a/src/views/setup/components/toolDownload.vue b/src/views/setup/components/toolDownload.vue deleted file mode 100644 index 917af4b74..000000000 --- a/src/views/setup/components/toolDownload.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - diff --git a/src/views/setup/components/toolManual.vue b/src/views/setup/components/toolManual.vue deleted file mode 100644 index 07317faca..000000000 --- a/src/views/setup/components/toolManual.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - - - diff --git a/src/views/setup/main.ts b/src/views/setup/main.ts deleted file mode 100644 index 3e576d068..000000000 --- a/src/views/setup/main.ts +++ /dev/null @@ -1,292 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Thursday, 31st August 2023 8:11:44 pm - * Copyright 2023 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { createApp } from "vue"; -import { createPinia } from "pinia"; -import { useSetupStore } from "./store"; -import ExistingSetup from "./ExistingSetup.vue"; -import App from "./App.vue"; -import ToolsCustom from "./ToolsCustom.vue"; -import Home from "./Home.vue"; -import Install from "./Install.vue"; -import Status from "./Status.vue"; -import { createRouter, createWebHashHistory } from "vue-router"; - -const routes = [ - { path: "/", component: Home }, - { path: "/existingsetup", component: ExistingSetup }, - { path: "/autoinstall", component: Install }, - { path: "/custom", component: ToolsCustom }, - { path: "/status", component: Status }, -]; - -export const router = createRouter({ - history: createWebHashHistory(), - routes, -}); - -const app = createApp(App); -const pinia = createPinia(); -app.use(pinia); -app.use(router); -app.mount("#app"); - -router.beforeEach((to, from, next) => { - if (from.path === "/autoinstall" && to.path !== "/autoinstall") { - store.setIdfPathError(""); - } - next(); -}); - -const store = useSetupStore(); - -window.addEventListener("message", (event) => { - const msg = event.data; - switch (msg.command) { - case "goToCustomPage": - if (msg.page) { - router.push(msg.page); - } - if (typeof msg.installing !== "undefined") { - store.isIdfInstalling = msg.installing; - } - break; - case "initialLoad": - if (msg.espToolsPath) { - store.toolsFolder = msg.espToolsPath; - } - if (msg.idfVersions) { - store.setEspIdfVersionList(msg.idfVersions); - } - if (msg.idfTags) { - store.espIdfTags = msg.idfTags; - } - if (msg.idfSetups) { - store.idfSetups = msg.idfSetups; - } - if (msg.pyVersionList) { - store.setPyVersionsList(msg.pyVersionList); - } - if (msg.gitVersion) { - store.gitVersion = msg.gitVersion; - } - if (msg.espIdf) { - store.espIdf = msg.espIdf; - } - if (msg.espIdfContainer) { - store.espIdfContainer = msg.espIdfContainer; - } - if (msg.hasPrerequisites) { - store.hasPrerequisites = msg.hasPrerequisites; - } - if (msg.pathSep) { - store.pathSep = msg.pathSep; - } - if (msg.platform) { - store.platform = msg.platform; - } - if (msg.extensionVersion) { - store.extensionVersion = msg.extensionVersion; - } - if (typeof msg.saveScope !== "undefined") { - store.saveScope = msg.saveScope; - } - if (typeof msg.downloadMirror !== "undefined") { - store.setSelectedDownloadMirror(msg.downloadMirror); - } - break; - case "setEspIdfErrorStatus": - if (typeof msg.errorMsg !== "undefined") { - store.espIdfErrorStatus = msg.errorMsg; - store.isIdfInstalling = false; - } - break; - case "setIsIdfInstalling": - if (typeof msg.installing !== "undefined") { - store.isIdfInstalling = msg.installing; - } - break; - case "setIsInstalled": - if (typeof msg.isInstalled !== "undefined") { - store.isIdfInstalled = msg.isInstalled; - if (msg.installed) { - router.push("/welcome"); - } - } - break; - case "setOpenOcdRulesPath": - if (msg.openOCDRulesPath) { - store.openOCDRulesPath = msg.openOCDRulesPath; - } - break; - case "setPyExecErrorStatus": - if (msg.errorMsg) { - store.isIdfInstalling = false; - store.pyExecErrorStatus = msg.errorMsg; - } - break; - case "setRequiredToolsInfo": - if (msg.toolsInfo) { - store.toolsResults = msg.toolsInfo; - } - break; - case "setSetupMode": - if (typeof msg.setupMode !== "undefined") { - store.setupMode = msg.setupMode; - } - break; - case "updateEspIdfFolder": - if (msg.selectedFolder) { - store.espIdf = msg.selectedFolder; - } - break; - case "updateEspIdfContainerFolder": - if (msg.selectedContainerFolder) { - store.espIdfContainer = msg.selectedContainerFolder; - } - break; - case "updateEspIdfStatus": - if (typeof msg.status !== "undefined") { - store.setStatusEspIdf(msg.status); - } - break; - case "updateEspIdfToolsFolder": - if (msg.selectedToolsFolder) { - store.toolsFolder = msg.selectedToolsFolder; - } - break; - case "updateEspIdfToolsStatus": - if (msg.status) { - store.setStatusEspIdfTools(msg.status); - } - break; - case "updateIdfDownloadStatusDetail": - if (msg.detail) { - store.idfDownloadStatus.progressDetail = msg.detail; - } - if (msg.id) { - store.idfDownloadStatus.id = msg.id; - } - break; - case "updateIdfDownloadStatusPercentage": - if (msg.percentage) { - store.idfDownloadStatus.progress = msg.percentage; - } - if (msg.id) { - store.idfDownloadStatus.id = msg.id; - } - break; - case "updatePkgChecksumResult": - if (msg.id && msg.hashResult) { - store.setToolChecksum({ - name: msg.id, - checksum: msg.hashResult, - }); - } - break; - case "updatePkgDownloadDetail": - if (msg.id && msg.progressDetail) { - store.setToolDetail({ - name: msg.id, - detail: msg.progressDetail, - }); - } - break; - case "updatePkgDownloadFailed": - if (msg.id && msg.hasFailed) { - store.setToolFailed({ - name: msg.id, - hasFailed: msg.hasFailed, - }); - } - break; - case "updatePkgDownloadPercentage": - if (msg.id && msg.percentage) { - store.setToolPercentage({ - name: msg.id, - percentage: msg.percentage, - }); - } - break; - case "updatePyReqsLog": - if (msg.pyReqsLog) { - store.pyReqsLog = msg.pyReqsLog; - store.moveToPySection(); - } - break; - case "updatePythonPath": - if (msg.selectedPyPath) { - store.manualPythonPath = msg.selectedPyPath; - } - break; - case "updatePyVEnvStatus": - if (msg.status) { - store.statusPyVEnv = msg.status; - } - break; - case "updateIdfGitDownloadPercentage": - if (msg.id && msg.percentage) { - store.idfGitDownloadStatus.id = msg.id; - store.idfGitDownloadStatus.progress = msg.percentage; - } - break; - case "updateIdfGitDownloadDetail": - if (msg.id && msg.detail) { - store.idfGitDownloadStatus.progressDetail = msg.detail; - } - break; - case "updateIdfPythonDownloadPercentage": - if (msg.id && msg.percentage) { - store.setIdfPythonPercentage({ - name: msg.id, - percentage: msg.percentage, - }); - } - break; - case "updateIdfPythonDownloadDetail": - if (msg.id && msg.detail) { - store.idfPythonDownloadStatus.progressDetail = msg.detail; - } - break; - case "updateIdfGitStatus": - if (msg.status) { - store.setStatusIdfGit(msg.status); - } - break; - case "updateIdfPythonStatus": - if (msg.status) { - store.setStatusIdfPython(msg.status); - } - break; - case "canAccessFileResponse": - if (!msg.exists) { - store.setIdfPathError( - `The path for ESP-IDF is not valid: ${msg.path} not found.` - ); - } else if (msg.noWhiteSpaceSupport && msg.hasWhitespace) { - store.setIdfPathError( - "White spaces are only supported for ESP-IDF path for versions >= 5.0." - ); - } else { - store.setIdfPathError(""); - } - break; - default: - break; - } -}); diff --git a/src/views/setup/store.ts b/src/views/setup/store.ts deleted file mode 100644 index 120398d39..000000000 --- a/src/views/setup/store.ts +++ /dev/null @@ -1,514 +0,0 @@ -/* - * Project: ESP-IDF VSCode Extension - * File Created: Thursday, 31st August 2023 8:12:24 pm - * Copyright 2023 Espressif Systems (Shanghai) CO LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { defineStore } from "pinia"; -import { ref, Ref } from "vue"; -import { - IdfMirror, - IdfSetup, - IDownload, - IEspIdfLink, - IEspIdfTool, - SetupMode, - StatusType, -} from "./types"; - -declare var acquireVsCodeApi: any; -let vscode: any; -try { - vscode = acquireVsCodeApi(); -} catch (error) { - // tslint:disable-next-line: no-console - console.error(error); -} - -export const useSetupStore = defineStore("setup", () => { - let espIdfVersion: Ref = ref(""); - let areToolsValid: Ref = ref(false); - let espIdf: Ref = ref(""); - let espIdfContainer: Ref = ref(""); - let espIdfErrorStatus: Ref = ref(""); - let espIdfVersionList: Ref = ref([]); - let espIdfTags: Ref = ref([]); - let exportedToolsPaths: Ref = ref(""); - let exportedVars: Ref<{ [key: string]: string }> = ref({}); - let gitVersion: Ref = ref(""); - let hasPrerequisites: Ref = ref(false); - let idfDownloadStatus: Ref = ref({ - id: "", - progress: "", - progressDetail: "", - }); - let idfGitDownloadStatus: Ref = ref({ - id: "", - progress: "", - progressDetail: "", - }); - let idfPythonDownloadStatus: Ref = ref({ - id: "", - progress: "", - progressDetail: "", - }); - let idfSetups: Ref = ref([]); - let isEspIdfValid: Ref = ref(false); - let isIdfInstalling: Ref = ref(false); - let isIdfInstalled: Ref = ref(false); - let manualPythonPath: Ref = ref(""); - let openOCDRulesPath: Ref = ref(""); - let pathSep: Ref = ref("/"); - let platform: Ref = ref(""); - let pyExecErrorStatus: Ref = ref(""); - let whiteSpaceErrorIDF: Ref = ref(""); - let whiteSpaceErrorTools: Ref = ref(""); - let whiteSpaceErrorIDFContainer: Ref = ref(""); - let pyReqsLog: Ref = ref(""); - let pyVersionsList: Ref = ref([]); - let saveScope: Ref = ref(1); - let selectedEspIdfVersion: Ref = ref({ - filename: "", - mirror: "", - name: "", - url: "", - version: "", - }); - let selectedIdfMirror: Ref = ref(IdfMirror.Github); - let selectedSysPython: Ref = ref(""); - let setupMode: Ref = ref(SetupMode.express); - let showIdfTagList: Ref = ref(false); - let statusEspIdf: Ref = ref(StatusType.started); - let statusEspIdfTools: Ref = ref(StatusType.pending); - let statusIdfGit: Ref = ref(StatusType.pending); - let statusIdfPython: Ref = ref(StatusType.pending); - let statusPyVEnv: Ref = ref(StatusType.pending); - let toolsFolder: Ref = ref(""); - let toolsResults: Ref = ref([]); - let extensionVersion: Ref = ref(""); - let idfPathError: Ref = ref(""); - let isInstallButtonDisabled: Ref = ref(false); - let pypiIndex: Ref = ref(""); - - function clearIdfPathError() { - idfPathError.value = ""; - isInstallButtonDisabled.value = false; - } - - function setIdfPathError(error: string) { - idfPathError.value = error; - isInstallButtonDisabled.value = !!error; - } - - function validateEspIdfPath(path: string) { - clearIdfPathError(); - vscode.postMessage({ - command: "canAccessFile", - path, - currentVersion: espIdfVersion.value, - }); - } - - function openEspIdfFolder(): Promise { - return new Promise((resolve) => { - vscode.postMessage({ - command: "openEspIdfFolder", - }); - window.addEventListener("message", function handler(event) { - if (event.data.command === "updateEspIdfFolder") { - window.removeEventListener("message", handler); - resolve(event.data.selectedFolder); - } - }); - }); - } - - function openEspIdfContainerFolder(): Promise { - return new Promise((resolve) => { - vscode.postMessage({ - command: "openEspIdfContainerFolder", - }); - window.addEventListener("message", function handler(event) { - if (event.data.command === "updateEspIdfContainerFolder") { - window.removeEventListener("message", handler); - resolve(event.data.selectedContainerFolder); - } - }); - }); - } - - function openEspIdfToolsFolder(): Promise { - return new Promise((resolve) => { - vscode.postMessage({ - command: "openEspIdfToolsFolder", - }); - window.addEventListener("message", function handler(event) { - if (event.data.command === "updateEspIdfToolsFolder") { - window.removeEventListener("message", handler); - resolve(event.data.selectedToolsFolder); - } - }); - }); - } - - window.addEventListener("message", (event) => { - const message = event.data; - if (message.command === "canAccessFileResponse") { - if (!message.exists) { - setIdfPathError( - `The path for ESP-IDF is not valid: ${message.path} not found.` - ); - } else { - setIdfPathError(""); - } - } - }); - - function checkEspIdfTools() { - const pyPath = - selectedSysPython.value === pyVersionsList.value[pyVersionsList.value.length - 1] - ? manualPythonPath.value - : selectedSysPython.value; - console.log({ - command: "checkEspIdfTools", - espIdf: espIdf.value, - pyPath, - toolsPath: JSON.stringify(toolsResults.value), - }); - vscode.postMessage({ - command: "checkEspIdfTools", - espIdf: espIdf.value, - pyPath, - toolsPath: JSON.stringify(toolsResults.value), - }); - } - - function installEspIdf() { - const pyPath = - selectedSysPython.value === - pyVersionsList.value[pyVersionsList.value.length - 1] - ? manualPythonPath.value - : selectedSysPython.value; - vscode.postMessage({ - command: "installEspIdf", - espIdfContainer: espIdfContainer.value, - manualEspIdfPath: espIdf.value, - mirror: selectedIdfMirror.value, - selectedEspIdfVersion: JSON.stringify(selectedEspIdfVersion.value), - selectedPyPath: pyPath, - setupMode: setupMode.value, - toolsPath: toolsFolder.value, - saveScope: saveScope.value, - pypiIndex: pypiIndex.value, - }); - } - - function installEspIdfTools() { - const pyPath = - selectedSysPython.value === - pyVersionsList.value[pyVersionsList.value.length - 1] - ? manualPythonPath.value - : selectedSysPython.value; - vscode.postMessage({ - command: "installEspIdfTools", - espIdf: espIdf.value, - mirror: selectedIdfMirror.value, - pyPath, - toolsPath: toolsFolder.value, - saveScope: saveScope.value, - pypiIndex: pypiIndex.value, - }); - } - - function openPythonPath() { - vscode.postMessage({ - command: "openPythonPath", - }); - } - - function requestInitialValues() { - vscode.postMessage({ - command: "requestInitialValues", - }); - } - - function saveCustomSettings() { - const pyPath = - selectedSysPython.value === - pyVersionsList.value[pyVersionsList.value.length - 1] - ? manualPythonPath.value - : selectedSysPython.value; - vscode.postMessage({ - command: "saveCustomSettings", - espIdfPath: espIdf.value, - pyBinPath: pyPath, - tools: JSON.stringify(toolsResults.value), - toolsPath: toolsFolder.value, - saveScope: saveScope.value, - mirror: selectedIdfMirror.value, - pypiIndex: pypiIndex.value, - }); - } - - function useDefaultSettings() { - vscode.postMessage({ - command: "usePreviousSettings", - }); - } - - function useIdfSetup(payload: number) { - vscode.postMessage({ - command: "useIdfSetup", - selectedIdfSetup: payload, - saveScope: saveScope.value, - }); - } - - function cleanIdfSetups() { - idfSetups.value = []; - vscode.postMessage({ - command: "cleanIdfSetups", - }); - } - - function exploreComponents() { - vscode.postMessage({ - command: "exploreComponents", - }); - } - - function openImportProject() { - vscode.postMessage({ - command: "importProject", - }); - } - - function openNewProjectPanel() { - vscode.postMessage({ - command: "newProject", - }); - } - function requestInitValues() { - vscode.postMessage({ - command: "requestInitialValues", - }); - } - - function setEspIdfVersionList(espIdfVerList: IEspIdfLink[]) { - espIdfVersionList.value = espIdfVerList; - if (espIdfVerList && espIdfVerList.length > 0) { - selectedEspIdfVersion.value = espIdfVerList[0]; - } - } - - function setPyVersionsList(pyVerList: string[]) { - pyVersionsList.value = pyVerList; - if (pyVerList && pyVerList.length > 0) { - selectedSysPython.value = pyVerList[0]; - } - } - - function setSelectedEspIdfVersion(selectedEspIdfVer: IEspIdfLink) { - selectedEspIdfVersion.value = selectedEspIdfVer; - espIdfVersion.value = selectedEspIdfVer.version; - idfDownloadStatus.value.id = selectedEspIdfVer.name; - // Trigger validation whenever the version changes - if (espIdf.value) { - validateEspIdfPath(espIdf.value); - } - } - - function setToolChecksum(toolData: { name: string; checksum: boolean }) { - for (let i = 0; i < toolsResults.value.length; i++) { - if (toolsResults.value[i].name === toolData.name) { - toolsResults.value[i].hashResult = toolData.checksum; - break; - } - } - } - - function setToolDetail(toolData: { name: string; detail: string }) { - for (let i = 0; i < toolsResults.value.length; i++) { - if (toolsResults.value[i].name === toolData.name) { - toolsResults.value[i].progressDetail = toolData.detail; - break; - } - } - } - - function setToolFailed(toolData: { name: string; hasFailed: boolean }) { - for (let i = 0; i < toolsResults.value.length; i++) { - if (toolsResults.value[i].name === toolData.name) { - toolsResults.value[i].hasFailed = toolData.hasFailed; - break; - } - } - } - - function setToolPercentage(toolData: { name: string; percentage: string }) { - for (let i = 0; i < toolsResults.value.length; i++) { - if (toolsResults.value[i].name === toolData.name) { - toolsResults.value[i].progress = toolData.percentage; - break; - } - } - } - - function setStatusEspIdf(status: StatusType) { - statusEspIdf.value = status; - if (status === StatusType.installed) { - idfDownloadStatus.value.progress = "100.00%"; - } - } - - function setStatusEspIdfTools(status: StatusType) { - statusEspIdfTools.value = status; - if (status === StatusType.installed) { - for (let i = 0; i < toolsResults.value.length; i++) { - toolsResults.value[i].progress = "100.00%"; - } - } - moveToPySection(); - } - - function setSelectedDownloadMirror(mirror: IdfMirror) { - selectedIdfMirror.value = - mirror === IdfMirror.Espressif ? IdfMirror.Espressif : IdfMirror.Github; - } - - function moveToPySection() { - let content = document.getElementById("espidftools") as HTMLDivElement; - if (content) { - content.style.display = "none"; - } - const secNew = document.querySelector("#py-install-status") as HTMLElement; - const configList = document.querySelector("#scrollable") as HTMLElement; - if (secNew) { - const endPosition = secNew.getBoundingClientRect().bottom; - configList.scrollTo({ left: 0, top: endPosition - 10, behavior: "auto" }); - } - } - - function toggleContent(containerId: string) { - var content = document.getElementById(containerId) as HTMLDivElement; - content.style.display === "flex" - ? (content.style.display = "none") - : (content.style.display = "flex"); - } - - function setStatusIdfGit(status: StatusType) { - statusIdfGit.value = status; - if (status === StatusType.installed) { - idfGitDownloadStatus.value.progress = "100.00%"; - } - } - - function setStatusIdfPython(status: StatusType) { - statusIdfPython.value = status; - if (status === StatusType.installed) { - idfPythonDownloadStatus.value.progress = "100.00%"; - } - } - - function setIdfPythonPercentage(statusData: { - name: string; - percentage: string; - }) { - idfPythonDownloadStatus.value.id = statusData.name; - idfPythonDownloadStatus.value.progress = statusData.percentage; - } - - return { - areToolsValid, - espIdf, - espIdfContainer, - espIdfErrorStatus, - espIdfVersionList, - espIdfTags, - exportedToolsPaths, - exportedVars, - extensionVersion, - gitVersion, - hasPrerequisites, - idfDownloadStatus, - idfGitDownloadStatus, - idfPythonDownloadStatus, - idfSetups, - isEspIdfValid, - isIdfInstalling, - isIdfInstalled, - manualPythonPath, - moveToPySection, - openOCDRulesPath, - pathSep, - platform, - pyExecErrorStatus, - pyReqsLog, - pyVersionsList, - saveScope, - selectedEspIdfVersion, - selectedIdfMirror, - selectedSysPython, - setupMode, - showIdfTagList, - statusIdfGit, - statusIdfPython, - statusEspIdf, - statusEspIdfTools, - statusPyVEnv, - toolsFolder, - toolsResults, - checkEspIdfTools, - installEspIdf, - installEspIdfTools, - openEspIdfFolder, - openEspIdfContainerFolder, - openEspIdfToolsFolder, - openPythonPath, - requestInitialValues, - saveCustomSettings, - useDefaultSettings, - useIdfSetup, - cleanIdfSetups, - setEspIdfVersionList, - setPyVersionsList, - setSelectedEspIdfVersion, - setToolChecksum, - setToolDetail, - setToolFailed, - setToolPercentage, - setStatusEspIdf, - setStatusEspIdfTools, - setStatusIdfGit, - setStatusIdfPython, - setIdfPythonPercentage, - setSelectedDownloadMirror, - exploreComponents, - openImportProject, - openNewProjectPanel, - requestInitValues, - toggleContent, - whiteSpaceErrorIDF, - whiteSpaceErrorTools, - whiteSpaceErrorIDFContainer, - idfPathError, - isInstallButtonDisabled, - setIdfPathError, - validateEspIdfPath, - clearIdfPathError, - espIdfVersion, - pypiIndex, - }; -}); diff --git a/src/views/size/App.vue b/src/views/size/App.vue index cd05ca253..685b41bec 100644 --- a/src/views/size/App.vue +++ b/src/views/size/App.vue @@ -120,7 +120,7 @@ onMounted(() => { diff --git a/src/views/tracing/components/LeakList.vue b/src/views/tracing/components/LeakList.vue index df4d3d1b7..6f5c35ebe 100644 --- a/src/views/tracing/components/LeakList.vue +++ b/src/views/tracing/components/LeakList.vue @@ -145,5 +145,5 @@ function fetchFunctionFilePath(addr: string): string { diff --git a/src/views/welcome/App.vue b/src/views/welcome/App.vue index fd0a107ea..b2ecfecc3 100644 --- a/src/views/welcome/App.vue +++ b/src/views/welcome/App.vue @@ -5,7 +5,6 @@ import { useWelcomeStore } from "./store"; import Logo from "./components/logo.vue"; import BlogArticles from "./components/BlogArticles.vue"; import { - IconBeaker, IconComment, IconFolderOpened, IconGear, @@ -16,7 +15,7 @@ import { const store = useWelcomeStore(); -const { espIdf, extensionVersion, showOnInit } = storeToRefs(store); +const { extensionVersion } = storeToRefs(store); const whatsNewLink = computed(() => { return `https://github.com/espressif/vscode-esp-idf-extension/releases/tag/v${extensionVersion.value}`; @@ -44,7 +43,7 @@ onMounted(() => { Version: {{ extensionVersion }} See what's new - +
- + + + ESP-IDF Installation Manager + + Repository @@ -69,7 +80,10 @@ onMounted(() => { ESP-IDF - + Open a new issue @@ -105,25 +119,40 @@ onMounted(() => {

Getting Started

- +

Tutorials

- + Install - + Start a ESP-IDF project - + Configure your project - + Debugging - + Others...
@@ -133,19 +162,34 @@ onMounted(() => {

Documentation

- + Settings - + Troubleshooting - + Features - + Commands - + Additional IDE features...
@@ -237,18 +281,18 @@ onMounted(() => { cursor: pointer; user-select: none; white-space: nowrap; - + &:hover { color: var(--vscode-button-background); } - + input[type="checkbox"] { width: 16px; height: 16px; margin: 0; accent-color: var(--vscode-button-background); } - + .checkbox-label { font-size: 14px; color: var(--vscode-foreground); @@ -304,15 +348,15 @@ onMounted(() => { font-size: 14px; cursor: pointer; transition: all 0.2s ease; - + &:hover { background-color: var(--vscode-button-hoverBackground); } - + &:active { background-color: var(--vscode-button-activeBackground); } - + &:focus { outline: 1px solid var(--vscode-focusBorder); outline-offset: 2px; @@ -327,7 +371,7 @@ onMounted(() => { .subsection { margin-bottom: 0; - + &:last-child { margin-bottom: 0; } @@ -357,29 +401,29 @@ onMounted(() => { border-radius: 4px; transition: all 0.2s ease; position: relative; - + &:hover { color: var(--vscode-button-background); transform: translateY(-1px); box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); font-weight: 500; } - + &:active { transform: translateY(0); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); color: var(--vscode-button-activeBackground); } - + &:focus { outline: 1px solid var(--vscode-focusBorder); outline-offset: 2px; } - + .icon { transition: transform 0.2s ease; } - + &:hover .icon { transform: scale(1.1); color: var(--vscode-button-background); @@ -398,12 +442,12 @@ onMounted(() => { grid-template-columns: 1fr; gap: 20px; } - + .external-links { flex-direction: column; gap: 8px; } - + .getting-started-grid { grid-template-columns: 1fr; gap: 20px; diff --git a/src/welcome/panel.ts b/src/welcome/panel.ts index 171d37a2f..006d6694e 100644 --- a/src/welcome/panel.ts +++ b/src/welcome/panel.ts @@ -131,7 +131,7 @@ export class WelcomePanel { }); break; case "configureExtension": - await commands.executeCommand("espIdf.setup.start"); + await commands.executeCommand("espIdf.installManager"); break; case "newProject": await commands.executeCommand("espIdf.newProject.start"); diff --git a/src/welcome/welcomeInit.ts b/src/welcome/welcomeInit.ts index 752ca725c..e0599aefe 100644 --- a/src/welcome/welcomeInit.ts +++ b/src/welcome/welcomeInit.ts @@ -19,6 +19,7 @@ import { Progress, Uri } from "vscode"; import { readParameter } from "../idfConfiguration"; import { packageJson } from "../utils"; +import { ESP } from "../config"; export interface IWelcomeArgs { espIdf: string; @@ -27,17 +28,18 @@ export interface IWelcomeArgs { } export async function getWelcomePageInitialValues( - progress: Progress<{ message: string; increment: number }>, - workspace?: Uri, + progress: Progress<{ message: string; increment: number }> ) { progress.report({ increment: 20, message: "Getting extension version..." }); const extensionVersion = packageJson.version as string; - const confEspIdfPath = readParameter("idf.espIdfPath", workspace) as string; + const currentEnvVars = ESP.ProjectConfiguration.store.get<{ + [key: string]: string; + }>(ESP.ProjectConfiguration.CURRENT_IDF_CONFIGURATION, {}); const confShowOnboardingOnInit = readParameter( "idf.showOnboardingOnInit" ) as boolean; const welcomePageArgs = { - espIdf: confEspIdfPath, + espIdf: currentEnvVars["IDF_PATH"], extensionVersion, showOnInit: confShowOnboardingOnInit, }; diff --git a/templates/.devcontainer/devcontainer.json b/templates/.devcontainer/devcontainer.json index b80178618..246b79f1c 100644 --- a/templates/.devcontainer/devcontainer.json +++ b/templates/.devcontainer/devcontainer.json @@ -7,8 +7,6 @@ "vscode": { "settings": { "terminal.integrated.defaultProfile.linux": "bash", - "idf.espIdfPath": "/opt/esp/idf", - "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git" }, "extensions": [ diff --git a/templates/.vscode/c_cpp_properties.json b/templates/.vscode/c_cpp_properties.json index 75ad88aad..e57f37efe 100644 --- a/templates/.vscode/c_cpp_properties.json +++ b/templates/.vscode/c_cpp_properties.json @@ -5,14 +5,10 @@ "compilerPath": "${default}", "compileCommands": "${config:idf.buildPath}/compile_commands.json", "includePath": [ - "${config:idf.espIdfPath}/components/**", - "${config:idf.espIdfPathWin}/components/**", "${workspaceFolder}/**" ], "browse": { "path": [ - "${config:idf.espIdfPath}/components", - "${config:idf.espIdfPathWin}/components", "${workspaceFolder}" ], "limitSymbolsToIncludedHeaders": true diff --git a/testFiles/testWorkspace/.vscode/c_cpp_properties.json b/testFiles/testWorkspace/.vscode/c_cpp_properties.json index 75ad88aad..e57f37efe 100755 --- a/testFiles/testWorkspace/.vscode/c_cpp_properties.json +++ b/testFiles/testWorkspace/.vscode/c_cpp_properties.json @@ -5,14 +5,10 @@ "compilerPath": "${default}", "compileCommands": "${config:idf.buildPath}/compile_commands.json", "includePath": [ - "${config:idf.espIdfPath}/components/**", - "${config:idf.espIdfPathWin}/components/**", "${workspaceFolder}/**" ], "browse": { "path": [ - "${config:idf.espIdfPath}/components", - "${config:idf.espIdfPathWin}/components", "${workspaceFolder}" ], "limitSymbolsToIncludedHeaders": true diff --git a/testFiles/testWorkspace/.vscode/settings.json b/testFiles/testWorkspace/.vscode/settings.json index eb2b2f032..78a1b1882 100644 --- a/testFiles/testWorkspace/.vscode/settings.json +++ b/testFiles/testWorkspace/.vscode/settings.json @@ -1,16 +1,11 @@ { - "idf.espAdfPath": "/test/esp-adf", - "idf.espIdfPath": "${env:IDF_PATH}", - "idf.espMdfPath": "/test/esp-mdf", "idf.port": "/serialport", "idf.openOcdConfigs": [ - "board/esp32-wrover-kit-3.3v.cfg" + "board/esp32-wrover-kit-3.3v.cfg" ], - "idf.toolsPath": "${env:IDF_TOOLS_PATH}", "idf.gitPath": "/usr/bin/git", "files.simpleDialog.enable": true, "window.dialogStyle": "custom", "idf.notificationMode": "Output", - "idf.showOnboardingOnInit": false, - "idf.pythonInstallPath": "/usr/bin/python3" + "idf.showOnboardingOnInit": false } \ No newline at end of file diff --git a/testFiles/testWorkspace/main/hello_world_main.c b/testFiles/testWorkspace/main/hello_world_main.c index 16db9344a..c0aafdb7c 100644 --- a/testFiles/testWorkspace/main/hello_world_main.c +++ b/testFiles/testWorkspace/main/hello_world_main.c @@ -2,5 +2,4 @@ void app_main(void) { - printf("Hello world!\n"); } \ No newline at end of file diff --git a/walkthroughs/basic/configuration.md b/walkthroughs/basic/configuration.md index 597e18154..908b1af6d 100644 --- a/walkthroughs/basic/configuration.md +++ b/walkthroughs/basic/configuration.md @@ -1,28 +1,17 @@ # Configure the ESP-IDF VS Code Extension -### 1. Select Setup Mode -Choose the Express setup mode (recommended). -![Express Setup Mode selection](../../media/walkthrough/express-setup.png) +### 1. Open ESP-IDF Installation Manager (EIM) +Install ESP-IDF using EIM installer by clicking the [ESP-IDF: Open ESP-IDF Install Manager](command:espIdf.installManager) command. ### 2. Choose ESP-IDF Version -Expand dropdown menu and select an ESP-IDF version. +After ESP-IDF is installed, now choose ESP-IDF setup in this extension by running the [ESP-IDF: Select current ESP-IDF version](command:espIdf.selectCurrentIdfVersion) command. -![ESP-IDF Version selection](../../media/walkthrough/idf-version.png) +### 3. Post-Installation Step (Linux only) +For Linux users, please add OpenOCD rules in `/etc/udev/rules.d` which you need to run with sudo privileges. -### 3. Set Python Path (macOS and Linux only) -Choose the appropriate Python path from the dropdown. - -![Python Path selection](../../media/walkthrough/python-selection.png) - -### 4. Install -Click the Install button to begin the installation process. - -![Start Installation](../../media/walkthrough/install-btn.png) - -### 5. Post-Installation Step (Linux only) -For Linux users, a message is shown to add OpenOCD rules in `/etc/udev/rules.d` which you need to run with sudo privileges. +## Related Resources +Please read the [ESP-IDF Install Manager](https://docs.espressif.com/projects/idf-im-ui/en/latest/general_info.html) documentation. -## Related Resources +In case you get stuck, you can always follow the in depth [Installation](https://docs.espressif.com/projects/vscode-esp-idf-extension/en/latest/installation.html) documentation. -In case you get stuck, you can always follow the in depth [Installation](https://docs.espressif.com/projects/vscode-esp-idf-extension/en/latest/installation.html) documentation. \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 739df821a..6907a6f01 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -102,7 +102,6 @@ const webViewConfig = { "menuconfig", "main.ts" ), - setup: path.resolve(__dirname, "src", "views", "setup", "main.ts"), nvsPartitionTable: path.resolve( __dirname, "src", @@ -160,6 +159,7 @@ const webViewConfig = { loader: "sass-loader", options: { sourceMap: true, + implementation: require("sass"), }, }, ], diff --git a/yarn.lock b/yarn.lock index ff446472e..59078bc4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15,128 +15,90 @@ "@azu/format-text" "^1.0.1" "@azure-rest/ai-translation-text@^1.0.0-beta.1": - version "1.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@azure-rest/ai-translation-text/-/ai-translation-text-1.0.0-beta.1.tgz#bf61811d0a3fc7e689e91b5a5452d0128e270b67" - integrity sha512-h1xDrmVRbk6eAAqTHxy9Npv543cWteqgop15sVXBQhadOwzHoREn+UqMCzNfvL6/AjiInUlwNSaNQK1ANgobLA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/@azure-rest/ai-translation-text/-/ai-translation-text-1.0.1.tgz#485f81ba5638a3004eda1bb563bf061445ba1932" + integrity sha512-lUs1FfBXjik6EReUEYP1ogkhaSPHZdUV+EB215y7uejuyHgG1RXD2aLsqXQrluZwXcLMdN+bTzxylKBc5xDhgQ== dependencies: - "@azure-rest/core-client" "^1.1.0" - "@azure/core-auth" "^1.3.0" - "@azure/core-rest-pipeline" "^1.8.0" - "@azure/logger" "^1.0.0" - tslib "^2.2.0" + "@azure-rest/core-client" "^2.3.1" + "@azure/core-auth" "^1.9.0" + "@azure/core-rest-pipeline" "^1.18.0" + "@azure/logger" "^1.1.4" + tslib "^2.8.1" -"@azure-rest/core-client@^1.1.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@azure-rest/core-client/-/core-client-1.4.0.tgz#3be28c02c6c20e49dea73a7f012daeeda4eacb8e" - integrity sha512-ozTDPBVUDR5eOnMIwhggbnVmOrka4fXCs8n8mvUo4WLLc38kki6bAOByDoVZZPz/pZy2jMt2kwfpvy/UjALj6w== - dependencies: - "@azure/abort-controller" "^2.0.0" - "@azure/core-auth" "^1.3.0" - "@azure/core-rest-pipeline" "^1.5.0" - "@azure/core-tracing" "^1.0.1" - "@azure/core-util" "^1.0.0" +"@azure-rest/core-client@^2.3.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@azure-rest/core-client/-/core-client-2.5.1.tgz#4c1346d6698d7a40252869799958928ac98babe8" + integrity sha512-EHaOXW0RYDKS5CFffnixdyRPak5ytiCtU7uXDcP/uiY+A6jFRwNGzzJBiznkCzvi5EYpY+YWinieqHb0oY916A== + dependencies: + "@azure/abort-controller" "^2.1.2" + "@azure/core-auth" "^1.10.0" + "@azure/core-rest-pipeline" "^1.22.0" + "@azure/core-tracing" "^1.3.0" + "@typespec/ts-http-runtime" "^0.3.0" tslib "^2.6.2" -"@azure/abort-controller@^2.0.0": +"@azure/abort-controller@^2.0.0", "@azure/abort-controller@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d" integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA== dependencies: tslib "^2.6.2" -"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.7.2.tgz#558b7cb7dd12b00beec07ae5df5907d74df1ebd9" - integrity sha512-Igm/S3fDYmnMq1uKS38Ae1/m37B3zigdlZw+kocwEhh5GjyKjPrXKO2J6rzpC1wAxrNil/jX9BJRqBshyjnF3g== - dependencies: - "@azure/abort-controller" "^2.0.0" - "@azure/core-util" "^1.1.0" - tslib "^2.6.2" - -"@azure/core-auth@^1.8.0", "@azure/core-auth@^1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.9.0.tgz#ac725b03fabe3c892371065ee9e2041bee0fd1ac" - integrity sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw== +"@azure/core-auth@^1.10.0", "@azure/core-auth@^1.9.0": + version "1.10.1" + resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.10.1.tgz#68a17fa861ebd14f6fd314055798355ef6bedf1b" + integrity sha512-ykRMW8PjVAn+RS6ww5cmK9U2CyH9p4Q88YJwvUslfuMmN98w/2rdGRLPqJYObapBCdzBVeDgYWdJnFPFb7qzpg== dependencies: - "@azure/abort-controller" "^2.0.0" - "@azure/core-util" "^1.11.0" + "@azure/abort-controller" "^2.1.2" + "@azure/core-util" "^1.13.0" tslib "^2.6.2" "@azure/core-client@^1.9.2": - version "1.9.4" - resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.9.4.tgz#bb9bb85edc780fc65630b6d8ffa172c3633ca8fe" - integrity sha512-f7IxTD15Qdux30s2qFARH+JxgwxWLG2Rlr4oSkPGuLWm+1p5y1+C04XGLA0vmX6EtqfutmjvpNmAfgwVIS5hpw== - dependencies: - "@azure/abort-controller" "^2.0.0" - "@azure/core-auth" "^1.4.0" - "@azure/core-rest-pipeline" "^1.20.0" - "@azure/core-tracing" "^1.0.0" - "@azure/core-util" "^1.6.1" - "@azure/logger" "^1.0.0" - tslib "^2.6.2" - -"@azure/core-rest-pipeline@^1.17.0", "@azure/core-rest-pipeline@^1.20.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.21.0.tgz#65a3600da9f3b635e59aadc0a75212b7815bc7b5" - integrity sha512-a4MBwe/5WKbq9MIxikzgxLBbruC5qlkFYlBdI7Ev50Y7ib5Vo/Jvt5jnJo7NaWeJ908LCHL0S1Us4UMf1VoTfg== - dependencies: - "@azure/abort-controller" "^2.0.0" - "@azure/core-auth" "^1.8.0" - "@azure/core-tracing" "^1.0.1" - "@azure/core-util" "^1.11.0" - "@azure/logger" "^1.0.0" - "@typespec/ts-http-runtime" "^0.2.3" - tslib "^2.6.2" - -"@azure/core-rest-pipeline@^1.5.0", "@azure/core-rest-pipeline@^1.8.0": - version "1.15.2" - resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.15.2.tgz#421729bbd8cd5f9f50b403e79941f27ac1bdc302" - integrity sha512-BmWfpjc/QXc2ipHOh6LbUzp3ONCaa6xzIssTU0DwH9bbYNXJlGUL6tujx5TrbVd/QQknmS+vlQJGrCq2oL1gZA== - dependencies: - "@azure/abort-controller" "^2.0.0" - "@azure/core-auth" "^1.4.0" - "@azure/core-tracing" "^1.0.1" - "@azure/core-util" "^1.3.0" - "@azure/logger" "^1.0.0" - http-proxy-agent "^7.0.0" - https-proxy-agent "^7.0.0" - tslib "^2.6.2" - -"@azure/core-tracing@^1.0.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.2.0.tgz#7be5d53c3522d639cf19042cbcdb19f71bc35ab2" - integrity sha512-UKTiEJPkWcESPYJz3X5uKRYyOcJD+4nYph+KpfdPRnQJVrZfk0KJgdnaAWKfhsBBtAf/D58Az4AvCJEmWgIBAg== - dependencies: + version "1.10.1" + resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.10.1.tgz#83d78f97d647ab22e6811a7a68bb4223e7a1d019" + integrity sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w== + dependencies: + "@azure/abort-controller" "^2.1.2" + "@azure/core-auth" "^1.10.0" + "@azure/core-rest-pipeline" "^1.22.0" + "@azure/core-tracing" "^1.3.0" + "@azure/core-util" "^1.13.0" + "@azure/logger" "^1.3.0" tslib "^2.6.2" -"@azure/core-tracing@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.1.2.tgz#065dab4e093fb61899988a1cdbc827d9ad90b4ee" - integrity sha512-dawW9ifvWAWmUm9/h+/UQ2jrdvjCJ7VJEuCJ6XVNudzcOwm53BFZH4Q845vjfgoUAM8ZxokvVNxNxAITc502YA== - dependencies: +"@azure/core-rest-pipeline@^1.17.0", "@azure/core-rest-pipeline@^1.18.0", "@azure/core-rest-pipeline@^1.22.0": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.1.tgz#f47bc02ff9a79f62e6a32aa375420b1b86dcbccd" + integrity sha512-UVZlVLfLyz6g3Hy7GNDpooMQonUygH7ghdiSASOOHy97fKj/mPLqgDX7aidOijn+sCMU+WU8NjlPlNTgnvbcGA== + dependencies: + "@azure/abort-controller" "^2.1.2" + "@azure/core-auth" "^1.10.0" + "@azure/core-tracing" "^1.3.0" + "@azure/core-util" "^1.13.0" + "@azure/logger" "^1.3.0" + "@typespec/ts-http-runtime" "^0.3.0" tslib "^2.6.2" -"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.0", "@azure/core-util@^1.3.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.9.0.tgz#469afd7e6452d5388b189f90d33f7756b0b210d1" - integrity sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw== +"@azure/core-tracing@^1.0.0", "@azure/core-tracing@^1.3.0": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.3.1.tgz#e971045c901ea9c110616b0e1db272507781d5f6" + integrity sha512-9MWKevR7Hz8kNzzPLfX4EAtGM2b8mr50HPDBvio96bURP/9C+HjdH3sBlLSNNrvRAr5/k/svoH457gB5IKpmwQ== dependencies: - "@azure/abort-controller" "^2.0.0" tslib "^2.6.2" -"@azure/core-util@^1.11.0", "@azure/core-util@^1.6.1": - version "1.12.0" - resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.12.0.tgz#0b8c2837e6d67c3fbaeae20df34cf07f66b3480d" - integrity sha512-13IyjTQgABPARvG90+N2dXpC+hwp466XCdQXPCRlbWHgd3SJd5Q1VvaBGv6k1BIa4MQm6hAF1UBU1m8QUxV8sQ== +"@azure/core-util@^1.11.0", "@azure/core-util@^1.13.0": + version "1.13.1" + resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.13.1.tgz#6dff2ff6d3c9c6430c6f4d3b3e65de531f10bafe" + integrity sha512-XPArKLzsvl0Hf0CaGyKHUyVgF7oDnhKoP85Xv6M4StF/1AhfORhZudHtOyf2s+FcbuQ9dPRAjB8J2KvRRMUK2A== dependencies: - "@azure/abort-controller" "^2.0.0" - "@typespec/ts-http-runtime" "^0.2.2" + "@azure/abort-controller" "^2.1.2" + "@typespec/ts-http-runtime" "^0.3.0" tslib "^2.6.2" "@azure/identity@^4.1.0": - version "4.10.1" - resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.10.1.tgz#6ce1e7b367d2eb6680d0efa5817382aafcd86f05" - integrity sha512-YM/z6RxRtFlXUH2egAYF/FDPes+MUE6ZoknjEdaq7ebJMMNUzn9zCJ3bd2ZZZlkP0r1xKa88kolhFH/FGV7JnA== + version "4.13.0" + resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.13.0.tgz#b2be63646964ab59e0dc0eadca8e4f562fc31f96" + integrity sha512-uWC0fssc+hs1TGGVkkghiaFkkS7NkTxfnCH+Hdg+yTehTpMcehpok4PgUKKdyCH+9ldu6FhiHRv84Ntqj1vVcw== dependencies: "@azure/abort-controller" "^2.0.0" "@azure/core-auth" "^1.9.0" @@ -150,35 +112,36 @@ open "^10.1.0" tslib "^2.2.0" -"@azure/logger@^1.0.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.1.2.tgz#3f4b876cefad328dc14aff8b850d63b611e249dc" - integrity sha512-l170uE7bsKpIU6B/giRc9i4NI0Mj+tANMMMxf7Zi/5cKzEqPayP7+X1WPrG7e+91JgY8N+7K7nF2WOi7iVhXvg== +"@azure/logger@^1.0.0", "@azure/logger@^1.1.4", "@azure/logger@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.3.0.tgz#5501cf85d4f52630602a8cc75df76568c969a827" + integrity sha512-fCqPIfOcLE+CGqGPd66c8bZpwAji98tZ4JI9i/mlTNTlsIWslCfpg48s/ypyLxZTump5sypjrKn2/kY7q8oAbA== dependencies: + "@typespec/ts-http-runtime" "^0.3.0" tslib "^2.6.2" "@azure/msal-browser@^4.2.0": - version "4.13.2" - resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-4.13.2.tgz#122ff03d15a50e7115a7322c91ce63818b8a0c3c" - integrity sha512-lS75bF6FYZRwsacKLXc8UYu/jb+gOB7dtZq5938chCvV/zKTFDnzuXxCXhsSUh0p8s/P8ztgbfdueD9lFARQlQ== + version "4.26.0" + resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-4.26.0.tgz#646622547656c83dd3ef8651322fa689cd2381e2" + integrity sha512-Ie3SZ4IMrf9lSwWVzzJrhTPE+g9+QDUfeor1LKMBQzcblp+3J/U1G8hMpNSfLL7eA5F/DjjPXkATJ5JRUdDJLA== dependencies: - "@azure/msal-common" "15.7.1" + "@azure/msal-common" "15.13.1" -"@azure/msal-common@15.7.1": - version "15.7.1" - resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-15.7.1.tgz#6f8df5ace9c94d570b5eec1abc6ebdd4e12831f1" - integrity sha512-a0eowoYfRfKZEjbiCoA5bPT3IlWRAdGSvi63OU23Hv+X6EI8gbvXCoeqokUceFMoT9NfRUWTJSx5FiuzruqT8g== +"@azure/msal-common@15.13.1": + version "15.13.1" + resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-15.13.1.tgz#3ff635e38f24b656539228c14b095d9e36a1e524" + integrity sha512-vQYQcG4J43UWgo1lj7LcmdsGUKWYo28RfEvDQAEMmQIMjSFufvb+pS0FJ3KXmrPmnWlt1vHDl3oip6mIDUQ4uA== "@azure/msal-node@^3.5.0": - version "3.6.1" - resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-3.6.1.tgz#1f288c3de15bdd734cc41a39bbd50f5a83fd64a1" - integrity sha512-ctcVz4xS+st5KxOlQqgpvA+uDFAa59CvkmumnuhlD2XmNczloKBdCiMQG7/TigSlaeHe01qoOlDjz3TyUAmKUg== + version "3.8.1" + resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-3.8.1.tgz#99ad17f798b1e8d9a9bbdb7a872e7b14f8a0d508" + integrity sha512-HszfqoC+i2C9+BRDQfuNUGp15Re7menIhCEbFCQ49D3KaqEDrgZIgQ8zSct4T59jWeUIL9N/Dwiv4o2VueTdqQ== dependencies: - "@azure/msal-common" "15.7.1" + "@azure/msal-common" "15.13.1" jsonwebtoken "^9.0.0" uuid "^8.3.0" -"@babel/code-frame@^7.21.4": +"@babel/code-frame@^7.26.2": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be" integrity sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg== @@ -187,44 +150,35 @@ js-tokens "^4.0.0" picocolors "^1.1.1" -"@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/helper-validator-identifier@^7.27.1": +"@babel/helper-string-parser@^7.27.1": version "7.27.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8" - integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow== + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687" + integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA== -"@babel/parser@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" - integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== +"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4" + integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q== -"@babel/runtime@^7.16.7": - version "7.27.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.27.6.tgz#ec4070a04d76bae8ddbb10770ba55714a417b7c6" - integrity sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q== +"@babel/parser@^7.28.4": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08" + integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ== + dependencies: + "@babel/types" "^7.28.5" -"@babel/types@^7.23.0": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" - integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== +"@babel/types@^7.23.0", "@babel/types@^7.28.5": + version "7.28.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b" + integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.27.1" + "@babel/helper-validator-identifier" "^7.28.5" "@bazel/runfiles@^6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-6.3.1.tgz#3f8824b2d82853377799d42354b4df78ab0ace0b" - integrity sha512-1uLNT5NZsUVIGS4syuHwTzZ8HycMPyr6POA3FCE4GbMtc4rhoJk8aZKtNIRthJYfL+iioppi+rTfH3olMPr9nA== + version "6.5.0" + resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-6.5.0.tgz#63cf7b77b91b54873e75f7a08fabec215c6888be" + integrity sha512-RzahvqTkfpY2jsDxo8YItPX+/iZ6hbiikw1YhE0bA9EKBR5Og8Pa6FHn9PO9M0zaXRVsr0GFQLKbB/0rzy9SzA== "@bcoe/v8-coverage@^1.0.1": version "1.0.2" @@ -242,24 +196,24 @@ integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== "@emnapi/core@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.4.3.tgz#9ac52d2d5aea958f67e52c40a065f51de59b77d6" - integrity sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g== + version "1.7.0" + resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.7.0.tgz#135de4e8858763989112281bdf38ca02439db7c3" + integrity sha512-pJdKGq/1iquWYtv1RRSljZklxHCOCAJFJrImO5ZLKPJVJlVUcs8yFwNQlqS0Lo8xT1VAXXTCZocF9n26FWEKsw== dependencies: - "@emnapi/wasi-threads" "1.0.2" + "@emnapi/wasi-threads" "1.1.0" tslib "^2.4.0" "@emnapi/runtime@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.4.3.tgz#c0564665c80dc81c448adac23f9dfbed6c838f7d" - integrity sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ== + version "1.7.0" + resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.0.tgz#d7ef3832df8564fe5903bf0567aedbd19538ecbe" + integrity sha512-oAYoQnCYaQZKVS53Fq23ceWMRxq5EhQsE0x0RdQ55jT7wagMu5k+fS39v1fiSLrtrLQlXwVINenqhLMtTrV/1Q== dependencies: tslib "^2.4.0" -"@emnapi/wasi-threads@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz#977f44f844eac7d6c138a415a123818c655f874c" - integrity sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA== +"@emnapi/wasi-threads@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf" + integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ== dependencies: tslib "^2.4.0" @@ -379,14 +333,14 @@ integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== "@iconify-prerendered/vue-codicon@^0.23.1693459661": - version "0.23.1705647923" - resolved "https://registry.yarnpkg.com/@iconify-prerendered/vue-codicon/-/vue-codicon-0.23.1705647923.tgz#303ebd2411398938c164bddb61883937510984de" - integrity sha512-gPHR6RvGJf2fmVEY2iMCmG8li4kctqZofjW+m0jSeitxAitiTO0E/eUpMS6oWZeTn1J4cTy0vOz5cGPHypD7XA== + version "0.23.1715922202" + resolved "https://registry.yarnpkg.com/@iconify-prerendered/vue-codicon/-/vue-codicon-0.23.1715922202.tgz#38c5047283df57565fd2a887069e60a7dc619972" + integrity sha512-BQ5/K7/CrkCb8neSGoMjIpdx9HkJdIpNh3tPenAkA67qfoWwK+9+iNVIwTGixemw9vXyRdSGHCDl3FZTnu0k0Q== -"@interactjs/types@1.10.26": - version "1.10.26" - resolved "https://registry.yarnpkg.com/@interactjs/types/-/types-1.10.26.tgz#5a6c0ef1dda9763515ff1192a40ecc99101c7a48" - integrity sha512-DekYpdkMV3XJVd/0k3f4pJluZAsCiG86yEtVXvGLK0lS/Fj0+OzYEv7HoMpcBZSkQ8s7//yaeEBgnxy2tV81lA== +"@interactjs/types@1.10.27": + version "1.10.27" + resolved "https://registry.yarnpkg.com/@interactjs/types/-/types-1.10.27.tgz#10afd71cef2498e2b5192cf0d46f937d8ceb767f" + integrity sha512-BUdv0cvs4H5ODuwft2Xp4eL8Vmi3LcihK42z0Ft/FbVJZoRioBsxH+LlsBdK4tAie7PqlKGy+1oyOncu1nQ6eA== "@isaacs/balanced-match@^4.0.1": version "4.0.1" @@ -417,62 +371,53 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f" + integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA== dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/sourcemap-codec" "^1.5.0" + "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== "@jridgewell/source-map@^0.3.3": - version "0.3.5" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" - integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== + version "0.3.11" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba" + integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA== dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== +"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5": + version "1.5.5" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba" + integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og== -"@jridgewell/trace-mapping@^0.3.12": - version "0.3.25" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" - integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.31" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0" + integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.22" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" - integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw== - dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" +"@keyv/serialize@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@keyv/serialize/-/serialize-1.1.1.tgz#0c01dd3a3483882af7cf3878d4e71d505c81fc4a" + integrity sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA== "@napi-rs/wasm-runtime@^0.2.5": - version "0.2.11" - resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.11.tgz#192c1610e1625048089ab4e35bc0649ce478500e" - integrity sha512-9DPkXtvHydrcOsopiYpUgPHpmj0HWZKMUnL2dZqpvC42lsratuBG06V5ipyno0fUek5VlFsNQ+AcFATSrJXgMA== + version "0.2.12" + resolved "https://registry.yarnpkg.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz#3e78a8b96e6c33a6c517e1894efbd5385a7cb6f2" + integrity sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ== dependencies: "@emnapi/core" "^1.4.3" "@emnapi/runtime" "^1.4.3" - "@tybys/wasm-util" "^0.9.0" + "@tybys/wasm-util" "^0.10.0" "@node-rs/crc32-android-arm-eabi@1.10.6": version "1.10.6" @@ -587,238 +532,332 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@parcel/watcher-android-arm64@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz#507f836d7e2042f798c7d07ad19c3546f9848ac1" + integrity sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA== + +"@parcel/watcher-darwin-arm64@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz#3d26dce38de6590ef79c47ec2c55793c06ad4f67" + integrity sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw== + +"@parcel/watcher-darwin-x64@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz#99f3af3869069ccf774e4ddfccf7e64fd2311ef8" + integrity sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg== + +"@parcel/watcher-freebsd-x64@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz#14d6857741a9f51dfe51d5b08b7c8afdbc73ad9b" + integrity sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ== + +"@parcel/watcher-linux-arm-glibc@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz#43c3246d6892381db473bb4f663229ad20b609a1" + integrity sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA== + +"@parcel/watcher-linux-arm-musl@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz#663750f7090bb6278d2210de643eb8a3f780d08e" + integrity sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q== + +"@parcel/watcher-linux-arm64-glibc@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz#ba60e1f56977f7e47cd7e31ad65d15fdcbd07e30" + integrity sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w== + +"@parcel/watcher-linux-arm64-musl@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz#f7fbcdff2f04c526f96eac01f97419a6a99855d2" + integrity sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg== + +"@parcel/watcher-linux-x64-glibc@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz#4d2ea0f633eb1917d83d483392ce6181b6a92e4e" + integrity sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A== + +"@parcel/watcher-linux-x64-musl@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz#277b346b05db54f55657301dd77bdf99d63606ee" + integrity sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg== + +"@parcel/watcher-win32-arm64@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz#7e9e02a26784d47503de1d10e8eab6cceb524243" + integrity sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw== + +"@parcel/watcher-win32-ia32@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz#2d0f94fa59a873cdc584bf7f6b1dc628ddf976e6" + integrity sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ== + +"@parcel/watcher-win32-x64@2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz#ae52693259664ba6f2228fa61d7ee44b64ea0947" + integrity sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA== + +"@parcel/watcher@^2.4.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.5.1.tgz#342507a9cfaaf172479a882309def1e991fb1200" + integrity sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg== + dependencies: + detect-libc "^1.0.3" + is-glob "^4.0.3" + micromatch "^4.0.5" + node-addon-api "^7.0.0" + optionalDependencies: + "@parcel/watcher-android-arm64" "2.5.1" + "@parcel/watcher-darwin-arm64" "2.5.1" + "@parcel/watcher-darwin-x64" "2.5.1" + "@parcel/watcher-freebsd-x64" "2.5.1" + "@parcel/watcher-linux-arm-glibc" "2.5.1" + "@parcel/watcher-linux-arm-musl" "2.5.1" + "@parcel/watcher-linux-arm64-glibc" "2.5.1" + "@parcel/watcher-linux-arm64-musl" "2.5.1" + "@parcel/watcher-linux-x64-glibc" "2.5.1" + "@parcel/watcher-linux-x64-musl" "2.5.1" + "@parcel/watcher-win32-arm64" "2.5.1" + "@parcel/watcher-win32-ia32" "2.5.1" + "@parcel/watcher-win32-x64" "2.5.1" + "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@redhat-developer/locators@^1.15.0": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@redhat-developer/locators/-/locators-1.15.0.tgz#dda2530a0807ef4dee65ecf352bacca466f39bcf" - integrity sha512-xxkCoCQsqiA7IVR5kdNfU3MnuT9QSYDeu0KXrwW59FMCcZpUftz6uiQkqgbB212ASlS3mxVhyYpqJan4zr+XtA== +"@redhat-developer/locators@^1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@redhat-developer/locators/-/locators-1.17.0.tgz#f65f2862bf985c5a526b9e529a12623ea094dbd7" + integrity sha512-CPDrTJfrA5lxXPd64RHuntq+foRorMIOQAN0tlaQQD5wX0X2xlCOf324TVWS1hmTiYHtA8VfFTJNOjMQYvu0Mw== -"@redhat-developer/page-objects@^1.15.0": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@redhat-developer/page-objects/-/page-objects-1.15.0.tgz#61cf001a6078828912e7dd8678bae56aab593592" - integrity sha512-Mfr7rVcFB+J16VzLbbqLF9Yo1W7G2bgjkVv0vPUrlkz1dgYdAjZpaQpjs6dVlRO5Uopt11loYu4SS+wnxPopMw== +"@redhat-developer/page-objects@^1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@redhat-developer/page-objects/-/page-objects-1.17.0.tgz#9fc8fc8703d3d913863326b524eb6cdd37e21997" + integrity sha512-KytdvW8iHyECmt7rLf/MWdrtHmUi/SIkgWowjscIx0+U6sgXW7hHZ/5/gWP5HGX0Q5K1AA67veC75x2eZosN2g== dependencies: - clipboardy "^4.0.0" + clipboardy "^5.0.0" clone-deep "^4.0.1" compare-versions "^6.1.1" - fs-extra "^11.3.0" + fs-extra "^11.3.2" type-fest "^4.41.0" -"@rollup/rollup-android-arm-eabi@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.1.tgz#7d41dc45adcfcb272504ebcea9c8a5b2c659e963" - integrity sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag== - -"@rollup/rollup-android-arm64@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.1.tgz#6c708fae2c9755e994c42d56c34a94cb77020650" - integrity sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw== - -"@rollup/rollup-darwin-arm64@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.1.tgz#85ccf92ab114e434c83037a175923a525635cbb4" - integrity sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw== - -"@rollup/rollup-darwin-x64@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.1.tgz#0af089f3d658d05573208dabb3a392b44d7f4630" - integrity sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw== - -"@rollup/rollup-freebsd-arm64@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.1.tgz#46c22a16d18180e99686647543335567221caa9c" - integrity sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA== - -"@rollup/rollup-freebsd-x64@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.1.tgz#819ffef2f81891c266456952962a13110c8e28b5" - integrity sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ== - -"@rollup/rollup-linux-arm-gnueabihf@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.1.tgz#7fe283c14793e607e653a3214b09f8973f08262a" - integrity sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg== - -"@rollup/rollup-linux-arm-musleabihf@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.1.tgz#066e92eb22ea30560414ec800a6d119ba0b435ac" - integrity sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw== - -"@rollup/rollup-linux-arm64-gnu@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.1.tgz#480d518ea99a8d97b2a174c46cd55164f138cc37" - integrity sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw== - -"@rollup/rollup-linux-arm64-musl@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.1.tgz#ed7db3b8999b60dd20009ddf71c95f3af49423c8" - integrity sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w== - -"@rollup/rollup-linux-loongarch64-gnu@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.50.1.tgz#16a6927a35f5dbc505ff874a4e1459610c0c6f46" - integrity sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q== - -"@rollup/rollup-linux-ppc64-gnu@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.1.tgz#a006700469be0041846c45b494c35754e6a04eea" - integrity sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q== - -"@rollup/rollup-linux-riscv64-gnu@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.1.tgz#0fcc45b2ec8a0e54218ca48849ea6d596f53649c" - integrity sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ== - -"@rollup/rollup-linux-riscv64-musl@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.1.tgz#d6e617eec9fe6f5859ee13fad435a16c42b469f2" - integrity sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg== - -"@rollup/rollup-linux-s390x-gnu@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.1.tgz#b147760d63c6f35b4b18e6a25a2a760dd3ea0c05" - integrity sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg== - -"@rollup/rollup-linux-x64-gnu@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.1.tgz#fc0be1da374f85e7e85dccaf1ff12d7cfc9fbe3d" - integrity sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA== - -"@rollup/rollup-linux-x64-musl@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.1.tgz#54c79932e0f9a3c992b034c82325be3bcde0d067" - integrity sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg== - -"@rollup/rollup-openharmony-arm64@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.1.tgz#fc48e74d413623ac02c1d521bec3e5e784488fdc" - integrity sha512-RDsLm+phmT3MJd9SNxA9MNuEAO/J2fhW8GXk62G/B4G7sLVumNFbRwDL6v5NrESb48k+QMqdGbHgEtfU0LCpbA== - -"@rollup/rollup-win32-arm64-msvc@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.1.tgz#8ce3d1181644406362cf1e62c90e88ab083e02bb" - integrity sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ== - -"@rollup/rollup-win32-ia32-msvc@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.1.tgz#dd2dfc896eac4b2689d55f01c6d51c249263f805" - integrity sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A== - -"@rollup/rollup-win32-x64-msvc@4.50.1": - version "4.50.1" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.1.tgz#13f758c97b9fbbac56b6928547a3ff384e7cfb3e" - integrity sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA== +"@rollup/rollup-android-arm-eabi@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz#0f44a2f8668ed87b040b6fe659358ac9239da4db" + integrity sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ== + +"@rollup/rollup-android-arm64@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz#25b9a01deef6518a948431564c987bcb205274f5" + integrity sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA== + +"@rollup/rollup-darwin-arm64@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz#8a102869c88f3780c7d5e6776afd3f19084ecd7f" + integrity sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA== + +"@rollup/rollup-darwin-x64@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz#8e526417cd6f54daf1d0c04cf361160216581956" + integrity sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA== + +"@rollup/rollup-freebsd-arm64@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz#0e7027054493f3409b1f219a3eac5efd128ef899" + integrity sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA== + +"@rollup/rollup-freebsd-x64@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz#72b204a920139e9ec3d331bd9cfd9a0c248ccb10" + integrity sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ== + +"@rollup/rollup-linux-arm-gnueabihf@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz#ab1b522ebe5b7e06c99504cc38f6cd8b808ba41c" + integrity sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ== + +"@rollup/rollup-linux-arm-musleabihf@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz#f8cc30b638f1ee7e3d18eac24af47ea29d9beb00" + integrity sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ== + +"@rollup/rollup-linux-arm64-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz#7af37a9e85f25db59dc8214172907b7e146c12cc" + integrity sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg== + +"@rollup/rollup-linux-arm64-musl@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz#a623eb0d3617c03b7a73716eb85c6e37b776f7e0" + integrity sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q== + +"@rollup/rollup-linux-loong64-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz#76ea038b549c5c6c5f0d062942627c4066642ee2" + integrity sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA== + +"@rollup/rollup-linux-ppc64-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz#d9a4c3f0a3492bc78f6fdfe8131ac61c7359ccd5" + integrity sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw== + +"@rollup/rollup-linux-riscv64-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz#87ab033eebd1a9a1dd7b60509f6333ec1f82d994" + integrity sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw== + +"@rollup/rollup-linux-riscv64-musl@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz#bda3eb67e1c993c1ba12bc9c2f694e7703958d9f" + integrity sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg== + +"@rollup/rollup-linux-s390x-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz#f7bc10fbe096ab44694233dc42a2291ed5453d4b" + integrity sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ== + +"@rollup/rollup-linux-x64-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz#a151cb1234cc9b2cf5e8cfc02aa91436b8f9e278" + integrity sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q== + +"@rollup/rollup-linux-x64-musl@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz#7859e196501cc3b3062d45d2776cfb4d2f3a9350" + integrity sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg== + +"@rollup/rollup-openharmony-arm64@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz#85d0df7233734df31e547c1e647d2a5300b3bf30" + integrity sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw== + +"@rollup/rollup-win32-arm64-msvc@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz#e62357d00458db17277b88adbf690bb855cac937" + integrity sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w== + +"@rollup/rollup-win32-ia32-msvc@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz#fc7cd40f44834a703c1f1c3fe8bcc27ce476cd50" + integrity sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg== + +"@rollup/rollup-win32-x64-gnu@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz#1a22acfc93c64a64a48c42672e857ee51774d0d3" + integrity sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ== + +"@rollup/rollup-win32-x64-msvc@4.52.5": + version "4.52.5" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz#1657f56326bbe0ac80eedc9f9c18fc1ddd24e107" + integrity sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg== "@sec-ant/readable-stream@^0.4.1": version "0.4.1" resolved "https://registry.yarnpkg.com/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz#60de891bb126abfdc5410fdc6166aca065f10a0c" integrity sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg== -"@secretlint/config-creator@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/config-creator/-/config-creator-10.1.1.tgz#9ab8a1759e19aa316a082caedd5a4ccbabe6f85a" - integrity sha512-TJ42CHZqqnEe9ORvIXVVMqdu3KAtyZRxLspjFexo6XgrwJ6CoFHQYzIihilqRjo2sJh9HMrpnYSj/5hopofGrA== +"@secretlint/config-creator@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/config-creator/-/config-creator-10.2.2.tgz#5d646e83bb2aacfbd5218968ceb358420b4c2cb3" + integrity sha512-BynOBe7Hn3LJjb3CqCHZjeNB09s/vgf0baBaHVw67w7gHF0d25c3ZsZ5+vv8TgwSchRdUCRrbbcq5i2B1fJ2QQ== dependencies: - "@secretlint/types" "^10.1.1" + "@secretlint/types" "^10.2.2" -"@secretlint/config-loader@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/config-loader/-/config-loader-10.1.1.tgz#4889f630f2e37c41a871d6da5b0a719a6cef40ee" - integrity sha512-jBClVFmS6Yu/zI5ejBCRF5a5ASYsE4gOjogjB+WsaHbQHtGvnyY7I26Qtdg4ihCc/VPKYQg0LdM75pLTXzwsjg== +"@secretlint/config-loader@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/config-loader/-/config-loader-10.2.2.tgz#a7790c8d0301db4f6d47e6fb0f0f9482fe652d9a" + integrity sha512-ndjjQNgLg4DIcMJp4iaRD6xb9ijWQZVbd9694Ol2IszBIbGPPkwZHzJYKICbTBmh6AH/pLr0CiCaWdGJU7RbpQ== dependencies: - "@secretlint/profiler" "^10.1.1" - "@secretlint/resolver" "^10.1.1" - "@secretlint/types" "^10.1.1" + "@secretlint/profiler" "^10.2.2" + "@secretlint/resolver" "^10.2.2" + "@secretlint/types" "^10.2.2" ajv "^8.17.1" debug "^4.4.1" rc-config-loader "^4.1.3" -"@secretlint/core@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/core/-/core-10.1.1.tgz#d7443d9e0538a135ff62616a5f35526885ee6a2c" - integrity sha512-COLCxSoH/iVQdLeaZPVtBj0UWKOagO09SqYkCQgfFfZ+soGxKVK405dL317r4PnH9Pm8/s8xQC6OSY5rWTRObQ== +"@secretlint/core@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/core/-/core-10.2.2.tgz#cd41d5c27ba07c217f0af4e0e24dbdfe5ef62042" + integrity sha512-6rdwBwLP9+TO3rRjMVW1tX+lQeo5gBbxl1I5F8nh8bgGtKwdlCMhMKsBWzWg1ostxx/tIG7OjZI0/BxsP8bUgw== dependencies: - "@secretlint/profiler" "^10.1.1" - "@secretlint/types" "^10.1.1" + "@secretlint/profiler" "^10.2.2" + "@secretlint/types" "^10.2.2" debug "^4.4.1" structured-source "^4.0.0" -"@secretlint/formatter@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/formatter/-/formatter-10.1.1.tgz#e297bbb4c2714edfd62be78d814a0ca6ecb08e3a" - integrity sha512-Gpd8gTPN121SJ0h/9e6nWlZU7PitfhXUiEzW7Kyswg6kNGs+bSqmgTgWFtbo1VQ4ygJYiveWPNT05RCImBexJw== - dependencies: - "@secretlint/resolver" "^10.1.1" - "@secretlint/types" "^10.1.1" - "@textlint/linter-formatter" "^14.8.4" - "@textlint/module-interop" "^14.8.4" - "@textlint/types" "^14.8.4" - chalk "^4.1.2" +"@secretlint/formatter@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/formatter/-/formatter-10.2.2.tgz#c8ce35803ad0d841cc9b6e703d6fab68a144e9c0" + integrity sha512-10f/eKV+8YdGKNQmoDUD1QnYL7TzhI2kzyx95vsJKbEa8akzLAR5ZrWIZ3LbcMmBLzxlSQMMccRmi05yDQ5YDA== + dependencies: + "@secretlint/resolver" "^10.2.2" + "@secretlint/types" "^10.2.2" + "@textlint/linter-formatter" "^15.2.0" + "@textlint/module-interop" "^15.2.0" + "@textlint/types" "^15.2.0" + chalk "^5.4.1" debug "^4.4.1" pluralize "^8.0.0" - strip-ansi "^6.0.1" + strip-ansi "^7.1.0" table "^6.9.0" - terminal-link "^2.1.1" + terminal-link "^4.0.0" -"@secretlint/node@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/node/-/node-10.1.1.tgz#7a8b14f6ffaf1d13545a6fd83740de5ba61b9d7f" - integrity sha512-AhN+IGqljVObm8a+B33b23FY79wihu5E61Nd3oYSoZV7SxUvMjpafqhLfpt4frNSY7Ghf/pirWu7JY7GMujFrA== - dependencies: - "@secretlint/config-loader" "^10.1.1" - "@secretlint/core" "^10.1.1" - "@secretlint/formatter" "^10.1.1" - "@secretlint/profiler" "^10.1.1" - "@secretlint/source-creator" "^10.1.1" - "@secretlint/types" "^10.1.1" +"@secretlint/node@^10.1.2", "@secretlint/node@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/node/-/node-10.2.2.tgz#1d8a6ed620170bf4f29829a3a91878682c43c4d9" + integrity sha512-eZGJQgcg/3WRBwX1bRnss7RmHHK/YlP/l7zOQsrjexYt6l+JJa5YhUmHbuGXS94yW0++3YkEJp0kQGYhiw1DMQ== + dependencies: + "@secretlint/config-loader" "^10.2.2" + "@secretlint/core" "^10.2.2" + "@secretlint/formatter" "^10.2.2" + "@secretlint/profiler" "^10.2.2" + "@secretlint/source-creator" "^10.2.2" + "@secretlint/types" "^10.2.2" debug "^4.4.1" p-map "^7.0.3" -"@secretlint/profiler@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/profiler/-/profiler-10.1.1.tgz#f9be2a10376f4dbe63d5424266612a6bb78515d3" - integrity sha512-kReI+Wr7IQz0LbVwYByzlnPbx4BEF2oEWJBc4Oa45g24alCjHu+jD9h9mzkTJqYUgMnVYD3o7HfzeqxFrV+9XA== +"@secretlint/profiler@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/profiler/-/profiler-10.2.2.tgz#82c085ab1966806763bbf6edb830987f25d4e797" + integrity sha512-qm9rWfkh/o8OvzMIfY8a5bCmgIniSpltbVlUVl983zDG1bUuQNd1/5lUEeWx5o/WJ99bXxS7yNI4/KIXfHexig== -"@secretlint/resolver@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/resolver/-/resolver-10.1.1.tgz#664fe6abf04bf999170149b1616a48e155962309" - integrity sha512-GdQzxnBtdBRjBULvZ8ERkaRqDp0njVwXrzBCav1pb0XshVk76C1cjeDqtTqM4RJ1Awo/g5U5MIWYztYv67v5Gg== +"@secretlint/resolver@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/resolver/-/resolver-10.2.2.tgz#9c3c3e2fef00679fcce99793e76e19e575b75721" + integrity sha512-3md0cp12e+Ae5V+crPQYGd6aaO7ahw95s28OlULGyclyyUtf861UoRGS2prnUrKh7MZb23kdDOyGCYb9br5e4w== -"@secretlint/secretlint-formatter-sarif@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/secretlint-formatter-sarif/-/secretlint-formatter-sarif-10.1.1.tgz#b303009f61cbf07f637a8a1b98d9c3a5d7294310" - integrity sha512-Dyq8nzy6domjSlZKX1E5PEzuWxeTqjQJWrlXBmVmOjwLBLfRZDlm5Vq+AduBmEk03KEIKIZi4cZQwsniuRPO9Q== +"@secretlint/secretlint-formatter-sarif@^10.1.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/secretlint-formatter-sarif/-/secretlint-formatter-sarif-10.2.2.tgz#5c4044a6a6c9d95e2f57270d6184931f0979d649" + integrity sha512-ojiF9TGRKJJw308DnYBucHxkpNovDNu1XvPh7IfUp0A12gzTtxuWDqdpuVezL7/IP8Ua7mp5/VkDMN9OLp1doQ== dependencies: - node-sarif-builder "^2.0.3" + node-sarif-builder "^3.2.0" -"@secretlint/secretlint-rule-no-dotenv@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/secretlint-rule-no-dotenv/-/secretlint-rule-no-dotenv-10.1.1.tgz#566ef941fc6f64bfc113ee7ca0500de5f6af9fd3" - integrity sha512-a3/sOUUtEHuw1HCadtxUjViNeomiiohfJj+rwtHxJkCq4pjITS3HSYhQBXnNvkctQNljKIzFm7JUA/4QJ6I4sQ== +"@secretlint/secretlint-rule-no-dotenv@^10.1.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/secretlint-rule-no-dotenv/-/secretlint-rule-no-dotenv-10.2.2.tgz#ea43dcc2abd1dac3288b056610361f319f5ce6e9" + integrity sha512-KJRbIShA9DVc5Va3yArtJ6QDzGjg3PRa1uYp9As4RsyKtKSSZjI64jVca57FZ8gbuk4em0/0Jq+uy6485wxIdg== dependencies: - "@secretlint/types" "^10.1.1" + "@secretlint/types" "^10.2.2" -"@secretlint/secretlint-rule-preset-recommend@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/secretlint-rule-preset-recommend/-/secretlint-rule-preset-recommend-10.1.1.tgz#843cb3762c143444887e02e413afc00c5216fe02" - integrity sha512-+GeISCXVgpnoeRZE4ZPsuO97+fm6z8Ge23LNq6LvR9ZJAq018maXVftkJhHj4hnvYB5URUAEerBBkPGNk5/Ong== +"@secretlint/secretlint-rule-preset-recommend@^10.1.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/secretlint-rule-preset-recommend/-/secretlint-rule-preset-recommend-10.2.2.tgz#27b17c38b360c6788826d28fcda28ac6e9772d0b" + integrity sha512-K3jPqjva8bQndDKJqctnGfwuAxU2n9XNCPtbXVI5JvC7FnQiNg/yWlQPbMUlBXtBoBGFYp08A94m6fvtc9v+zA== -"@secretlint/source-creator@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/source-creator/-/source-creator-10.1.1.tgz#f00009fbddb1a91de021bfcfac34fb54b3aef801" - integrity sha512-IWjvHcE0bhC/x88a9M9jbZlFRZGUEbBzujxrs2KzI5IQ2BXTBRBRhRSjE/BEpWqDHILB22c3mfam8X+UjukphA== +"@secretlint/source-creator@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/source-creator/-/source-creator-10.2.2.tgz#d600b6d4487859cdd39bbb1cf8cf744540b3f7a1" + integrity sha512-h6I87xJfwfUTgQ7irWq7UTdq/Bm1RuQ/fYhA3dtTIAop5BwSFmZyrchph4WcoEvbN460BWKmk4RYSvPElIIvxw== dependencies: - "@secretlint/types" "^10.1.1" + "@secretlint/types" "^10.2.2" istextorbinary "^9.5.0" -"@secretlint/types@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@secretlint/types/-/types-10.1.1.tgz#6f6176ba1444031f5787ef76e2ac7b767733de4b" - integrity sha512-/JGAvVkurVHkargk3AC7UxRy+Ymc+52AVBO/fZA5pShuLW2dX4O/rKc4n8cyhQiOb/3ym5ACSlLQuQ8apPfxrQ== +"@secretlint/types@^10.2.2": + version "10.2.2" + resolved "https://registry.yarnpkg.com/@secretlint/types/-/types-10.2.2.tgz#1412d8f699fd900182cbf4c2923a9df9eb321ca7" + integrity sha512-Nqc90v4lWCXyakD6xNyNACBJNJ0tNCwj2WNk/7ivyacYHxiITVgmLUFXTBOeCdy79iz6HtN9Y31uw/jbLrdOAg== "@serialport/binding-mock@10.2.2": version "10.2.2" @@ -917,15 +956,20 @@ debug "4.4.0" "@sindresorhus/is@^7.0.1": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-7.0.2.tgz#a0df078a8d29f9741503c5a9c302de474ec8564a" - integrity sha512-d9xRovfKNz1SKieM0qJdO+PQonjnnIfSNWfHYnBSJ9hkjm0ZPw6HlxscDXYstp3z+7V2GOFHc+J0CYrYTjqCJw== + version "7.1.1" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-7.1.1.tgz#e32f9b1e0d7e14ee9504cdc7aae4a18dea8c3ef7" + integrity sha512-rO92VvpgMc3kfiTjGT52LEtJ8Yc5kCWhZjLQ3LwlA4pSgPpQO7bVpYXParOD8Jwf+cVQECJo3yP/4I8aZtUQTQ== "@sindresorhus/merge-streams@^2.1.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg== +"@sindresorhus/merge-streams@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz#abb11d99aeb6d27f1b563c38147a72d50058e339" + integrity sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ== + "@szmarczak/http-timer@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-5.0.1.tgz#c7c1bf1141cdd4751b0399c8fc7b8b664cd5be3a" @@ -933,23 +977,23 @@ dependencies: defer-to-connect "^2.0.1" -"@textlint/ast-node-types@14.8.4": - version "14.8.4" - resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-14.8.4.tgz#2f2e1988bfce3613c14de114503cefa7c7cb5108" - integrity sha512-+fI7miec/r9VeniFV9ppL4jRCmHNsTxieulTUf/4tvGII3db5hGriKHC4p/diq1SkQ9Sgs7kg6UyydxZtpTz1Q== +"@textlint/ast-node-types@15.2.3": + version "15.2.3" + resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-15.2.3.tgz#78640b0f651ff2e96de88e07e42b26a418dd8958" + integrity sha512-GEhoxfmh6TF+xC8TJmAUwOzzh0J6sVDqjKhwTTwetf7YDdhHbIv1PuUb/dTadMVIWs1H0+JD4Y27n6LWMmqn9Q== -"@textlint/linter-formatter@^14.8.4": - version "14.8.4" - resolved "https://registry.yarnpkg.com/@textlint/linter-formatter/-/linter-formatter-14.8.4.tgz#4573223860fac9fbfa19a1651ad9176eec9c6a23" - integrity sha512-sZ0UfYRDBNHnfMVBqLqqYnqTB7Ec169ljlmo+SEHR1T+dHUPYy1/DZK4p7QREXlBSFL4cnkswETCbc9xRodm4Q== +"@textlint/linter-formatter@^15.2.0": + version "15.2.3" + resolved "https://registry.yarnpkg.com/@textlint/linter-formatter/-/linter-formatter-15.2.3.tgz#b639c6f0c2ab5d9fe7e3032aaf070fefa3ad48dd" + integrity sha512-gnFGl8MejAS4rRDPKV2OYvU0Tb0iJySOPDahf+RCK30b615UqY6CjqWxXw1FvXfT3pHPoRrefVu39j1AKm2ezg== dependencies: "@azu/format-text" "^1.0.2" "@azu/style-format" "^1.0.1" - "@textlint/module-interop" "14.8.4" - "@textlint/resolver" "14.8.4" - "@textlint/types" "14.8.4" + "@textlint/module-interop" "15.2.3" + "@textlint/resolver" "15.2.3" + "@textlint/types" "15.2.3" chalk "^4.1.2" - debug "^4.4.1" + debug "^4.4.3" js-yaml "^3.14.1" lodash "^4.17.21" pluralize "^2.0.0" @@ -958,32 +1002,27 @@ table "^6.9.0" text-table "^0.2.0" -"@textlint/module-interop@14.8.4", "@textlint/module-interop@^14.8.4": - version "14.8.4" - resolved "https://registry.yarnpkg.com/@textlint/module-interop/-/module-interop-14.8.4.tgz#80b3f8c7b22e4dd964f68b11d09f59f44f05259a" - integrity sha512-1LdPYLAVpa27NOt6EqvuFO99s4XLB0c19Hw9xKSG6xQ1K82nUEyuWhzTQKb3KJ5Qx7qj14JlXZLfnEuL6A16Bw== +"@textlint/module-interop@15.2.3", "@textlint/module-interop@^15.2.0": + version "15.2.3" + resolved "https://registry.yarnpkg.com/@textlint/module-interop/-/module-interop-15.2.3.tgz#266fc35c02bb1399fd5e30edfa40997892627cba" + integrity sha512-dV6M3ptOFJjR5bgYUMeVqc8AqFrMtCEFaZEiLAfMufX29asYonI2K8arqivOA69S2Lh6esyij6V7qpQiXeK/cA== -"@textlint/resolver@14.8.4": - version "14.8.4" - resolved "https://registry.yarnpkg.com/@textlint/resolver/-/resolver-14.8.4.tgz#e824bbe83f898e90da8ce7fbd534cadeaaa2dde5" - integrity sha512-nMDOgDAVwNU9ommh+Db0U+MCMNDPbQ/1HBNjbnHwxZkCpcT6hsAJwBe38CW/DtWVUv8yeR4R40IYNPT84srNwA== +"@textlint/resolver@15.2.3": + version "15.2.3" + resolved "https://registry.yarnpkg.com/@textlint/resolver/-/resolver-15.2.3.tgz#28eb67e10c583fc1d2d73742d32c133dc0aced51" + integrity sha512-Qd3udqo2sWa3u0sYgDVd9M/iybBVBJLrWGaID6Yzl9GyhdGi0E6ngo3b9r+H6psbJDIaCKi54IxvC9q5didWfA== -"@textlint/types@14.8.4", "@textlint/types@^14.8.4": - version "14.8.4" - resolved "https://registry.yarnpkg.com/@textlint/types/-/types-14.8.4.tgz#8d7dfb32cba33a0d5b213ea19aed0b6e9f61b21f" - integrity sha512-9nyY8vVXlr8hHKxa6+37omJhXWCwovMQcgMteuldYd4dOxGm14AK2nXdkgtKEUQnzLGaXy46xwLCfhQy7V7/YA== +"@textlint/types@15.2.3", "@textlint/types@^15.2.0": + version "15.2.3" + resolved "https://registry.yarnpkg.com/@textlint/types/-/types-15.2.3.tgz#a0aafa1bcc9ed036a9779e7ba2e035e6953d4344" + integrity sha512-i8XVmDHJwykMXcGgkSxZLjdbeqnl+voYAcIr94KIe0STwgkHIhwHJgb/tEVFawGClHo+gPczF12l1C5+TAZEzQ== dependencies: - "@textlint/ast-node-types" "14.8.4" - -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== + "@textlint/ast-node-types" "15.2.3" -"@tybys/wasm-util@^0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.9.0.tgz#3e75eb00604c8d6db470bf18c37b7d984a0e3355" - integrity sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw== +"@tybys/wasm-util@^0.10.0": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414" + integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg== dependencies: tslib "^2.4.0" @@ -995,32 +1034,43 @@ "@types/readdir-glob" "*" "@types/chai@^4.2.21": - version "4.3.11" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" - integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== + version "4.3.20" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.20.tgz#cb291577ed342ca92600430841a00329ba05cecc" + integrity sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ== "@types/d3-scale@^4.0.5": - version "4.0.8" - resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.8.tgz#d409b5f9dcf63074464bf8ddfb8ee5a1f95945bb" - integrity sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ== + version "4.0.9" + resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.9.tgz#57a2f707242e6fe1de81ad7bfcccaaf606179afb" + integrity sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw== dependencies: "@types/d3-time" "*" "@types/d3-time@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.3.tgz#3c186bbd9d12b9d84253b6be6487ca56b54f88be" - integrity sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw== + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.4.tgz#8472feecd639691450dd8000eb33edd444e1323f" + integrity sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g== + +"@types/eslint-scope@^3.7.7": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" + integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" -"@types/estree@1.0.8": +"@types/estree@*", "@types/estree@1.0.8", "@types/estree@^1.0.8": version "1.0.8" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e" integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w== -"@types/estree@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== - "@types/follow-redirects@^1.8.0": version "1.14.4" resolved "https://registry.yarnpkg.com/@types/follow-redirects/-/follow-redirects-1.14.4.tgz#ca054d72ef574c77949fc5fff278b430fcd508ec" @@ -1058,7 +1108,7 @@ resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.9.tgz#cd82382c4f902fed9691a2ed79ec68c5898af4c2" integrity sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg== -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -1074,9 +1124,11 @@ integrity sha512-a79Yc3TOk6dGdituy8hmTTJXjOkZ7zsFYV10L337ttq/rec8lRMDBpV7fL3uLx6TgbFCa5DU/h8FmIBQPSbU0w== "@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== + version "6.0.0" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-6.0.0.tgz#4d207b1cc941367bdcd195a3a781a7e4fc3b1e03" + integrity sha512-zmPitbQ8+6zNutpwgcQuLcsEpn/Cj54Kbn7L5pX0Os5kdWplB7xPgEh/g+SWOB/qmows2gpuCaPyduq8ZZRnxA== + dependencies: + minimatch "*" "@types/minimatch@^3.0.3": version "3.0.5" @@ -1089,20 +1141,20 @@ integrity sha512-Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw== "@types/node@*": - version "22.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.2.tgz#9fb1a2b31970871e8bf696f0e8a40d2e6d2bd04e" - integrity sha512-yPL6DyFwY5PiMVEwymNeqUTKsDczQBJ/5T7W/46RwLU/VH+AA8aT5TZkvBviLKLbbm0hlfftEkGrNzfRk/fofQ== + version "24.10.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-24.10.0.tgz#6b79086b0dfc54e775a34ba8114dcc4e0221f31f" + integrity sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A== dependencies: - undici-types "~6.11.1" + undici-types "~7.16.0" "@types/node@^20.7.0": - version "20.11.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.5.tgz#be10c622ca7fcaa3cf226cf80166abc31389d86e" - integrity sha512-g557vgQjUUfN76MZAN/dt1z3dzcUsimuysco0KeluHgrPdJXkP/XdAURgyO2W9fZWHRtRBiVKzKn8vyOAwlG+w== + version "20.19.24" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.19.24.tgz#6bc35bc96cda1a251000b706c76380b5c843f30b" + integrity sha512-FE5u0ezmi6y9OZEzlJfg37mqqf6ZDSF2V/NLjUyGrR9uTZ7Sb9F7bLNZ03S4XVUNRWGA7Ck4c1kK+YnuWjl+DA== dependencies: - undici-types "~5.26.4" + undici-types "~6.21.0" -"@types/normalize-package-data@^2.4.1": +"@types/normalize-package-data@^2.4.3": version "2.4.4" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== @@ -1115,9 +1167,9 @@ "@types/plotly.js" "*" "@types/plotly.js@*": - version "2.12.32" - resolved "https://registry.yarnpkg.com/@types/plotly.js/-/plotly.js-2.12.32.tgz#c5c7711013a2c8675b803a8f57c188024c435407" - integrity sha512-pCE60W1v77zxobnA1oGIisHhGzTHv8c4fAtM81Y1h7gezeKpLpx4E0fQ3ThKIPOIvGlnoVseUjSpFwFqIKdsXg== + version "3.0.8" + resolved "https://registry.yarnpkg.com/@types/plotly.js/-/plotly.js-3.0.8.tgz#2102e91ccb14c318bc8324bf36244bd9fedb4332" + integrity sha512-FjmSFaLmHVgBIBL6H0yX5k/AB3a7FQzjKBlRUF8YT6HiXMArE+hbXYIZXZ/42SBrdL05LWEog0zPqEaIDNsAiw== "@types/readdir-glob@*": version "1.1.5" @@ -1127,21 +1179,21 @@ "@types/node" "*" "@types/sanitize-html@^2.6.2": - version "2.9.5" - resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.9.5.tgz#e8b2214c8afc7bb88d62f9c3bbbc5b4ecc80a25d" - integrity sha512-2Sr1vd8Dw+ypsg/oDDfZ57OMSG2Befs+l2CMyCC5bVSK3CpE7lTB2aNlbbWzazgVA+Qqfuholwom6x/mWd1qmw== + version "2.16.0" + resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.16.0.tgz#860d72c1ba8a5d044946f37559cc359c0a13b24e" + integrity sha512-l6rX1MUXje5ztPT0cAFtUayXF06DqPhRyfVXareEN5gGCFaP/iwsxIyKODr9XDhfxPpN6vXUFNfo5kZMXCxBtw== dependencies: htmlparser2 "^8.0.0" -"@types/sarif@^2.1.4": +"@types/sarif@^2.1.7": version "2.1.7" resolved "https://registry.yarnpkg.com/@types/sarif/-/sarif-2.1.7.tgz#dab4d16ba7568e9846c454a8764f33c5d98e5524" integrity sha512-kRz0VEkJqWLf1LLVN4pT1cg1Z9wAuvI6L97V3m2f5B76Tg8d413ddvLBPTEHAZJlnn4XSvu0FkZtViCQGVyrXQ== "@types/selenium-webdriver@^4.1.28": - version "4.1.28" - resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.1.28.tgz#7b4f3c50a67494f8fd6d396a2eaab7d9df1f9f34" - integrity sha512-Au7CXegiS7oapbB16zxPToY4Cjzi9UQQMf3W2ZZM8PigMLTGR3iUAHjPUTddyE5g1SBjT/qpmvlsAQLBfNAdKg== + version "4.35.3" + resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-4.35.3.tgz#d8ace4b260abfe134600454b2bfff92fb6fbf69a" + integrity sha512-V8rEfVHFNsamhflPVqEgP1u8VShsEBAuQoLkIzpjwvPOkfmcNFp+mzJzFBwcIS9S90bxgRN3sp+Us/Mx55MXIA== dependencies: "@types/node" "*" "@types/ws" "*" @@ -1155,9 +1207,9 @@ "@types/tar-stream" "*" "@types/tar-stream@*": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-3.1.3.tgz#f61427229691eda1b7d5719f34acdc4fc8a558ce" - integrity sha512-Zbnx4wpkWBMBSu5CytMbrT5ZpMiF55qgM+EpHzR4yIDu7mv52cej8hTkOc6K+LzpkOAbxwn/m7j3iO+/l42YkQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/tar-stream/-/tar-stream-3.1.4.tgz#7eca21004291f8d4803437fe20cc01b0744782a8" + integrity sha512-921gW0+g29mCJX0fRvqeHzBlE/XclDaAG0Ousy1LCghsOhvaKacDeRGEVzQP9IPfKn8Vysy7FEXAIxycpc/CMg== dependencies: "@types/node" "*" @@ -1167,9 +1219,9 @@ integrity sha512-gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ== "@types/vscode@^1.100.3": - version "1.102.0" - resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.102.0.tgz#186dd6d4755807754a18ca869384c93b821039f2" - integrity sha512-V9sFXmcXz03FtYTSUsYsu5K0Q9wH9w9V25slddcxrh5JgORD14LpnOA7ov0L9ALi+6HrTjskLJ/tY5zeRF3TFA== + version "1.105.0" + resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.105.0.tgz#774c54cdb62409afeb0cb2a96f75c2e06ef3f97a" + integrity sha512-Lotk3CTFlGZN8ray4VxJE7axIyLZZETQJVWi/lYoUVQuqfRxlQhVOfoejsD2V3dVXPSbS15ov5ZyowMAzgUqcw== "@types/ws@*": version "8.18.1" @@ -1199,10 +1251,10 @@ dependencies: "@types/node" "*" -"@typespec/ts-http-runtime@^0.2.2", "@typespec/ts-http-runtime@^0.2.3": - version "0.2.3" - resolved "https://registry.yarnpkg.com/@typespec/ts-http-runtime/-/ts-http-runtime-0.2.3.tgz#5a5796588ba050b57bda58852697d6173377b647" - integrity sha512-oRhjSzcVjX8ExyaF8hC0zzTqxlVuRlgMHL/Bh4w3xB9+wjbm0FpXylVU/lBrn+kgphwYTrOk3tp+AVShGmlYCg== +"@typespec/ts-http-runtime@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.1.tgz#2fa94050f25b4d85d0bc8b9d97874b8d347a9173" + integrity sha512-SnbaqayTVFEA6/tYumdF0UmybY0KHyKwGPBXnyckFlrrKdhWFrL3a2HIPXHjht5ZOElKGcXfD2D63P36btb+ww== dependencies: http-proxy-agent "^7.0.0" https-proxy-agent "^7.0.0" @@ -1219,28 +1271,23 @@ integrity sha512-wsNOvNMMJ2BY8rC2N2MNBG7yOowV3ov8KlvUE/AiVUlHKTfWsw3OgAOQduX7h0Un6GssKD3aoTVH+TF3DSQwKQ== "@vscode/debugadapter-testsupport@^1.51.0": - version "1.64.0" - resolved "https://registry.yarnpkg.com/@vscode/debugadapter-testsupport/-/debugadapter-testsupport-1.64.0.tgz#c425c309f0b2f75b6ce2c83bb70c32de86b9c2ea" - integrity sha512-0XSaJ7y7gPWyaoDJlMBaQTAuP3BiNVhG0FiZBxC8msLWMPq73mOU0k4RsEtmbPAu10BxPJjFnoPco4rb1NzXeA== + version "1.68.0" + resolved "https://registry.yarnpkg.com/@vscode/debugadapter-testsupport/-/debugadapter-testsupport-1.68.0.tgz#27e7c38d2f5af1e1c4f9ca88b87bccf5c4cefab2" + integrity sha512-UpbaPsCGMKyjIvJFtqFKDD1MVvME50xuOtRBPrqY1WdhAOLjWQN7FcKEoHv3X85twfNL21jW2M54FYwEdEQv4Q== dependencies: - "@vscode/debugprotocol" "1.64.0" + "@vscode/debugprotocol" "1.68.0" "@vscode/debugadapter@^1.65.0": - version "1.65.0" - resolved "https://registry.yarnpkg.com/@vscode/debugadapter/-/debugadapter-1.65.0.tgz#1a318aea805a86da8d497f3b80f4506bdb12e866" - integrity sha512-l9jdX0GFoFVAc7O4O8iVnCjO0pgxbx+wJJXCaYSuglGtYwMNcJdc7xm96cuVx4LWzSqneIjvjzbuzZtoVZhZzQ== + version "1.68.0" + resolved "https://registry.yarnpkg.com/@vscode/debugadapter/-/debugadapter-1.68.0.tgz#abb23463cb750ca4a6f0834c5d4db659258dc159" + integrity sha512-D6gk5Fw2y4FV8oYmltoXpj+VAZexxJFopN/mcZ6YcgzQE9dgq2L45Aj3GLxScJOD6GeLILcxJIaA8l3v11esGg== dependencies: - "@vscode/debugprotocol" "1.65.0" - -"@vscode/debugprotocol@1.64.0": - version "1.64.0" - resolved "https://registry.yarnpkg.com/@vscode/debugprotocol/-/debugprotocol-1.64.0.tgz#f20d998b96474a8ca1aab868fcda08be38fa1f41" - integrity sha512-Zhf3KvB+J04M4HPE2yCvEILGVtPixXUQMLBvx4QcAtjhc5lnwlZbbt80LCsZO2B+2BH8RMgVXk3QQ5DEzEne2Q== + "@vscode/debugprotocol" "1.68.0" -"@vscode/debugprotocol@1.65.0", "@vscode/debugprotocol@^1.65.0": - version "1.65.0" - resolved "https://registry.yarnpkg.com/@vscode/debugprotocol/-/debugprotocol-1.65.0.tgz#304a9e0f4f2825a66db4647148d4b2ec6372f17e" - integrity sha512-ejerrPMBXzYms6Ks+Gb7cdXtdncmT0xwIKNsc0c/SxhEa0HVY5jdvLUegYE91p7CQJpCnXOD/r2CvViN8txLLA== +"@vscode/debugprotocol@1.68.0", "@vscode/debugprotocol@^1.65.0": + version "1.68.0" + resolved "https://registry.yarnpkg.com/@vscode/debugprotocol/-/debugprotocol-1.68.0.tgz#e558ba6affe1be7aff4ec824599f316b61d9a69d" + integrity sha512-2J27dysaXmvnfuhFGhfeuxfHRXunqNPxtBoR3koiTOA9rdxWNDTa1zIFLCFMSHJ9MPTPKFcBeblsyaCJCIlQxg== "@vscode/extension-telemetry@0.4.8": version "0.4.8" @@ -1269,85 +1316,86 @@ integrity sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ== "@vscode/test-electron@^2.1.2": - version "2.3.8" - resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.3.8.tgz#06a7c50b38cfac0ede833905e088d55c61cd12d3" - integrity sha512-b4aZZsBKtMGdDljAsOPObnAi7+VWIaYl3ylCz1jTs+oV6BZ4TNHcVNC3xUn0azPeszBmwSBDQYfFESIaUQnrOg== + version "2.5.2" + resolved "https://registry.yarnpkg.com/@vscode/test-electron/-/test-electron-2.5.2.tgz#f7d4078e8230ce9c94322f2a29cc16c17954085d" + integrity sha512-8ukpxv4wYe0iWMRQU18jhzJOHkeGKbnw7xWRX3Zw1WJA4cEKbHcmmLPdPrPtL6rhDcrlCZN+xKRpv09n4gRHYg== dependencies: - http-proxy-agent "^4.0.1" - https-proxy-agent "^5.0.0" + http-proxy-agent "^7.0.2" + https-proxy-agent "^7.0.5" jszip "^3.10.1" - semver "^7.5.2" + ora "^8.1.0" + semver "^7.6.2" -"@vscode/vsce-sign-alpine-arm64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.5.tgz#e34cbf91f4e86a6cf52abc2e6e75084ae18f6c4a" - integrity sha512-XVmnF40APwRPXSLYA28Ye+qWxB25KhSVpF2eZVtVOs6g7fkpOxsVnpRU1Bz2xG4ySI79IRuapDJoAQFkoOgfdQ== +"@vscode/vsce-sign-alpine-arm64@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-alpine-arm64/-/vsce-sign-alpine-arm64-2.0.6.tgz#2cd244caf5e8ec543f42fb91d4df3b933641c8fa" + integrity sha512-wKkJBsvKF+f0GfsUuGT0tSW0kZL87QggEiqNqK6/8hvqsXvpx8OsTEc3mnE1kejkh5r+qUyQ7PtF8jZYN0mo8Q== -"@vscode/vsce-sign-alpine-x64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-alpine-x64/-/vsce-sign-alpine-x64-2.0.5.tgz#7443c0e839e74f03fce0cc3145330f0d2a80cc87" - integrity sha512-JuxY3xcquRsOezKq6PEHwCgd1rh1GnhyH6urVEWUzWn1c1PC4EOoyffMD+zLZtFuZF5qR1I0+cqDRNKyPvpK7Q== +"@vscode/vsce-sign-alpine-x64@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-alpine-x64/-/vsce-sign-alpine-x64-2.0.6.tgz#b0e80a4792001c66e27feee2c11e821ad1fa1680" + integrity sha512-YoAGlmdK39vKi9jA18i4ufBbd95OqGJxRvF3n6ZbCyziwy3O+JgOpIUPxv5tjeO6gQfx29qBivQ8ZZTUF2Ba0w== -"@vscode/vsce-sign-darwin-arm64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-darwin-arm64/-/vsce-sign-darwin-arm64-2.0.5.tgz#2eabac7d8371292a8d22a15b3ff57f1988c29d6b" - integrity sha512-z2Q62bk0ptADFz8a0vtPvnm6vxpyP3hIEYMU+i1AWz263Pj8Mc38cm/4sjzxu+LIsAfhe9HzvYNS49lV+KsatQ== +"@vscode/vsce-sign-darwin-arm64@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-darwin-arm64/-/vsce-sign-darwin-arm64-2.0.2.tgz#10aa69feb7f81a3dc68c242038ca03eaff19c12e" + integrity sha512-rz8F4pMcxPj8fjKAJIfkUT8ycG9CjIp888VY/6pq6cuI2qEzQ0+b5p3xb74CJnBbSC0p2eRVoe+WgNCAxCLtzQ== -"@vscode/vsce-sign-darwin-x64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-darwin-x64/-/vsce-sign-darwin-x64-2.0.5.tgz#96fb0329c8a367184c203d62574f9a92193022d8" - integrity sha512-ma9JDC7FJ16SuPXlLKkvOD2qLsmW/cKfqK4zzM2iJE1PbckF3BlR08lYqHV89gmuoTpYB55+z8Y5Fz4wEJBVDA== +"@vscode/vsce-sign-darwin-x64@2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-darwin-x64/-/vsce-sign-darwin-x64-2.0.2.tgz#3315528f3ea1007a648b3320bff36a33a9e07aa5" + integrity sha512-MCjPrQ5MY/QVoZ6n0D92jcRb7eYvxAujG/AH2yM6lI0BspvJQxp0o9s5oiAM9r32r9tkLpiy5s2icsbwefAQIw== -"@vscode/vsce-sign-linux-arm64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-linux-arm64/-/vsce-sign-linux-arm64-2.0.5.tgz#c0450232aba43fbeadff5309838a5655dc7039c8" - integrity sha512-Hr1o0veBymg9SmkCqYnfaiUnes5YK6k/lKFA5MhNmiEN5fNqxyPUCdRZMFs3Ajtx2OFW4q3KuYVRwGA7jdLo7Q== +"@vscode/vsce-sign-linux-arm64@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-linux-arm64/-/vsce-sign-linux-arm64-2.0.6.tgz#b3d8560144040b920d8c6edd4374314b58255481" + integrity sha512-cfb1qK7lygtMa4NUl2582nP7aliLYuDEVpAbXJMkDq1qE+olIw/es+C8j1LJwvcRq1I2yWGtSn3EkDp9Dq5FdA== -"@vscode/vsce-sign-linux-arm@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-linux-arm/-/vsce-sign-linux-arm-2.0.5.tgz#bf07340db1fe35cb3a8a222b2da4aa25310ee251" - integrity sha512-cdCwtLGmvC1QVrkIsyzv01+o9eR+wodMJUZ9Ak3owhcGxPRB53/WvrDHAFYA6i8Oy232nuen1YqWeEohqBuSzA== +"@vscode/vsce-sign-linux-arm@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-linux-arm/-/vsce-sign-linux-arm-2.0.6.tgz#0a27c42a4adb37e96eec78cd7bfa388cd4e9fbef" + integrity sha512-UndEc2Xlq4HsuMPnwu7420uqceXjs4yb5W8E2/UkaHBB9OWCwMd3/bRe/1eLe3D8kPpxzcaeTyXiK3RdzS/1CA== -"@vscode/vsce-sign-linux-x64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-linux-x64/-/vsce-sign-linux-x64-2.0.5.tgz#23829924f40867e90d5e3bb861e8e8fa045eb0ee" - integrity sha512-XLT0gfGMcxk6CMRLDkgqEPTyG8Oa0OFe1tPv2RVbphSOjFWJwZgK3TYWx39i/7gqpDHlax0AP6cgMygNJrA6zg== +"@vscode/vsce-sign-linux-x64@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-linux-x64/-/vsce-sign-linux-x64-2.0.6.tgz#ade11caeeed524fc16bd6c43ca49aea00295de8c" + integrity sha512-/olerl1A4sOqdP+hjvJ1sbQjKN07Y3DVnxO4gnbn/ahtQvFrdhUi0G1VsZXDNjfqmXw57DmPi5ASnj/8PGZhAA== -"@vscode/vsce-sign-win32-arm64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-win32-arm64/-/vsce-sign-win32-arm64-2.0.5.tgz#18ef271f5f7d9b31c03127582c1b1c51f26e23b4" - integrity sha512-hco8eaoTcvtmuPhavyCZhrk5QIcLiyAUhEso87ApAWDllG7djIrWiOCtqn48k4pHz+L8oCQlE0nwNHfcYcxOPw== +"@vscode/vsce-sign-win32-arm64@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-win32-arm64/-/vsce-sign-win32-arm64-2.0.6.tgz#0688968148e03eb392479c8491c72506721beffc" + integrity sha512-ivM/MiGIY0PJNZBoGtlRBM/xDpwbdlCWomUWuLmIxbi1Cxe/1nooYrEQoaHD8ojVRgzdQEUzMsRbyF5cJJgYOg== -"@vscode/vsce-sign-win32-x64@2.0.5": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-win32-x64/-/vsce-sign-win32-x64-2.0.5.tgz#83b89393e4451cfa7e3a2182aea4250f5e71aca8" - integrity sha512-1ixKFGM2FwM+6kQS2ojfY3aAelICxjiCzeg4nTHpkeU1Tfs4RC+lVLrgq5NwcBC7ZLr6UfY3Ct3D6suPeOf7BQ== +"@vscode/vsce-sign-win32-x64@2.0.6": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign-win32-x64/-/vsce-sign-win32-x64-2.0.6.tgz#74430eff41d26818c23f9826b045d8c75732eaeb" + integrity sha512-mgth9Kvze+u8CruYMmhHw6Zgy3GRX2S+Ed5oSokDEK5vPEwGGKnmuXua9tmFhomeAnhgJnL4DCna3TiNuGrBTQ== "@vscode/vsce-sign@^2.0.0": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@vscode/vsce-sign/-/vsce-sign-2.0.6.tgz#a2b11e29dab56379c513e0cc52615edad1d34cd3" - integrity sha512-j9Ashk+uOWCDHYDxgGsqzKq5FXW9b9MW7QqOIYZ8IYpneJclWTBeHZz2DJCSKQgo+JAqNcaRRE1hzIx0dswqAw== + version "2.0.8" + resolved "https://registry.yarnpkg.com/@vscode/vsce-sign/-/vsce-sign-2.0.8.tgz#2badf776837d17d0aa0754e88dd7045f5de332ea" + integrity sha512-H7p8E11cZMj6mt8xIi3QXZ7dSU/2MH3Y7c+5JfUhHAV4xfaPNc8ozwLVK282c6ah596KoIJIdPUlNHV7Qs/5JA== optionalDependencies: - "@vscode/vsce-sign-alpine-arm64" "2.0.5" - "@vscode/vsce-sign-alpine-x64" "2.0.5" - "@vscode/vsce-sign-darwin-arm64" "2.0.5" - "@vscode/vsce-sign-darwin-x64" "2.0.5" - "@vscode/vsce-sign-linux-arm" "2.0.5" - "@vscode/vsce-sign-linux-arm64" "2.0.5" - "@vscode/vsce-sign-linux-x64" "2.0.5" - "@vscode/vsce-sign-win32-arm64" "2.0.5" - "@vscode/vsce-sign-win32-x64" "2.0.5" - -"@vscode/vsce@^3.2.1", "@vscode/vsce@^3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-3.6.0.tgz#7102cb846db83ed70ec7119986af7d7c69cf3538" - integrity sha512-u2ZoMfymRNJb14aHNawnXJtXHLXDVKc1oKZaH4VELKT/9iWKRVgtQOdwxCgtwSxJoqYvuK4hGlBWQJ05wxADhg== + "@vscode/vsce-sign-alpine-arm64" "2.0.6" + "@vscode/vsce-sign-alpine-x64" "2.0.6" + "@vscode/vsce-sign-darwin-arm64" "2.0.2" + "@vscode/vsce-sign-darwin-x64" "2.0.2" + "@vscode/vsce-sign-linux-arm" "2.0.6" + "@vscode/vsce-sign-linux-arm64" "2.0.6" + "@vscode/vsce-sign-linux-x64" "2.0.6" + "@vscode/vsce-sign-win32-arm64" "2.0.6" + "@vscode/vsce-sign-win32-x64" "2.0.6" + +"@vscode/vsce@^3.2.1", "@vscode/vsce@^3.6.0", "@vscode/vsce@^3.6.2": + version "3.6.2" + resolved "https://registry.yarnpkg.com/@vscode/vsce/-/vsce-3.6.2.tgz#cefd2802f1dec24fca51293ae563e11912f545fd" + integrity sha512-gvBfarWF+Ii20ESqjA3dpnPJpQJ8fFJYtcWtjwbRADommCzGg1emtmb34E+DKKhECYvaVyAl+TF9lWS/3GSPvg== dependencies: "@azure/identity" "^4.1.0" - "@secretlint/node" "^10.1.1" - "@secretlint/secretlint-formatter-sarif" "^10.1.1" - "@secretlint/secretlint-rule-no-dotenv" "^10.1.1" - "@secretlint/secretlint-rule-preset-recommend" "^10.1.1" + "@secretlint/node" "^10.1.2" + "@secretlint/secretlint-formatter-sarif" "^10.1.2" + "@secretlint/secretlint-rule-no-dotenv" "^10.1.2" + "@secretlint/secretlint-rule-preset-recommend" "^10.1.2" "@vscode/vsce-sign" "^2.0.0" azure-devops-node-api "^12.5.0" chalk "^4.1.2" @@ -1364,7 +1412,7 @@ minimatch "^3.0.3" parse-semver "^1.1.1" read "^1.0.7" - secretlint "^10.1.1" + secretlint "^10.1.2" semver "^7.5.2" tmp "^0.2.3" typed-rest-client "^1.8.4" @@ -1375,209 +1423,210 @@ optionalDependencies: keytar "^7.7.0" -"@vue/compiler-core@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.15.tgz#be20d1bbe19626052500b48969302cb6f396d36e" - integrity sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw== +"@vue/compiler-core@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.22.tgz#bb8294a0dd31df540563cc6ffa0456f1f7687b97" + integrity sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ== dependencies: - "@babel/parser" "^7.23.6" - "@vue/shared" "3.4.15" + "@babel/parser" "^7.28.4" + "@vue/shared" "3.5.22" entities "^4.5.0" estree-walker "^2.0.2" - source-map-js "^1.0.2" - -"@vue/compiler-dom@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz#753f5ed55f78d33dff04701fad4d76ff0cf81ee5" - integrity sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ== - dependencies: - "@vue/compiler-core" "3.4.15" - "@vue/shared" "3.4.15" - -"@vue/compiler-sfc@3.4.15", "@vue/compiler-sfc@^3.3.4": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz#4e5811e681955fcec886cebbec483f6ae463a64b" - integrity sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA== - dependencies: - "@babel/parser" "^7.23.6" - "@vue/compiler-core" "3.4.15" - "@vue/compiler-dom" "3.4.15" - "@vue/compiler-ssr" "3.4.15" - "@vue/shared" "3.4.15" + source-map-js "^1.2.1" + +"@vue/compiler-dom@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz#6c9c2c9843520f6d3dbc685e5d0e1e12a2c04c56" + integrity sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA== + dependencies: + "@vue/compiler-core" "3.5.22" + "@vue/shared" "3.5.22" + +"@vue/compiler-sfc@3.5.22", "@vue/compiler-sfc@^3.3.4": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.22.tgz#663a8483b1dda8de83b6fa1aab38a52bf73dd965" + integrity sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ== + dependencies: + "@babel/parser" "^7.28.4" + "@vue/compiler-core" "3.5.22" + "@vue/compiler-dom" "3.5.22" + "@vue/compiler-ssr" "3.5.22" + "@vue/shared" "3.5.22" estree-walker "^2.0.2" - magic-string "^0.30.5" - postcss "^8.4.33" - source-map-js "^1.0.2" + magic-string "^0.30.19" + postcss "^8.5.6" + source-map-js "^1.2.1" -"@vue/compiler-ssr@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz#a910a5b89ba4f0a776e40b63d69bdae2f50616cf" - integrity sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw== +"@vue/compiler-ssr@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz#a0ef16e364731b25e79a13470569066af101320f" + integrity sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww== dependencies: - "@vue/compiler-dom" "3.4.15" - "@vue/shared" "3.4.15" + "@vue/compiler-dom" "3.5.22" + "@vue/shared" "3.5.22" -"@vue/devtools-api@^6.5.0": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz#7f71f31e40973eeee65b9a64382b13593fdbd697" - integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA== +"@vue/devtools-api@^6.6.3", "@vue/devtools-api@^6.6.4": + version "6.6.4" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343" + integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g== -"@vue/reactivity@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.15.tgz#ad9d9b83f5398d2e8660ad5cfc0f171e7679a9a1" - integrity sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w== +"@vue/reactivity@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.5.22.tgz#9b26f8557c96df46c9a859914a2229f3ca5b8f4f" + integrity sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A== dependencies: - "@vue/shared" "3.4.15" + "@vue/shared" "3.5.22" -"@vue/runtime-core@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.15.tgz#f81e2fd2108ea41a6d5c61c2462b11dfb754fdf0" - integrity sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw== +"@vue/runtime-core@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.5.22.tgz#e004c1e35f423555a0e4c10646ef3e9d380643d1" + integrity sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ== dependencies: - "@vue/reactivity" "3.4.15" - "@vue/shared" "3.4.15" + "@vue/reactivity" "3.5.22" + "@vue/shared" "3.5.22" -"@vue/runtime-dom@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz#108ef86aa7334ead5d6b9c56a7d93679e1e45406" - integrity sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw== +"@vue/runtime-dom@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz#01276cea7cb9ac2b9aba046adfb5903b494e2e7e" + integrity sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww== dependencies: - "@vue/runtime-core" "3.4.15" - "@vue/shared" "3.4.15" + "@vue/reactivity" "3.5.22" + "@vue/runtime-core" "3.5.22" + "@vue/shared" "3.5.22" csstype "^3.1.3" -"@vue/server-renderer@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.15.tgz#34438f998e6f6370fac78883a75efe136631957f" - integrity sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw== - dependencies: - "@vue/compiler-ssr" "3.4.15" - "@vue/shared" "3.4.15" - -"@vue/shared@3.4.15": - version "3.4.15" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.15.tgz#e7d2ea050c667480cb5e1a6df2ac13bcd03a8f30" - integrity sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g== - -"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" - integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - -"@webassemblyjs/floating-point-hex-parser@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" - integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== - -"@webassemblyjs/helper-api-error@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" - integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== - -"@webassemblyjs/helper-buffer@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" - integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== - -"@webassemblyjs/helper-numbers@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" - integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.6" - "@webassemblyjs/helper-api-error" "1.11.6" +"@vue/server-renderer@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.5.22.tgz#d134e3409094044bd066d9803714677457756157" + integrity sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ== + dependencies: + "@vue/compiler-ssr" "3.5.22" + "@vue/shared" "3.5.22" + +"@vue/shared@3.5.22": + version "3.5.22" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.22.tgz#9d56a1644a3becb8af1e34655928b0e288d827f8" + integrity sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w== + +"@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6" + integrity sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ== + dependencies: + "@webassemblyjs/helper-numbers" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + +"@webassemblyjs/floating-point-hex-parser@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz#fcca1eeddb1cc4e7b6eed4fc7956d6813b21b9fb" + integrity sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA== + +"@webassemblyjs/helper-api-error@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz#e0a16152248bc38daee76dd7e21f15c5ef3ab1e7" + integrity sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ== + +"@webassemblyjs/helper-buffer@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz#822a9bc603166531f7d5df84e67b5bf99b72b96b" + integrity sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA== + +"@webassemblyjs/helper-numbers@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz#dbd932548e7119f4b8a7877fd5a8d20e63490b2d" + integrity sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.13.2" + "@webassemblyjs/helper-api-error" "1.13.2" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" - integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== +"@webassemblyjs/helper-wasm-bytecode@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz#e556108758f448aae84c850e593ce18a0eb31e0b" + integrity sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA== -"@webassemblyjs/helper-wasm-section@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" - integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== +"@webassemblyjs/helper-wasm-section@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz#9629dda9c4430eab54b591053d6dc6f3ba050348" + integrity sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw== dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/wasm-gen" "1.14.1" -"@webassemblyjs/ieee754@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" - integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== +"@webassemblyjs/ieee754@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz#1c5eaace1d606ada2c7fd7045ea9356c59ee0dba" + integrity sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" - integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== +"@webassemblyjs/leb128@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.13.2.tgz#57c5c3deb0105d02ce25fa3fd74f4ebc9fd0bbb0" + integrity sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" - integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== - -"@webassemblyjs/wasm-edit@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" - integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.12.1" - "@webassemblyjs/wasm-gen" "1.12.1" - "@webassemblyjs/wasm-opt" "1.12.1" - "@webassemblyjs/wasm-parser" "1.12.1" - "@webassemblyjs/wast-printer" "1.12.1" - -"@webassemblyjs/wasm-gen@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" - integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wasm-opt@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" - integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-buffer" "1.12.1" - "@webassemblyjs/wasm-gen" "1.12.1" - "@webassemblyjs/wasm-parser" "1.12.1" - -"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" - integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== - dependencies: - "@webassemblyjs/ast" "1.12.1" - "@webassemblyjs/helper-api-error" "1.11.6" - "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/ieee754" "1.11.6" - "@webassemblyjs/leb128" "1.11.6" - "@webassemblyjs/utf8" "1.11.6" - -"@webassemblyjs/wast-printer@1.12.1": - version "1.12.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" - integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== - dependencies: - "@webassemblyjs/ast" "1.12.1" +"@webassemblyjs/utf8@1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.13.2.tgz#917a20e93f71ad5602966c2d685ae0c6c21f60f1" + integrity sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ== + +"@webassemblyjs/wasm-edit@^1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz#ac6689f502219b59198ddec42dcd496b1004d597" + integrity sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/helper-wasm-section" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-opt" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + "@webassemblyjs/wast-printer" "1.14.1" + +"@webassemblyjs/wasm-gen@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz#991e7f0c090cb0bb62bbac882076e3d219da9570" + integrity sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" + +"@webassemblyjs/wasm-opt@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz#e6f71ed7ccae46781c206017d3c14c50efa8106b" + integrity sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-buffer" "1.14.1" + "@webassemblyjs/wasm-gen" "1.14.1" + "@webassemblyjs/wasm-parser" "1.14.1" + +"@webassemblyjs/wasm-parser@1.14.1", "@webassemblyjs/wasm-parser@^1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz#b3e13f1893605ca78b52c68e54cf6a865f90b9fb" + integrity sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ== + dependencies: + "@webassemblyjs/ast" "1.14.1" + "@webassemblyjs/helper-api-error" "1.13.2" + "@webassemblyjs/helper-wasm-bytecode" "1.13.2" + "@webassemblyjs/ieee754" "1.13.2" + "@webassemblyjs/leb128" "1.13.2" + "@webassemblyjs/utf8" "1.13.2" + +"@webassemblyjs/wast-printer@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz#3bb3e9638a8ae5fdaf9610e7a06b4d9f9aa6fe07" + integrity sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw== + dependencies: + "@webassemblyjs/ast" "1.14.1" "@xtuc/long" "4.2.2" "@webpack-cli/configtest@^1.2.0": @@ -1607,29 +1656,20 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -acorn-import-attributes@^1.9.5: - version "1.9.5" - resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" - integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== - -acorn@^8.7.1, acorn@^8.8.2: - version "8.11.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== +acorn-import-phases@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/acorn-import-phases/-/acorn-import-phases-1.0.4.tgz#16eb850ba99a056cb7cbfe872ffb8972e18c8bd7" + integrity sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ== -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" +acorn@^8.15.0: + version "8.15.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816" + integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg== -agent-base@^7.0.2, agent-base@^7.1.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317" - integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA== - dependencies: - debug "^4.3.4" +agent-base@^7.1.0, agent-base@^7.1.2: + version "7.1.4" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8" + integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ== aggregate-error@^3.0.0: version "3.1.0" @@ -1658,7 +1698,7 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -1668,17 +1708,7 @@ ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.9.0: - version "8.16.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4" - integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw== - dependencies: - fast-deep-equal "^3.1.3" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.4.1" - -ajv@^8.0.1, ajv@^8.17.1: +ajv@^8.0.0, ajv@^8.0.1, ajv@^8.17.1, ajv@^8.9.0: version "8.17.1" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== @@ -1693,12 +1723,12 @@ ansi-colors@4.1.1: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== +ansi-escapes@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.1.1.tgz#fdd39427a7e5a26233e48a8b4366351629ffea1b" + integrity sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q== dependencies: - type-fest "^0.21.3" + environment "^1.0.0" ansi-regex@^3.0.0: version "3.0.1" @@ -1711,9 +1741,9 @@ ansi-regex@^5.0.1: integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + version "6.2.2" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1" + integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg== ansi-styles@^3.2.1: version "3.2.1" @@ -1730,9 +1760,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + version "6.2.3" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041" + integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg== ansi-to-html@^0.6.11: version "0.6.15" @@ -1862,20 +1892,15 @@ async@^2.6.4: lodash "^4.17.14" async@^3.2.4: - version "3.2.5" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" - integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - available-typed-arrays@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" @@ -1884,9 +1909,9 @@ available-typed-arrays@^1.0.7: possible-typed-array-names "^1.0.0" axios@^1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.0.tgz#11248459be05a5ee493485628fa0e4323d0abfc3" - integrity sha512-oXTDccv8PcfjZmPGlWsPSwtOJCZ/b6W5jAMCNcfwJbCzDckwG0jrYJFaWH1yvivfCXjVzV/SPDEhMB3Q+DSurg== + version "1.13.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.1.tgz#45b62dc8fe04e0e92274e08b98e910ba3d7963a7" + integrity sha512-hU4EGxxt+j7TQijx1oYdAjw4xuIp1wRQSsbMFwSthCWeBQur1eF+qJ5iQ5sN3Tw8YRzQNKb8jszgBdMDVqwJcw== dependencies: follow-redirects "^1.15.6" form-data "^4.0.4" @@ -1946,9 +1971,9 @@ bare-stream@^2.6.4: streamx "^2.21.0" bare-url@^2.2.2: - version "2.3.1" - resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.1.tgz#95e33e99bdc768766ca94246fdc397e88675ec9c" - integrity sha512-v2yl0TnaZTdEnelkKtXZGnotiV6qATBlnNuUMrHl6v9Lmmrh9mw9RYyImPU7/4RahumSwQS1k2oKXcRfXcbjJw== + version "2.3.2" + resolved "https://registry.yarnpkg.com/bare-url/-/bare-url-2.3.2.tgz#4aef382efa662b2180a6fe4ca07a71b39bdf7ca3" + integrity sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw== dependencies: bare-path "^3.0.0" @@ -1957,20 +1982,25 @@ base64-js@^1.3.1: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +baseline-browser-mapping@^2.8.19: + version "2.8.23" + resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.23.tgz#cd43e17eff5cbfb67c92153e7fe856cf6d426421" + integrity sha512-616V5YX4bepJFzNyOfce5Fa8fDJMfoxzOIzDCZwaGL8MKVpFrXqfNUoIpRn9YMI5pXf/VKgzjB4htFMsFKKdiQ== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== bignumber.js@^9.0.1: - version "9.1.2" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" - integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== + version "9.3.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.3.1.tgz#759c5aaddf2ffdc4f154f7b493e1c8770f88c4d7" + integrity sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ== binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" + integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== binaryextensions@^6.11.0: version "6.11.0" @@ -2020,9 +2050,9 @@ brace-expansion@^1.1.7: concat-map "0.0.1" brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7" + integrity sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ== dependencies: balanced-match "^1.0.0" @@ -2038,15 +2068,16 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.21.10: - version "4.23.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== +browserslist@^4.26.3: + version "4.27.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.27.0.tgz#755654744feae978fbb123718b2f139bc0fa6697" + integrity sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw== dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" - node-releases "^2.0.18" - update-browserslist-db "^1.1.0" + baseline-browser-mapping "^2.8.19" + caniuse-lite "^1.0.30001751" + electron-to-chromium "^1.5.238" + node-releases "^2.0.26" + update-browserslist-db "^1.1.4" buffer-alloc-unsafe@^1.1.0: version "1.1.0" @@ -2089,10 +2120,10 @@ buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -bulma@^0.9.3: - version "0.9.4" - resolved "https://registry.yarnpkg.com/bulma/-/bulma-0.9.4.tgz#0ca8aeb1847a34264768dba26a064c8be72674a1" - integrity sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ== +bulma@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/bulma/-/bulma-1.0.4.tgz#942dc017a3a201fa9f0e0c8db3dd52f3cff86712" + integrity sha512-Ffb6YGXDiZYX3cqvSbHWqQ8+LkX6tVoTcZuVB3lm93sbAVXlO0D6QlOTMnV6g18gILpAXqkG2z9hf9z4hCjz2g== bundle-name@^4.1.0: version "4.1.0" @@ -2101,6 +2132,11 @@ bundle-name@^4.1.0: dependencies: run-applescript "^7.0.0" +byte-counter@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/byte-counter/-/byte-counter-0.1.0.tgz#c49760b5790e50e942a0d57a57b3fc0e94488dcc" + integrity sha512-jheRLVMeUKrDBjVw2O5+k4EvR4t9wtxHL+bo/LxfkxsVeuGMy3a5SEGgXdAFA4FSzTrU8rQXQIrsZ3oBq5a0pQ== + c8@^10.1.3: version "10.1.3" resolved "https://registry.yarnpkg.com/c8/-/c8-10.1.3.tgz#54afb25ebdcc7f3b00112482c6d90d7541ad2fcd" @@ -2123,17 +2159,17 @@ cacheable-lookup@^7.0.0: resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-7.0.0.tgz#3476a8215d046e5a3202a9209dd13fec1f933a27" integrity sha512-+qJyx4xiKra8mZrcwhjMRMUhD5NR1R8esPkzIYxX96JiecFoxAXFuz/GpR3+ev4PE1WamHip78wV0vcmPQtp8w== -cacheable-request@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-12.0.1.tgz#e6f473b5b76c02e72a0ec2cd44c7cfb7c751d7c5" - integrity sha512-Yo9wGIQUaAfIbk+qY0X4cDQgCosecfBe3V9NSyeY4qPC2SAkbCS4Xj79VP8WOzitpJUZKc/wsRCYF5ariDIwkg== +cacheable-request@^13.0.12: + version "13.0.13" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-13.0.13.tgz#5863a906cc9386afe62e95e7385fc67df54272f2" + integrity sha512-/5/6xDTN/AZHOn93MNaU7HUSzOL/YJWOwa5hV84ib1mPUtQB/ZTg5bn57UGfdNwXGhgQfcPpJDy+eGiNgGJI1w== dependencies: "@types/http-cache-semantics" "^4.0.4" get-stream "^9.0.1" - http-cache-semantics "^4.1.1" - keyv "^4.5.4" + http-cache-semantics "^4.2.0" + keyv "^5.5.3" mimic-response "^4.0.0" - normalize-url "^8.0.1" + normalize-url "^8.1.0" responselike "^3.0.0" call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2: @@ -2144,27 +2180,7 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply- es-errors "^1.3.0" function-bind "^1.1.2" -call-bind@^1.0.0: - version "1.0.7" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" - integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== - dependencies: - es-define-property "^1.0.0" - es-errors "^1.3.0" - function-bind "^1.1.2" - get-intrinsic "^1.2.4" - set-function-length "^1.2.1" - -call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== - dependencies: - function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" - -call-bind@^1.0.8: +call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.7, call-bind@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c" integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww== @@ -2182,25 +2198,20 @@ call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4: call-bind-apply-helpers "^1.0.2" get-intrinsic "^1.3.0" -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - camelcase@^6.0.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001646: - version "1.0.30001653" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001653.tgz#b8af452f8f33b1c77f122780a4aecebea0caca56" - integrity sha512-XGWQVB8wFQ2+9NZwZ10GxTYC5hk0Fa+q8cSkr0tgvMhYhMHP/QC+WTgrePMDBWiWc/pV+1ik82Al20XOK25Gcw== +caniuse-lite@^1.0.30001751: + version "1.0.30001753" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001753.tgz#419f8fc9bab6f1a1d10d9574d0b3374f823c5b00" + integrity sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw== chai@^4.3.4: - version "4.4.1" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1" - integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g== + version "4.5.0" + resolved "https://registry.yarnpkg.com/chai/-/chai-4.5.0.tgz#707e49923afdd9b13a8b0b47d33d732d13812fd8" + integrity sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw== dependencies: assertion-error "^1.1.0" check-error "^1.0.3" @@ -2208,7 +2219,7 @@ chai@^4.3.4: get-func-name "^2.0.2" loupe "^2.3.6" pathval "^1.1.1" - type-detect "^4.0.8" + type-detect "^4.1.0" chalk@^2.4.2: version "2.4.2" @@ -2227,6 +2238,11 @@ chalk@^4.1.0, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^5.3.0, chalk@^5.4.1: + version "5.6.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea" + integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA== + charenc@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -2252,23 +2268,23 @@ cheerio-select@^2.1.0: domutils "^3.0.1" cheerio@^1.0.0-rc.9: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.1.0.tgz#87b9bec6dd3696e405ea79da7d2749d8308b0953" - integrity sha512-+0hMx9eYhJvWbgpKV9hN7jg0JcwydpopZE4hgi+KvQtByZXPp04NiCWU0LzcAbP63abZckIHkTQaXVF52mX3xQ== + version "1.1.2" + resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.1.2.tgz#26af77e89336c81c63ea83197f868b4cbd351369" + integrity sha512-IkxPpb5rS/d1IiLbHMgfPuS0FgiWTtFIm/Nj+2woXDLTZ7fOT2eqzgYbdMlLweqlHbsZjxEChoVK+7iph7jyQg== dependencies: cheerio-select "^2.1.0" dom-serializer "^2.0.0" domhandler "^5.0.3" domutils "^3.2.2" - encoding-sniffer "^0.2.0" + encoding-sniffer "^0.2.1" htmlparser2 "^10.0.0" parse5 "^7.3.0" parse5-htmlparser2-tree-adapter "^7.1.0" parse5-parser-stream "^7.1.2" - undici "^7.10.0" + undici "^7.12.0" whatwg-mimetype "^4.0.0" -chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0": +chokidar@3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -2283,15 +2299,22 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0": optionalDependencies: fsevents "~2.3.2" +chokidar@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30" + integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA== + dependencies: + readdirp "^4.0.1" + chownr@^1.0.1, chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== + version "1.0.4" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" + integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== ci-info@^2.0.0: version "2.0.0" @@ -2303,12 +2326,25 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -clipboardy@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-4.0.0.tgz#e73ced93a76d19dd379ebf1f297565426dffdca1" - integrity sha512-5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w== +cli-cursor@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-5.0.0.tgz#24a4831ecf5a6b01ddeb32fb71a4b2088b0dce38" + integrity sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw== + dependencies: + restore-cursor "^5.0.0" + +cli-spinners@^2.9.2: + version "2.9.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== + +clipboardy@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-5.0.0.tgz#70b16e111bdcedb782e046ba5a1901550a51225b" + integrity sha512-MQfKHaD09eP80Pev4qBxZLbxJK/ONnqfSYAPlCmPh+7BDboYtO/3BmB6HGzxDIT0SlTRc2tzS8lQqfcdLtZ0Kg== dependencies: - execa "^8.0.1" + execa "^9.6.0" + is-wayland "^0.1.0" is-wsl "^3.1.0" is64bit "^2.0.0" @@ -2390,10 +2426,10 @@ commander@^12.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== -commander@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.0.tgz#f244fc74a92343514e56229f16ef5c5e22ced5e9" - integrity sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA== +commander@^14.0.1: + version "14.0.2" + resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.2.tgz#b71fd37fe4069e4c3c7c13925252ada4eba14e8e" + integrity sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ== commander@^2.20.0: version "2.20.3" @@ -2467,24 +2503,19 @@ crypt@0.0.2: resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== -css-loader@^3.1.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.6.0.tgz#2e4b2c7e6e2d27f8c8f28f61bffcd2e6c91ef645" - integrity sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ== +css-loader@^6.8.1: + version "6.11.0" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba" + integrity sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g== dependencies: - camelcase "^5.3.1" - cssesc "^3.0.0" - icss-utils "^4.1.1" - loader-utils "^1.2.3" - normalize-path "^3.0.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.2" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" - postcss-value-parser "^4.1.0" - schema-utils "^2.7.0" - semver "^6.3.0" + icss-utils "^5.1.0" + postcss "^8.4.33" + postcss-modules-extract-imports "^3.1.0" + postcss-modules-local-by-default "^4.0.5" + postcss-modules-scope "^3.2.0" + postcss-modules-values "^4.0.0" + postcss-value-parser "^4.2.0" + semver "^7.5.4" css-select@^5.1.0: version "5.2.2" @@ -2566,12 +2597,12 @@ d3-scale@^4.0.2: dependencies: d3-array "2 - 3" -debug@4, debug@^4.3.3, 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== +debug@4, debug@^4.3.3, debug@^4.3.4, debug@^4.4.1, debug@^4.4.3: + version "4.4.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" + integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== dependencies: - ms "2.1.2" + ms "^2.1.3" debug@4.3.3: version "4.3.3" @@ -2594,18 +2625,18 @@ debug@^2.2.0: dependencies: ms "2.0.0" -debug@^4.4.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b" - integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ== - dependencies: - ms "^2.1.3" - decamelize@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== +decompress-response@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-10.0.0.tgz#d8abd2a4c136c3b99b49a08d1f9a709fe35675a4" + integrity sha512-oj7KWToJuuxlPr7VV0vabvxEIiqNMo+q0NueIiL3XhtwC6FVOX7Hr1c0C4eD0bmf7Zr+S/dSf2xvkH3Ad6sU3Q== + dependencies: + mimic-response "^4.0.0" + decompress-response@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" @@ -2614,9 +2645,9 @@ decompress-response@^6.0.0: mimic-response "^3.1.0" deep-eql@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" - integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== + version "4.1.4" + resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.4.tgz#d0d3912865911bb8fac5afb4e3acfa6a28dc72b7" + integrity sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg== dependencies: type-detect "^4.0.0" @@ -2653,16 +2684,7 @@ defer-to-connect@^2.0.1: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== -define-data-property@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== - dependencies: - get-intrinsic "^1.2.1" - gopd "^1.0.1" - has-property-descriptors "^1.0.0" - -define-data-property@^1.1.4: +define-data-property@^1.0.1, define-data-property@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== @@ -2717,10 +2739,15 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== + detect-libc@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8" - integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA== + version "2.1.2" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad" + integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ== diff@5.0.0: version "5.0.0" @@ -2764,7 +2791,7 @@ domutils@^3.0.1, domutils@^3.2.1, domutils@^3.2.2: domelementtype "^2.3.0" domhandler "^5.0.3" -dunder-proto@^1.0.0, dunder-proto@^1.0.1: +dunder-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a" integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A== @@ -2793,16 +2820,21 @@ ecdsa-sig-formatter@1.0.11: safe-buffer "^5.0.1" editions@^6.21.0: - version "6.21.0" - resolved "https://registry.yarnpkg.com/editions/-/editions-6.21.0.tgz#8da2d85611106e0891a72619b7bee8e0c830089b" - integrity sha512-ofkXJtn7z0urokN62DI3SBo/5xAtF0rR7tn+S/bSYV79Ka8pTajIIl+fFQ1q88DQEImymmo97M4azY3WX/nUdg== + version "6.22.0" + resolved "https://registry.yarnpkg.com/editions/-/editions-6.22.0.tgz#3913c4eea9aa4586e17bcd25d64d5edf1790657a" + integrity sha512-UgGlf8IW75je7HZjNDpJdCv4cGJWIi6yumFdZ0R7A8/CIhQiWUjyGLCxdHpd8bmyD1gnkfUNK0oeOXqUS2cpfQ== dependencies: - version-range "^4.13.0" + version-range "^4.15.0" -electron-to-chromium@^1.5.4: - version "1.5.25" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.25.tgz#492ade1cde401332b9b75aa0c55fd5e1550ca66c" - integrity sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g== +electron-to-chromium@^1.5.238: + version "1.5.244" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.244.tgz#b9b61e3d24ef4203489951468614f2a360763820" + integrity sha512-OszpBN7xZX4vWMPJwB9illkN/znA8M36GQqQxi6MNy9axWxhOfJyZZJtSLQCpEFLHP2xK33BiWx9aIuIEXVCcw== + +emoji-regex@^10.3.0: + version "10.6.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d" + integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A== emoji-regex@^8.0.0: version "8.0.0" @@ -2819,7 +2851,7 @@ emojis-list@^3.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -encoding-sniffer@^0.2.0: +encoding-sniffer@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/encoding-sniffer/-/encoding-sniffer-0.2.1.tgz#396ec97ac22ce5a037ba44af1992ac9d46a7b819" integrity sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw== @@ -2834,10 +2866,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^5.0.0, enhanced-resolve@^5.17.1: - version "5.17.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" - integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== +enhanced-resolve@^5.0.0, enhanced-resolve@^5.17.3: + version "5.18.3" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44" + integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -2858,16 +2890,14 @@ entities@^6.0.0: integrity sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g== envinfo@^7.7.3: - version "7.11.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f" - integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg== + version "7.20.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.20.0.tgz#3fd9de69fb6af3e777a017dfa033676368d67dd7" + integrity sha512-+zUomDcLXsVkQ37vUqWBvQwLaLlj8eZPSi61llaEFAVBY5mhcXdaSw1pSJVl4yTYD5g/gEfpNl28YYk4IPvrrg== -error-ex@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" +environment@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/environment/-/environment-1.1.0.tgz#8e86c66b180f363c7ab311787e0259665f45a9f1" + integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q== es-define-property@^1.0.0, es-define-property@^1.0.1: version "1.0.1" @@ -2880,9 +2910,9 @@ es-errors@^1.3.0: integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== es-module-lexer@^1.2.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" - integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== + version "1.7.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.7.0.tgz#9159601561880a85f2734560a9099b2c31e5372a" + integrity sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA== es-object-atoms@^1.0.0, es-object-atoms@^1.1.1: version "1.1.1" @@ -2935,15 +2965,10 @@ esbuild@^0.21.3: "@esbuild/win32-ia32" "0.21.5" "@esbuild/win32-x64" "0.21.5" -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escalade@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" - integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== +escalade@^3.1.1, escalade@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: version "4.0.0" @@ -3017,20 +3042,23 @@ execa@^2.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" - integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== +execa@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-9.6.0.tgz#38665530e54e2e018384108322f37f35ae74f3bc" + integrity sha512-jpWzZ1ZhwUmeWRhS7Qv3mhpOhLfwI+uAX4e5fOcXqwMR7EcJ0pj2kV1CVzHVMX/LphnKWD3LObjZCoJ71lKpHw== dependencies: - cross-spawn "^7.0.3" - get-stream "^8.0.1" - human-signals "^5.0.0" - is-stream "^3.0.0" - merge-stream "^2.0.0" - npm-run-path "^5.1.0" - onetime "^6.0.0" + "@sindresorhus/merge-streams" "^4.0.0" + cross-spawn "^7.0.6" + figures "^6.1.0" + get-stream "^9.0.0" + human-signals "^8.0.1" + is-plain-obj "^4.1.0" + is-stream "^4.0.1" + npm-run-path "^6.0.0" + pretty-ms "^9.2.0" signal-exit "^4.1.0" - strip-final-newline "^3.0.0" + strip-final-newline "^4.0.0" + yoctocolors "^2.1.1" expand-template@^2.0.3: version "2.0.3" @@ -3052,18 +3080,7 @@ fast-fifo@^1.2.0, fast-fifo@^1.3.2: resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c" integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ== -fast-glob@^3.2.12, fast-glob@^3.2.9: - version "3.3.2" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" - integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-glob@^3.3.3: +fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg== @@ -3080,9 +3097,9 @@ fast-json-stable-stringify@^2.0.0: integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-uri@^3.0.1: - version "3.0.6" - resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.6.tgz#88f130b77cfaea2378d56bf970dea21257a68748" - integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw== + version "3.1.0" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa" + integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA== fastest-levenshtein@^1.0.12: version "1.0.16" @@ -3090,9 +3107,9 @@ fastest-levenshtein@^1.0.12: integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: - version "1.17.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" - integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== + version "1.19.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5" + integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ== dependencies: reusify "^1.0.4" @@ -3103,6 +3120,13 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +figures@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/figures/-/figures-6.1.0.tgz#935479f51865fa7479f6fa94fc6fc7ac14e62c4a" + integrity sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg== + dependencies: + is-unicode-supported "^2.0.0" + file-loader@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" @@ -3140,14 +3164,13 @@ find-up@5.0.0, find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-up@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-7.0.0.tgz#e8dec1455f74f78d888ad65bf7ca13dd2b4e66fb" - integrity sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g== +find-up@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-8.0.0.tgz#9e4663f9605eeb615edd7399f376a01b1de312fe" + integrity sha512-JGG8pvDi2C+JxidYdIwQDyS/CgcrIdh18cvgxcBge3wSHRQOrooMD3GlFBcmMJAN9M42SAZjDp5zv1dglJjwww== dependencies: - locate-path "^7.2.0" - path-exists "^5.0.0" - unicorn-magic "^0.1.0" + locate-path "^8.0.0" + unicorn-magic "^0.3.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" @@ -3163,16 +3186,9 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== follow-redirects@^1.14.6, follow-redirects@^1.15.6: - version "1.15.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1" - integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ== - -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" + version "1.15.11" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340" + integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ== for-each@^0.3.5: version "0.3.5" @@ -3181,15 +3197,7 @@ for-each@^0.3.5: dependencies: is-callable "^1.2.7" -foreground-child@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.2.1.tgz#767004ccf3a5b30df39bed90718bab43fe0a59f7" - integrity sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA== - dependencies: - cross-spawn "^7.0.0" - signal-exit "^4.0.1" - -foreground-child@^3.1.1, foreground-child@^3.3.1: +foreground-child@^3.1.0, foreground-child@^3.1.1, foreground-child@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f" integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw== @@ -3218,7 +3226,7 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^10.0.0, fs-extra@^10.1.0: +fs-extra@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== @@ -3227,10 +3235,10 @@ fs-extra@^10.0.0, fs-extra@^10.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.2.0, fs-extra@^11.3.0: - version "11.3.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.0.tgz#0daced136bbaf65a555a326719af931adc7a314d" - integrity sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew== +fs-extra@^11.1.1, fs-extra@^11.2.0, fs-extra@^11.3.2: + version "11.3.2" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.2.tgz#c838aeddc6f4a8c74dd15f85e11fe5511bfe02a4" + integrity sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A== dependencies: graceful-fs "^4.2.0" jsonfile "^6.0.1" @@ -3260,27 +3268,26 @@ function-bind@^1.1.2: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== +generator-function@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2" + integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g== + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-east-asian-width@^1.0.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6" + integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q== + get-func-name@^2.0.1, get-func-name@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== -get-intrinsic@^1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" - integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== - dependencies: - es-errors "^1.3.0" - function-bind "^1.1.2" - has-proto "^1.0.1" - has-symbols "^1.0.3" - hasown "^2.0.0" - get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01" @@ -3317,12 +3324,7 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" -get-stream@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2" - integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== - -get-stream@^9.0.1: +get-stream@^9.0.0, get-stream@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-9.0.1.tgz#95157d21df8eb90d1647102b63039b1df60ebd27" integrity sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA== @@ -3354,35 +3356,12 @@ glob@7.2.0: dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^10.0.0: - version "10.3.12" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" - integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.3.6" - minimatch "^9.0.1" - minipass "^7.0.4" - path-scurry "^1.10.2" - -glob@^10.3.7: - version "10.4.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.2.tgz#bed6b95dade5c1f80b4434daced233aee76160e5" - integrity sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w== - dependencies: - foreground-child "^3.1.0" - jackspeak "^3.1.2" - minimatch "^9.0.4" - minipass "^7.1.2" - package-json-from-dist "^1.0.0" - path-scurry "^1.11.1" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" -glob@^10.4.1: +glob@^10.0.0, glob@^10.3.7, glob@^10.4.1: version "10.4.5" resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956" integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg== @@ -3466,21 +3445,23 @@ gopd@^1.0.1, gopd@^1.2.0: resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== -got@^14.4.7: - version "14.4.7" - resolved "https://registry.yarnpkg.com/got/-/got-14.4.7.tgz#f23644b9bc16d6f35fafdf410c18116614b922dd" - integrity sha512-DI8zV1231tqiGzOiOzQWDhsBmncFW7oQDH6Zgy6pDPrqJuVZMtoSgPLLsBZQj8Jg4JFfwoOsDA8NGtLQLnIx2g== +got@^14.5.0: + version "14.6.2" + resolved "https://registry.yarnpkg.com/got/-/got-14.6.2.tgz#1b1deb4d9c3e1e4a4d8db85d3796c21f41173c32" + integrity sha512-bnhvxegqufyxHAmzwCZSscjGLVpw6/NzTXOk2tQVu/b9Q9FeMAgLabYulXEQRwP04UYltnkcZwvBq14fsdqvyw== dependencies: "@sindresorhus/is" "^7.0.1" "@szmarczak/http-timer" "^5.0.1" + byte-counter "^0.1.0" cacheable-lookup "^7.0.0" - cacheable-request "^12.0.1" - decompress-response "^6.0.0" + cacheable-request "^13.0.12" + decompress-response "^10.0.0" form-data-encoder "^4.0.2" http2-wrapper "^2.2.1" + keyv "^5.5.3" lowercase-keys "^3.0.0" p-cancelable "^4.0.1" - responselike "^3.0.0" + responselike "^4.0.2" type-fest "^4.26.1" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.2, graceful-fs@^4.2.4: @@ -3510,30 +3491,11 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2: dependencies: es-define-property "^1.0.0" -has-proto@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5" - integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ== - dependencies: - dunder-proto "^1.0.0" - -has-symbols@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - has-symbols@^1.0.3, has-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338" integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ== -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - has-tostringtag@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" @@ -3551,7 +3513,7 @@ hash-sum@^2.0.0: resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== -hasown@^2.0.0, hasown@^2.0.2: +hasown@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== @@ -3607,21 +3569,12 @@ htmlparser2@^8.0.0: domutils "^3.0.1" entities "^4.4.0" -http-cache-semantics@^4.1.1: +http-cache-semantics@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz#205f4db64f8562b76a4ff9235aa5279839a09dd5" integrity sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ== -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== - dependencies: - "@tootallnate/once" "1" - agent-base "6" - debug "4" - -http-proxy-agent@^7.0.0: +http-proxy-agent@^7.0.0, http-proxy-agent@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e" integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig== @@ -3637,26 +3590,18 @@ http2-wrapper@^2.2.1: quick-lru "^5.1.1" resolve-alpn "^1.2.0" -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" - -https-proxy-agent@^7.0.0: - version "7.0.4" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" - integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== +https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.5: + version "7.0.6" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9" + integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw== dependencies: - agent-base "^7.0.2" + agent-base "^7.1.2" debug "4" -human-signals@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28" - integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ== +human-signals@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-8.0.1.tgz#f08bb593b6d1db353933d06156cedec90abe51fb" + integrity sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ== husky@^6.0.0: version "6.0.0" @@ -3670,27 +3615,20 @@ iconv-lite@0.6.3, iconv-lite@^0.6.3: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^4.0.0, icss-utils@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" - integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== - dependencies: - postcss "^7.0.14" +icss-utils@^5.0.0, icss-utils@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== ieee754@^1.1.13: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.1.4: - version "5.3.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" - integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== - -ignore@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef" - integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== +ignore@^5.1.4, ignore@^5.2.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" + integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== ignore@^7.0.3: version "7.0.5" @@ -3702,15 +3640,15 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -immutable@^4.0.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f" - integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA== +immutable@^5.0.2: + version "5.1.4" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.4.tgz#e3f8c1fe7b567d56cf26698f31918c241dae8c1f" + integrity sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA== import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260" + integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -3720,6 +3658,11 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== +index-to-position@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/index-to-position/-/index-to-position-1.2.0.tgz#c800eb34dacf4dbf96b9b06c7eb78d5f704138b4" + integrity sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw== + inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -3739,11 +3682,11 @@ ini@~1.3.0: integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== interactjs@^1.9.18: - version "1.10.26" - resolved "https://registry.yarnpkg.com/interactjs/-/interactjs-1.10.26.tgz#ad009a46ee3610cb75de6aec22ea6cc0b0e277e2" - integrity sha512-5gNTNDTfEHp2EifqtWGi5VkD3CMZVJSTGmtK/IsVRd+rkOk3E63iVs5Z+IeD5K1Lr0qZpU2754VHAwf5i+Z9xg== + version "1.10.27" + resolved "https://registry.yarnpkg.com/interactjs/-/interactjs-1.10.27.tgz#16499aba4987a5ccfdaddca7d1ba7bb1118e14d0" + integrity sha512-y/8RcCftGAF24gSp76X2JS3XpHiUvDQyhF8i7ujemBz77hwiHDuJzftHx7thY8cxGogwGiPJ+o97kWB6eAXnsA== dependencies: - "@interactjs/types" "1.10.26" + "@interactjs/types" "1.10.27" "internmap@1 - 2": version "2.0.3" @@ -3756,17 +3699,12 @@ interpret@^2.2.0: integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== is-arguments@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b" + integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + call-bound "^1.0.2" + has-tostringtag "^1.0.2" is-binary-path@~2.1.0: version "2.1.0" @@ -3780,7 +3718,7 @@ is-buffer@~1.1.6: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-callable@^1.1.3, is-callable@^1.2.7: +is-callable@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== @@ -3792,12 +3730,12 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -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== +is-core-module@^2.16.1: + version "2.16.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4" + integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w== dependencies: - hasown "^2.0.0" + hasown "^2.0.2" is-docker@^3.0.0: version "3.0.0" @@ -3815,11 +3753,15 @@ is-fullwidth-code-point@^3.0.0: integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-generator-function@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5" + integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.4" + generator-function "^2.0.0" + get-proto "^1.0.1" + has-tostringtag "^1.0.2" + safe-regex-test "^1.1.0" is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" @@ -3835,12 +3777,16 @@ is-inside-container@^1.0.0: dependencies: is-docker "^3.0.0" +is-interactive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-2.0.0.tgz#40c57614593826da1100ade6059778d597f16e90" + integrity sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ== + is-it-type@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/is-it-type/-/is-it-type-5.1.2.tgz#30da6429200f4cb55280b92b9327226439b0ed34" - integrity sha512-q/gOZQTNYABAxaXWnBKZjTFH4yACvWEFtgVOj+LbgxYIgAJG1xVmUZOsECSrZPIemYUQvaQWVilSFVbh4Eyt8A== + version "5.1.3" + resolved "https://registry.yarnpkg.com/is-it-type/-/is-it-type-5.1.3.tgz#2606b194e661d26f01c393218fde76c19d928059" + integrity sha512-AX2uU0HW+TxagTgQXOJY7+2fbFHemC7YFBwN1XqD8qQMKdtfbOC8OC3fUb4s5NU59a3662Dzwto8tWDdZYRXxg== dependencies: - "@babel/runtime" "^7.16.7" globalthis "^1.0.2" is-nan@^1.3.2: @@ -3885,6 +3831,11 @@ is-plain-obj@^2.1.0: resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== +is-plain-obj@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0" + integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg== + is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -3897,40 +3848,53 @@ is-plain-object@^5.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== +is-regex@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22" + integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g== + dependencies: + call-bound "^1.0.2" + gopd "^1.2.0" + has-tostringtag "^1.0.2" + hasown "^2.0.2" + is-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" - integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== - is-stream@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-4.0.1.tgz#375cf891e16d2e4baec250b85926cffc14720d9b" integrity sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A== -is-typed-array@^1.1.14: +is-typed-array@^1.1.14, is-typed-array@^1.1.3: version "1.1.15" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b" integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ== dependencies: which-typed-array "^1.1.16" -is-typed-array@^1.1.3: - version "1.1.12" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" - integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== - dependencies: - which-typed-array "^1.1.11" - is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== +is-unicode-supported@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz#d824984b616c292a2e198207d4a609983842f714" + integrity sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ== + +is-unicode-supported@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz#09f0ab0de6d3744d48d265ebb98f65d11f2a9b3a" + integrity sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ== + +is-wayland@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-wayland/-/is-wayland-0.1.0.tgz#ed966c54a608af5ba3c407922589859a0d424fe5" + integrity sha512-QkbMsWkIfkrzOPxenwye0h56iAXirZYHG9eHVPb22fO9y+wPbaX/CHacOWBa/I++4ohTcByimhM1/nyCsH8KNA== + is-wsl@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-3.1.0.tgz#e1c657e39c10090afcbedec61720f6b924c3cbd2" @@ -3985,9 +3949,9 @@ istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1: supports-color "^7.1.0" istanbul-reports@^3.1.6: - version "3.1.7" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b" - integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g== + version "3.2.0" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93" + integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -4001,19 +3965,10 @@ istextorbinary@^9.5.0: editions "^6.21.0" textextensions "^6.11.0" -jackspeak@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" - integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== - dependencies: - "@isaacs/cliui" "^8.0.2" - optionalDependencies: - "@pkgjs/parseargs" "^0.11.0" - jackspeak@^3.1.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.0.tgz#a75763ff36ad778ede6a156d8ee8b124de445b4a" - integrity sha512-JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw== + version "3.4.3" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a" + integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw== dependencies: "@isaacs/cliui" "^8.0.2" optionalDependencies: @@ -4055,21 +4010,11 @@ js-yaml@^3.14.1: argparse "^1.0.7" esprima "^4.0.0" -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-parse-even-better-errors@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz#b43d35e89c0f3be6b5fbbe9dc6c82467b30c28da" - integrity sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ== - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -4105,9 +4050,9 @@ jsonfile@^4.0.0: graceful-fs "^4.1.6" jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + version "6.2.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62" + integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg== dependencies: universalify "^2.0.0" optionalDependencies: @@ -4169,23 +4114,18 @@ keytar@^7.7.0: node-addon-api "^4.3.0" prebuild-install "^7.0.1" -keyv@^4.5.4: - version "4.5.4" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" - integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== +keyv@^5.5.3: + version "5.5.3" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.5.3.tgz#db7b7f89b3e13ade5a8d0fe59d765aebb596e84b" + integrity sha512-h0Un1ieD+HUrzBH6dJXhod3ifSghk5Hw/2Y4/KHBziPlZecrFyE9YOTPU6eOs0V9pYl8gOs86fkr/KN8lUX39A== dependencies: - json-buffer "3.0.1" + "@keyv/serialize" "^1.1.1" kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klona@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" - integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== - lazystream@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" @@ -4205,11 +4145,6 @@ lie@~3.3.0: dependencies: immediate "~3.0.5" -lines-and-columns@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42" - integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A== - linkify-it@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421" @@ -4218,11 +4153,11 @@ linkify-it@^5.0.0: uc.micro "^2.0.0" loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.1.tgz#6c76ed29b0ccce9af379208299f07f876de737e3" + integrity sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q== -loader-utils@^1.0.2, loader-utils@^1.2.3: +loader-utils@^1.0.2: version "1.4.2" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3" integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg== @@ -4254,10 +4189,10 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -locate-path@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a" - integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA== +locate-path@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-8.0.0.tgz#4f0cca3d0d84b02b6f534a73331c83437bf14141" + integrity sha512-XT9ewWAC43tiAV7xDAPflMkG0qOPn2QjHqlgX8FOqmWa/rxnyYDulF9T0F7tRy1u+TVTmK/M//6VIOye+2zDXg== dependencies: p-locate "^6.0.0" @@ -4334,6 +4269,14 @@ log-symbols@4.1.0: chalk "^4.1.0" is-unicode-supported "^0.1.0" +log-symbols@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-6.0.0.tgz#bb95e5f05322651cac30c0feb6404f9f2a8a9439" + integrity sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw== + dependencies: + chalk "^5.3.0" + is-unicode-supported "^1.3.0" + loupe@^2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697" @@ -4346,20 +4289,15 @@ lowercase-keys@^3.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2" integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ== -lru-cache@^10.0.1: +lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.4.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119" integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ== -lru-cache@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" - integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== - lru-cache@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.1.0.tgz#afafb060607108132dbc1cf8ae661afb69486117" - integrity sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A== + version "11.2.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.2.tgz#40fd37edffcfae4b2940379c0722dc6eeaa75f24" + integrity sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg== lru-cache@^6.0.0: version "6.0.0" @@ -4368,12 +4306,12 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -magic-string@^0.30.5: - version "0.30.5" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.5.tgz#1994d980bd1c8835dc6e78db7cbd4ae4f24746f9" - integrity sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA== +magic-string@^0.30.19: + version "0.30.21" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91" + integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ== dependencies: - "@jridgewell/sourcemap-codec" "^1.4.15" + "@jridgewell/sourcemap-codec" "^1.5.5" make-dir@^4.0.0: version "4.0.0" @@ -4433,7 +4371,7 @@ merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -micromatch@^4.0.0, micromatch@^4.0.4, micromatch@^4.0.8: +micromatch@^4.0.0, micromatch@^4.0.5, micromatch@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== @@ -4463,10 +4401,10 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-fn@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" - integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== +mimic-function@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076" + integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA== mimic-response@^3.1.0: version "3.1.0" @@ -4478,6 +4416,13 @@ mimic-response@^4.0.0: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-4.0.0.tgz#35468b19e7c75d10f5165ea25e75a5ceea7cf70f" integrity sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg== +minimatch@*, minimatch@^10.0.3: + version "10.1.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55" + integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ== + dependencies: + "@isaacs/brace-expansion" "^5.0.0" + minimatch@4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4" @@ -4485,13 +4430,6 @@ minimatch@4.2.1: dependencies: brace-expansion "^1.1.7" -minimatch@^10.0.3: - version "10.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa" - integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw== - dependencies: - "@isaacs/brace-expansion" "^5.0.0" - minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -4506,20 +4444,13 @@ minimatch@^5.1.0: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.1: +minimatch@^9.0.4: version "9.0.5" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5" integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow== dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.4: - version "9.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" - integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== - dependencies: - brace-expansion "^2.0.1" - minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" @@ -4530,11 +4461,6 @@ minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -minipass@^7.0.4: - version "7.0.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== - mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -4645,9 +4571,9 @@ neo-async@^2.6.2: integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== node-abi@^3.3.0: - version "3.75.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.75.0.tgz#2f929a91a90a0d02b325c43731314802357ed764" - integrity sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg== + version "3.80.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.80.0.tgz#d7390951f27caa129cceeec01e1c20fc9f07581c" + integrity sha512-LyPuZJcI9HVwzXK1GPxWNzrr+vr8Hp/3UqlmWxxh8p54U1ZbclOqbSog9lWHaCX+dBaiGi6n/hIX+mKu74GmPA== dependencies: semver "^7.3.5" @@ -4661,6 +4587,11 @@ node-addon-api@^4.3.0: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-addon-api@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" + integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== + node-gyp-build@4.8.4: version "4.8.4" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8" @@ -4686,18 +4617,18 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.18: - version "2.0.18" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" - integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== +node-releases@^2.0.26: + version "2.0.27" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e" + integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA== -node-sarif-builder@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/node-sarif-builder/-/node-sarif-builder-2.0.3.tgz#179ae590ce020f97f9e45037dc1cde85aa4398ec" - integrity sha512-Pzr3rol8fvhG/oJjIq2NTVB0vmdNNlz22FENhhPojYRZ4/ee08CfK4YuKmuL54V9MLhI1kpzxfOJ/63LzmZzDg== +node-sarif-builder@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/node-sarif-builder/-/node-sarif-builder-3.2.0.tgz#ba008995d8b165570c3f38300e56299a93531db1" + integrity sha512-kVIOdynrF2CRodHZeP/97Rh1syTUHBNiw17hUCIVhlhEsWlfJm19MuO56s4MdKbr22xWx6mzMnNAgXzVlIYM9Q== dependencies: - "@types/sarif" "^2.1.4" - fs-extra "^10.0.0" + "@types/sarif" "^2.1.7" + fs-extra "^11.1.1" normalize-package-data@^6.0.0: version "6.0.2" @@ -4713,10 +4644,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@^8.0.1: - version "8.0.2" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-8.0.2.tgz#3b343a42f837e4dae2b01917c04e8de3782e9170" - integrity sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw== +normalize-url@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-8.1.0.tgz#d33504f67970decf612946fd4880bc8c0983486d" + integrity sha512-X06Mfd/5aKsRHc0O0J5CUedwnPmnDtLF2+nq+KN9KSDlJHkPuh0JUviWjEWMe0SW/9TDdSLVPuk7L5gGTIA1/w== npm-run-path@^3.0.0: version "3.1.0" @@ -4725,12 +4656,13 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" -npm-run-path@^5.1.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f" - integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ== +npm-run-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-6.0.0.tgz#25cfdc4eae04976f3349c0b1afc089052c362537" + integrity sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA== dependencies: path-key "^4.0.0" + unicorn-magic "^0.3.0" nth-check@^2.0.1: version "2.1.1" @@ -4750,12 +4682,12 @@ object-inspect@^1.13.3: integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew== object-is@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + version "1.1.6" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07" + integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + call-bind "^1.0.7" + define-properties "^1.2.1" object-keys@^1.1.1: version "1.1.1" @@ -4763,13 +4695,15 @@ object-keys@^1.1.1: integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object.assign@^4.1.4: - version "4.1.5" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" - integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== + version "4.1.7" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d" + integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw== dependencies: - call-bind "^1.0.5" + call-bind "^1.0.8" + call-bound "^1.0.3" define-properties "^1.2.1" - has-symbols "^1.0.3" + es-object-atoms "^1.0.0" + has-symbols "^1.1.0" object-keys "^1.1.1" once@^1.3.0, once@^1.3.1, once@^1.4.0: @@ -4786,22 +4720,37 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -onetime@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" - integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== +onetime@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-7.0.0.tgz#9f16c92d8c9ef5120e3acd9dd9957cceecc1ab60" + integrity sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ== dependencies: - mimic-fn "^4.0.0" + mimic-function "^5.0.0" open@^10.1.0: - version "10.1.2" - resolved "https://registry.yarnpkg.com/open/-/open-10.1.2.tgz#d5df40984755c9a9c3c93df8156a12467e882925" - integrity sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw== + version "10.2.0" + resolved "https://registry.yarnpkg.com/open/-/open-10.2.0.tgz#b9d855be007620e80b6fb05fac98141fe62db73c" + integrity sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA== dependencies: default-browser "^5.2.1" define-lazy-prop "^3.0.0" is-inside-container "^1.0.0" - is-wsl "^3.1.0" + wsl-utils "^0.1.0" + +ora@^8.1.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-8.2.0.tgz#8fbbb7151afe33b540dd153f171ffa8bd38e9861" + integrity sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw== + dependencies: + chalk "^5.3.0" + cli-cursor "^5.0.0" + cli-spinners "^2.9.2" + is-interactive "^2.0.0" + is-unicode-supported "^2.0.0" + log-symbols "^6.0.0" + stdin-discarder "^0.2.2" + string-width "^7.2.0" + strip-ansi "^7.1.0" os-browserify@^0.3.0: version "0.3.0" @@ -4809,9 +4758,9 @@ os-browserify@^0.3.0: integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A== ovsx@^0.10.2: - version "0.10.4" - resolved "https://registry.yarnpkg.com/ovsx/-/ovsx-0.10.4.tgz#963861d9138f6aa1da80aa25b3b4d5c45ab3b178" - integrity sha512-9HY9TsFpL31EqhPZSdal7k3sTOfrFvj2GEnXKF2PYKukQpiAilOaPhW8K0NSGCiVh9MQYr2IyhX74PKMVlcJ5g== + version "0.10.6" + resolved "https://registry.yarnpkg.com/ovsx/-/ovsx-0.10.6.tgz#e7770b6f6d3d997456bb126564fe94e587c58931" + integrity sha512-MZ7pgQ+IS5kumAfZGnhEjmdOUwW0UlmlekMwuA5DeUJeft7jFu9fTIEhH71ypjdUSpdqchodoKgb5y/ilh7b5g== dependencies: "@vscode/vsce" "^3.2.1" commander "^6.2.1" @@ -4897,25 +4846,28 @@ p-try@^2.0.0: integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== package-json-from-dist@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" - integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw== + version "1.0.1" + resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505" + integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw== pako@~1.0.2: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== -parse-json@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-7.1.1.tgz#68f7e6f0edf88c54ab14c00eb700b753b14e2120" - integrity sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw== +parse-json@^8.0.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-8.3.0.tgz#88a195a2157025139a2317a4f2f9252b61304ed5" + integrity sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ== dependencies: - "@babel/code-frame" "^7.21.4" - error-ex "^1.3.2" - json-parse-even-better-errors "^3.0.0" - lines-and-columns "^2.0.3" - type-fest "^3.8.0" + "@babel/code-frame" "^7.26.2" + index-to-position "^1.1.0" + type-fest "^4.39.1" + +parse-ms@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-4.0.0.tgz#c0c058edd47c2a590151a718990533fd62803df4" + integrity sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw== parse-semver@^1.1.1: version "1.1.1" @@ -4961,11 +4913,6 @@ path-exists@^4.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== -path-exists@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" - integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== - path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -4991,14 +4938,6 @@ path-parse@^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.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" - integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== - dependencies: - lru-cache "^10.2.0" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry@^1.11.1: version "1.11.1" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2" @@ -5035,16 +4974,6 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== -picocolors@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" - integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA== - -picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== - picocolors@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" @@ -5066,12 +4995,12 @@ pify@^4.0.1: integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pinia@^2.1.6: - version "2.1.7" - resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.7.tgz#4cf5420d9324ca00b7b4984d3fbf693222115bbc" - integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ== + version "2.3.1" + resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.3.1.tgz#54c476675b72f5abcfafa24a7582531ea8c23d94" + integrity sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug== dependencies: - "@vue/devtools-api" "^6.5.0" - vue-demi ">=0.14.5" + "@vue/devtools-api" "^6.6.3" + vue-demi "^0.14.10" pinkie-promise@^2.0.0: version "2.0.1" @@ -5093,9 +5022,9 @@ pkg-dir@^4.2.0: find-up "^4.0.0" plotly.js-dist-min@^2.26.1: - version "2.28.0" - resolved "https://registry.yarnpkg.com/plotly.js-dist-min/-/plotly.js-dist-min-2.28.0.tgz#22359b12a971224248547d32a853c21e3f914558" - integrity sha512-TzoB4RRSL4WcbAVP9fjeZRKNnRhHLBWmXxIIMQ3O7GAwadQ/IpO6kSS0q8Ahmr6eewvKKiJeXqc4sA6oEQre/A== + version "2.35.3" + resolved "https://registry.yarnpkg.com/plotly.js-dist-min/-/plotly.js-dist-min-2.35.3.tgz#b80c79546fe21c1f585657b59d80caf1a0d8f563" + integrity sha512-sz2HLP8gkysLx/BanM2PtJTtZ1PLPwdHwMWNri2YxLBy3IOeuDsVQtlmWa4hoK3j/fi4naaD3uZJqH5ozM3zGg== plotly.js-dist@^1.54.1: version "1.58.5" @@ -5117,61 +5046,48 @@ possible-typed-array-names@^1.0.0: resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz#93e3582bc0e5426586d9d07b79ee40fc841de4ae" integrity sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg== -postcss-modules-extract-imports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" - integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== - dependencies: - postcss "^7.0.5" +postcss-modules-extract-imports@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz#b4497cb85a9c0c4b5aabeb759bb25e8d89f15002" + integrity sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q== -postcss-modules-local-by-default@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" - integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== +postcss-modules-local-by-default@^4.0.5: + version "4.2.0" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz#d150f43837831dae25e4085596e84f6f5d6ec368" + integrity sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw== dependencies: - icss-utils "^4.1.1" - postcss "^7.0.32" - postcss-selector-parser "^6.0.2" + icss-utils "^5.0.0" + postcss-selector-parser "^7.0.0" postcss-value-parser "^4.1.0" -postcss-modules-scope@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" - integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== +postcss-modules-scope@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz#1bbccddcb398f1d7a511e0a2d1d047718af4078c" + integrity sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA== dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" + postcss-selector-parser "^7.0.0" -postcss-modules-values@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" - integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== +postcss-modules-values@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== dependencies: - icss-utils "^4.0.0" - postcss "^7.0.6" + icss-utils "^5.0.0" -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.15" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535" - integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== +postcss-selector-parser@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz#4d6af97eba65d73bc4d84bcb343e865d7dd16262" + integrity sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-value-parser@^4.1.0: +postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.39" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" - integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - -postcss@^8.3.11, postcss@^8.4.31, postcss@^8.4.33, postcss@^8.4.43: +postcss@^8.3.11, postcss@^8.4.31, postcss@^8.4.33, postcss@^8.4.43, postcss@^8.5.6: version "8.5.6" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c" integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg== @@ -5203,6 +5119,13 @@ prettier@2.0.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.2.tgz#1ba8f3eb92231e769b7fcd7cb73ae1b6b74ade08" integrity sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg== +pretty-ms@^9.2.0: + version "9.3.0" + resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-9.3.0.tgz#dd2524fcb3c326b4931b2272dfd1e1a8ed9a9f5a" + integrity sha512-gjVS5hOP+M3wMm5nmNOucbIrqudzs9v/57bWRHQWLYklXqoXKrVfYW2W9+glfGsqtPgpiz5WwyEEB+ksXIx3gQ== + dependencies: + parse-ms "^4.0.0" + pretty-quick@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.2.tgz#4e44d6489ed513ef111bee501f63688d854584e6" @@ -5310,15 +5233,16 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-pkg@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-8.1.0.tgz#6cf560b91d90df68bce658527e7e3eee75f7c4c7" - integrity sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ== +read-pkg@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-9.0.1.tgz#b1b81fb15104f5dbb121b6bbdee9bbc9739f569b" + integrity sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA== dependencies: - "@types/normalize-package-data" "^2.4.1" + "@types/normalize-package-data" "^2.4.3" normalize-package-data "^6.0.0" - parse-json "^7.0.0" - type-fest "^4.2.0" + parse-json "^8.0.0" + type-fest "^4.6.0" + unicorn-magic "^0.1.0" read@^1.0.7: version "1.0.7" @@ -5356,6 +5280,11 @@ readdir-glob@^1.1.2: dependencies: minimatch "^5.1.0" +readdirp@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d" + integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg== + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -5403,11 +5332,11 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve@^1.9.0: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + version "1.22.11" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262" + integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ== dependencies: - is-core-module "^2.13.0" + is-core-module "^2.16.1" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -5418,10 +5347,25 @@ responselike@^3.0.0: dependencies: lowercase-keys "^3.0.0" +responselike@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-4.0.2.tgz#d99a1105aeca5909c1e93156a839c7f3173e26c2" + integrity sha512-cGk8IbWEAnaCpdAt1BHzJ3Ahz5ewDJa0KseTsE3qIRMJ3C698W8psM7byCeWVpd/Ha7FUYzuRVzXoKoM6nRUbA== + dependencies: + lowercase-keys "^3.0.0" + +restore-cursor@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-5.1.0.tgz#0766d95699efacb14150993f55baf0953ea1ebe7" + integrity sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA== + dependencies: + onetime "^7.0.0" + signal-exit "^4.1.0" + reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + version "1.1.0" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f" + integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw== rimraf@^2.6.3: version "2.7.1" @@ -5438,46 +5382,47 @@ rimraf@^3.0.2: glob "^7.1.3" rimraf@^5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.7.tgz#27bddf202e7d89cb2e0381656380d1734a854a74" - integrity sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg== + version "5.0.10" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c" + integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ== dependencies: glob "^10.3.7" rollup@^4.20.0: - version "4.50.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.50.1.tgz#6f0717c34aacc65cc727eeaaaccc2afc4e4485fd" - integrity sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA== + version "4.52.5" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.52.5.tgz#96982cdcaedcdd51b12359981f240f94304ec235" + integrity sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw== dependencies: "@types/estree" "1.0.8" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.50.1" - "@rollup/rollup-android-arm64" "4.50.1" - "@rollup/rollup-darwin-arm64" "4.50.1" - "@rollup/rollup-darwin-x64" "4.50.1" - "@rollup/rollup-freebsd-arm64" "4.50.1" - "@rollup/rollup-freebsd-x64" "4.50.1" - "@rollup/rollup-linux-arm-gnueabihf" "4.50.1" - "@rollup/rollup-linux-arm-musleabihf" "4.50.1" - "@rollup/rollup-linux-arm64-gnu" "4.50.1" - "@rollup/rollup-linux-arm64-musl" "4.50.1" - "@rollup/rollup-linux-loongarch64-gnu" "4.50.1" - "@rollup/rollup-linux-ppc64-gnu" "4.50.1" - "@rollup/rollup-linux-riscv64-gnu" "4.50.1" - "@rollup/rollup-linux-riscv64-musl" "4.50.1" - "@rollup/rollup-linux-s390x-gnu" "4.50.1" - "@rollup/rollup-linux-x64-gnu" "4.50.1" - "@rollup/rollup-linux-x64-musl" "4.50.1" - "@rollup/rollup-openharmony-arm64" "4.50.1" - "@rollup/rollup-win32-arm64-msvc" "4.50.1" - "@rollup/rollup-win32-ia32-msvc" "4.50.1" - "@rollup/rollup-win32-x64-msvc" "4.50.1" + "@rollup/rollup-android-arm-eabi" "4.52.5" + "@rollup/rollup-android-arm64" "4.52.5" + "@rollup/rollup-darwin-arm64" "4.52.5" + "@rollup/rollup-darwin-x64" "4.52.5" + "@rollup/rollup-freebsd-arm64" "4.52.5" + "@rollup/rollup-freebsd-x64" "4.52.5" + "@rollup/rollup-linux-arm-gnueabihf" "4.52.5" + "@rollup/rollup-linux-arm-musleabihf" "4.52.5" + "@rollup/rollup-linux-arm64-gnu" "4.52.5" + "@rollup/rollup-linux-arm64-musl" "4.52.5" + "@rollup/rollup-linux-loong64-gnu" "4.52.5" + "@rollup/rollup-linux-ppc64-gnu" "4.52.5" + "@rollup/rollup-linux-riscv64-gnu" "4.52.5" + "@rollup/rollup-linux-riscv64-musl" "4.52.5" + "@rollup/rollup-linux-s390x-gnu" "4.52.5" + "@rollup/rollup-linux-x64-gnu" "4.52.5" + "@rollup/rollup-linux-x64-musl" "4.52.5" + "@rollup/rollup-openharmony-arm64" "4.52.5" + "@rollup/rollup-win32-arm64-msvc" "4.52.5" + "@rollup/rollup-win32-ia32-msvc" "4.52.5" + "@rollup/rollup-win32-x64-gnu" "4.52.5" + "@rollup/rollup-win32-x64-msvc" "4.52.5" fsevents "~2.3.2" run-applescript@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.0.0.tgz#e5a553c2bffd620e169d276c1cd8f1b64778fbeb" - integrity sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A== + version "7.1.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-7.1.0.tgz#2e9e54c4664ec3106c5b5630e249d3d6595c4911" + integrity sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q== run-parallel@^1.1.9: version "1.2.0" @@ -5496,6 +5441,15 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-regex-test@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1" + integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw== + dependencies: + call-bound "^1.0.2" + es-errors "^1.3.0" + is-regex "^1.2.1" + "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -5509,9 +5463,9 @@ sanitize-filename@^1.6.3: truncate-utf8-bytes "^1.0.0" sanitize-html@^2.12.1: - version "2.12.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7" - integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA== + version "2.17.0" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.17.0.tgz#a8f66420a6be981d8fe412e3397cc753782598e4" + integrity sha512-dLAADUSS8rBwhaevT12yCezvioCA+bmUTPH/u57xKPT8d++voeYE6HeluA/bPbQ15TwDBG2ii+QZIEmYx8VdxA== dependencies: deepmerge "^4.2.2" escape-string-regexp "^4.0.0" @@ -5520,41 +5474,30 @@ sanitize-html@^2.12.1: parse-srcset "^1.0.2" postcss "^8.3.11" -sass-loader@^10: - version "10.5.2" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.5.2.tgz#1ca30534fff296417b853c7597ca3b0bbe8c37d0" - integrity sha512-vMUoSNOUKJILHpcNCCyD23X34gve1TS7Rjd9uXHeKqhvBG39x6XbswFDtpbTElj6XdMFezoWhkh5vtKudf2cgQ== +sass-loader@^16.0.5: + version "16.0.6" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.6.tgz#913b05607d06c386bc37870494e1e3a3e091fd3b" + integrity sha512-sglGzId5gmlfxNs4gK2U3h7HlVRfx278YK6Ono5lwzuvi1jxig80YiuHkaDBVsYIKFhx8wN7XSCI0M2IDS/3qA== dependencies: - klona "^2.0.4" - loader-utils "^2.0.0" neo-async "^2.6.2" - schema-utils "^3.0.0" - semver "^7.3.2" -sass@^1.49.8: - version "1.70.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75" - integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ== +sass@^1.69.0: + version "1.93.3" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.93.3.tgz#3ff0aa5879dc910d32eae10c282a2847bd63e758" + integrity sha512-elOcIZRTM76dvxNAjqYrucTSI0teAF/L2Lv0s6f6b7FOwcwIuA357bIE871580AjHJuSvLIRUosgV+lIWx6Rgg== dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" + chokidar "^4.0.0" + immutable "^5.0.2" source-map-js ">=0.6.2 <2.0.0" + optionalDependencies: + "@parcel/watcher" "^2.4.1" sax@>=0.6.0: version "1.4.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f" integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg== -schema-utils@^2.7.0: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - -schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: +schema-utils@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== @@ -5563,65 +5506,48 @@ schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b" - integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw== +schema-utils@^4, schema-utils@^4.0.0, schema-utils@^4.3.0, schema-utils@^4.3.3: + version "4.3.3" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.3.tgz#5b1850912fa31df90716963d45d9121fdfc09f46" + integrity sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA== dependencies: "@types/json-schema" "^7.0.9" ajv "^8.9.0" ajv-formats "^2.1.1" ajv-keywords "^5.1.0" -secretlint@^10.1.1: - version "10.1.1" - resolved "https://registry.yarnpkg.com/secretlint/-/secretlint-10.1.1.tgz#8cfdd22f75bd840a324b5c0fccd1d4f982b226cb" - integrity sha512-q50i+I9w6HH8P6o34LVq6M3hm5GZn2Eq5lYGHkEByOAbVqBHn8gsMGgyxjP1xSrSv1QjDtjxs/zKPm6JtkNzGw== +secretlint@^10.1.2: + version "10.2.2" + resolved "https://registry.yarnpkg.com/secretlint/-/secretlint-10.2.2.tgz#c0cf997153a2bef0b653874dc87030daa6a35140" + integrity sha512-xVpkeHV/aoWe4vP4TansF622nBEImzCY73y/0042DuJ29iKIaqgoJ8fGxre3rVSHHbxar4FdJobmTnLp9AU0eg== dependencies: - "@secretlint/config-creator" "^10.1.1" - "@secretlint/formatter" "^10.1.1" - "@secretlint/node" "^10.1.1" - "@secretlint/profiler" "^10.1.1" + "@secretlint/config-creator" "^10.2.2" + "@secretlint/formatter" "^10.2.2" + "@secretlint/node" "^10.2.2" + "@secretlint/profiler" "^10.2.2" debug "^4.4.1" globby "^14.1.0" - read-pkg "^8.1.0" + read-pkg "^9.0.1" -selenium-webdriver@^4.34.0: - version "4.34.0" - resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz#0081c3e51a2f1e197d56253c647f25085b22bd62" - integrity sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg== +selenium-webdriver@^4.35.0: + version "4.38.0" + resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.38.0.tgz#a139abb8cf262c7746ef3f66a715e1d4200a494b" + integrity sha512-5/UXXFSQmn7FGQkbcpAqvfhzflUdMWtT7QqpEgkFD6Q6rDucxB5EUfzgjmr6JbUj30QodcW3mDXehzoeS/Vy5w== dependencies: "@bazel/runfiles" "^6.3.1" jszip "^3.10.1" - tmp "^0.2.3" - ws "^8.18.2" + tmp "^0.2.5" + ws "^8.18.3" semver@^5.1.0, semver@^5.5.0: version "5.7.2" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@^6.3.0: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^7.3.2, semver@^7.3.4: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.5, semver@^7.5.2: - version "7.6.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" - integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== - -semver@^7.5.3, semver@^7.5.4, semver@^7.6.0: - version "7.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58" - integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA== +semver@^7.3.4, semver@^7.3.5, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2: + version "7.7.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946" + integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q== serialize-javascript@6.0.0: version "6.0.0" @@ -5630,7 +5556,7 @@ serialize-javascript@6.0.0: dependencies: randombytes "^2.1.0" -serialize-javascript@^6.0.1: +serialize-javascript@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -5657,7 +5583,7 @@ serialport@^13.0.0: "@serialport/stream" "13.0.0" debug "4.4.0" -set-function-length@^1.1.1, set-function-length@^1.2.1, set-function-length@^1.2.2: +set-function-length@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== @@ -5781,12 +5707,7 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-js@^1.2.1: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== @@ -5799,15 +5720,15 @@ source-map-support@~0.5.20: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@^0.6.0, source-map@^0.6.1: +source-map@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + version "0.7.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.6.tgz#a3658ab87e5b6429c8a1f3ba0083d4c61ca3ef02" + integrity sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ== spdx-correct@^3.0.0: version "3.2.0" @@ -5831,9 +5752,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.21" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz#6d6e980c9df2b6fc905343a3b2d702a6239536c3" - integrity sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg== + version "3.0.22" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz#abf5a08a6f5d7279559b669f47f0a43e8f3464ef" + integrity sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ== sprintf-js@~1.0.2: version "1.0.3" @@ -5845,6 +5766,11 @@ stack-trace@0.0.x: resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== +stdin-discarder@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/stdin-discarder/-/stdin-discarder-0.2.2.tgz#390037f44c4ae1a1ae535c5fe38dc3aba8d997be" + integrity sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ== + stream-browserify@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f" @@ -5863,12 +5789,11 @@ streamx@^2.15.0, streamx@^2.21.0: text-decoder "^1.1.0" string-replace-loader@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-3.1.0.tgz#11ac6ee76bab80316a86af358ab773193dd57a4f" - integrity sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-3.2.0.tgz#1a4affa9a1ce5ef43f4f04de750772f834a156fc" + integrity sha512-q7+F4DC6MAKkszF3ZQEuZ3dDH25wXPxFA0maTLk3TOTAYPLDgwqCeCKIvOd8xJhYYYl+EXusYRCyKIJliT/olg== dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" + schema-utils "^4" "string-width-cjs@npm:string-width@^4.2.0": version "4.2.3" @@ -5897,6 +5822,15 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" +string-width@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-7.2.0.tgz#b5bb8e2165ce275d4d43476dd2700ad9091db6dc" + integrity sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ== + dependencies: + emoji-regex "^10.3.0" + get-east-asian-width "^1.0.0" + strip-ansi "^7.1.0" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -5932,10 +5866,10 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" - integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== +strip-ansi@^7.0.1, strip-ansi@^7.1.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba" + integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA== dependencies: ansi-regex "^6.0.1" @@ -5944,10 +5878,10 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== -strip-final-newline@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" - integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== +strip-final-newline@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-4.0.0.tgz#35a369ec2ac43df356e3edd5dcebb6429aa1fa5c" + integrity sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw== strip-json-comments@3.1.1: version "3.1.1" @@ -5992,10 +5926,10 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-hyperlinks@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" - integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== +supports-hyperlinks@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-3.2.0.tgz#b8e485b179681dea496a1e7abdf8985bd3145461" + integrity sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -6021,15 +5955,15 @@ table@^6.9.0: string-width "^4.2.3" strip-ansi "^6.0.1" -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +tapable@^2.2.0, tapable@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6" + integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg== tar-fs@^1.8.1: - version "1.16.5" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.5.tgz#716a323609c11182d1d3d7b5bf277d15dc128665" - integrity sha512-1ergVCCysmwHQNrOS+Pjm4DQ4nrGp43+Xnu4MRGjCnQu/m3hEgLNS78d5z+B8OJ1hN5EejJdCSFZE1oM6AQXAQ== + version "1.16.6" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.6.tgz#b9be1854fe2c88af488a2edcc570be965e9750bd" + integrity sha512-JkOgFt3FxM/2v2CNpAVHqMW2QASjc/Hxo7IGfNd3MHaDYSW/sBFiS7YVmmhmr8x6vwN1VFQDQGdT2MWpmIuVKA== dependencies: chownr "^1.0.1" mkdirp "^0.5.1" @@ -6097,32 +6031,32 @@ targz@^1.0.1: dependencies: tar-fs "^1.8.1" -terminal-link@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== +terminal-link@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-4.0.0.tgz#5f3e50329420fad97d07d624f7df1851d82963f1" + integrity sha512-lk+vH+MccxNqgVqSnkMVKx4VLJfnLjDBGzH16JVZjKE2DoxP57s6/vt6JmXV5I3jBcfGrxNrYtC+mPtU7WJztA== dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" + ansi-escapes "^7.0.0" + supports-hyperlinks "^3.2.0" -terser-webpack-plugin@^5.3.10: - version "5.3.10" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" - integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== +terser-webpack-plugin@^5.3.11: + version "5.3.14" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz#9031d48e57ab27567f02ace85c7d690db66c3e06" + integrity sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw== dependencies: - "@jridgewell/trace-mapping" "^0.3.20" + "@jridgewell/trace-mapping" "^0.3.25" jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.26.0" + schema-utils "^4.3.0" + serialize-javascript "^6.0.2" + terser "^5.31.1" -terser@^5.26.0: - version "5.27.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.27.0.tgz#70108689d9ab25fef61c4e93e808e9fd092bf20c" - integrity sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A== +terser@^5.31.1: + version "5.44.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.44.0.tgz#ebefb8e5b8579d93111bfdfc39d2cf63879f4a82" + integrity sha512-nIVck8DK+GM/0Frwd+nIhZ84pR/BX7rmXMfYwyg+Sri5oGVE99/E3KvXqpC2xHFxyqXyGHTKBSioxxplrO4I4w== dependencies: "@jridgewell/source-map" "^0.3.3" - acorn "^8.8.2" + acorn "^8.15.0" commander "^2.20.0" source-map-support "~0.5.20" @@ -6154,25 +6088,20 @@ textextensions@^6.11.0: dependencies: editions "^6.21.0" -tmp@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.4.tgz#c6db987a2ccc97f812f17137b36af2b6521b0d13" - integrity sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ== +tmp@^0.2.3, tmp@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" + integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow== to-buffer@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0" - integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ== + version "1.2.2" + resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133" + integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw== dependencies: isarray "^2.0.5" safe-buffer "^5.2.1" typed-array-buffer "^1.0.3" -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -6192,10 +6121,10 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" -ts-loader@^9.4.4: - version "9.5.1" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89" - integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg== +ts-loader@^9.5.2: + version "9.5.4" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.4.tgz#44b571165c10fb5a90744aa5b7e119233c4f4585" + integrity sha512-nCz0rEwunlTZiy6rXFByQU1kVVpCIgUpc/psFiKVrUwrizdnIbRFu8w7bxhUF0X613DYwT4XzrZHpVyMe758hQ== dependencies: chalk "^4.1.0" enhanced-resolve "^5.0.0" @@ -6203,12 +6132,7 @@ ts-loader@^9.4.4: semver "^7.3.4" source-map "^0.7.4" -tslib@^2.2.0, tslib@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" - integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== - -tslib@^2.4.0: +tslib@^2.2.0, tslib@^2.4.0, tslib@^2.6.2, tslib@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== @@ -6225,22 +6149,12 @@ tunnel@0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -type-detect@^4.0.0, type-detect@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.21.3: - version "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== - -type-fest@^3.8.0: - version "3.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.13.1.tgz#bb744c1f0678bea7543a2d1ec24e83e68e8c8706" - integrity sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g== +type-detect@^4.0.0, type-detect@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c" + integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw== -type-fest@^4.2.0, type-fest@^4.26.1, type-fest@^4.41.0: +type-fest@^4.26.1, type-fest@^4.39.1, type-fest@^4.41.0, type-fest@^4.6.0: version "4.41.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-4.41.0.tgz#6ae1c8e5731273c2bf1f58ad39cbae2c91a46c58" integrity sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA== @@ -6269,9 +6183,9 @@ typescript@^4.7.4: integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== typescript@^5.2.2: - version "5.3.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" - integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + version "5.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" + integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== uc.micro@^2.0.0, uc.micro@^2.1.0: version "2.1.0" @@ -6283,20 +6197,20 @@ underscore@^1.12.1: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.7.tgz#970e33963af9a7dda228f17ebe8399e5fbe63a10" integrity sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g== -undici-types@~5.26.4: - version "5.26.5" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" - integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== +undici-types@~6.21.0: + version "6.21.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb" + integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ== -undici-types@~6.11.1: - version "6.11.1" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197" - integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ== +undici-types@~7.16.0: + version "7.16.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46" + integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw== -undici@^7.10.0: - version "7.11.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-7.11.0.tgz#8e13a54f62afa756666c0590c38b3866e286d0b3" - integrity sha512-heTSIac3iLhsmZhUCjyS3JQEkZELateufzZuBaVM5RHXdSBMb1LPMQf5x+FH7qjsZYDP0ttAc3nnVpUB+wYbOg== +undici@^7.12.0: + version "7.16.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-7.16.0.tgz#cb2a1e957726d458b536e3f076bf51f066901c1a" + integrity sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g== unicorn-magic@^0.1.0: version "0.1.0" @@ -6329,15 +6243,15 @@ unzipper@^0.12.3: graceful-fs "^4.2.2" node-int64 "^0.4.0" -update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== +update-browserslist-db@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz#7802aa2ae91477f255b86e0e46dbc787a206ad4a" + integrity sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.1" -uri-js@^4.2.2, uri-js@^4.4.1: +uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== @@ -6397,10 +6311,10 @@ validate-npm-package-license@^3.0.4: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -version-range@^4.13.0: - version "4.14.0" - resolved "https://registry.yarnpkg.com/version-range/-/version-range-4.14.0.tgz#91c12e4665756a9101d1af43faeda399abe0edec" - integrity sha512-gjb0ARm9qlcBAonU4zPwkl9ecKkas+tC2CGwFfptTCWWIVTWY1YUbT2zZKsOAF1jR/tNxxyLwwG0cb42XlYcTg== +version-range@^4.15.0: + version "4.15.0" + resolved "https://registry.yarnpkg.com/version-range/-/version-range-4.15.0.tgz#89df1e921b14d37515aab5e42ed4ac0515cab2c1" + integrity sha512-Ck0EJbAGxHwprkzFO966t4/5QkRuzh+/I1RxhLgUKKwEn+Cd8NwM60mE3AqBZg5gYODoXW0EFsQvbZjRlvdqbg== vite@^5.4.21: version "5.4.21" @@ -6414,25 +6328,25 @@ vite@^5.4.21: fsevents "~2.3.3" vscode-extension-tester@^8.17.0: - version "8.17.0" - resolved "https://registry.yarnpkg.com/vscode-extension-tester/-/vscode-extension-tester-8.17.0.tgz#d57aae77fe19326836955553ab556d284ddb62e0" - integrity sha512-B97Aas11bEcM0dcXCn/D+hg58Xwugf0nSu464gvfq5uXYUCUVWNPM7r971DwXxuWd+mcREcuW6/bz07Mod6zBA== + version "8.19.0" + resolved "https://registry.yarnpkg.com/vscode-extension-tester/-/vscode-extension-tester-8.19.0.tgz#9dcd6fdbc2e16044e12ec3e35d53bc698688cf21" + integrity sha512-CsMcFEnqim84rYnqdwdTT+cNB7cU8TJVZtt7GJakeQw9/UZy1ico8yTgNS1zqJ1ic5f/3RM4kwMuFut1jUlDYQ== dependencies: - "@redhat-developer/locators" "^1.15.0" - "@redhat-developer/page-objects" "^1.15.0" + "@redhat-developer/locators" "^1.17.0" + "@redhat-developer/page-objects" "^1.17.0" "@types/selenium-webdriver" "^4.1.28" - "@vscode/vsce" "^3.6.0" + "@vscode/vsce" "^3.6.2" c8 "^10.1.3" - commander "^14.0.0" + commander "^14.0.1" compare-versions "^6.1.1" - find-up "7.0.0" - fs-extra "^11.3.0" + find-up "8.0.0" + fs-extra "^11.3.2" glob "^11.0.3" - got "^14.4.7" + got "^14.5.0" hpagent "^1.2.0" js-yaml "^4.1.0" sanitize-filename "^1.6.3" - selenium-webdriver "^4.34.0" + selenium-webdriver "^4.35.0" targz "^1.0.1" unzipper "^0.12.3" @@ -6475,17 +6389,17 @@ vscode-uri@^1.0.6: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== -vue-demi@>=0.14.5: - version "0.14.6" - resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92" - integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w== +vue-demi@^0.14.10: + version "0.14.10" + resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.10.tgz#afc78de3d6f9e11bf78c55e8510ee12814522f04" + integrity sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg== vue-hot-reload-api@^2.3.2: version "2.3.4" resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-loader@^17.2.2: +vue-loader@^17.4.2: version "17.4.2" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-17.4.2.tgz#f87f0d8adfcbbe8623de9eba1979d41ba223c6da" integrity sha512-yTKOA4R/VN4jqjw4y5HrynFL8AK0Z3/Jt7eOJXEitsm0GMRHDBjCfCiuTiLP7OESvsZYo2pATCWhDqxC5ZrM6w== @@ -6495,11 +6409,11 @@ vue-loader@^17.2.2: watchpack "^2.4.0" vue-router@^4.2.4: - version "4.2.5" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.2.5.tgz#b9e3e08f1bd9ea363fdd173032620bc50cf0e98a" - integrity sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw== + version "4.6.3" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.6.3.tgz#52a40a231b910806438a8203c065a411fd3f1faa" + integrity sha512-ARBedLm9YlbvQomnmq91Os7ck6efydTSpRP3nuOKCvgJOHNrhRoJDSKtee8kcL1Vf7nz6U+PMBL+hTvR3bTVQg== dependencies: - "@vue/devtools-api" "^6.5.0" + "@vue/devtools-api" "^6.6.4" vue-style-loader@^4.1.3: version "4.1.3" @@ -6510,20 +6424,20 @@ vue-style-loader@^4.1.3: loader-utils "^1.0.2" vue@^3.3.4: - version "3.4.15" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.15.tgz#91f979844ffca9239dff622ba4c79c5d5524b88c" - integrity sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ== + version "3.5.22" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.5.22.tgz#2b8ddb94ee4b640ef12fe7f6efe1cf16f3b582e7" + integrity sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ== dependencies: - "@vue/compiler-dom" "3.4.15" - "@vue/compiler-sfc" "3.4.15" - "@vue/runtime-dom" "3.4.15" - "@vue/server-renderer" "3.4.15" - "@vue/shared" "3.4.15" + "@vue/compiler-dom" "3.5.22" + "@vue/compiler-sfc" "3.5.22" + "@vue/runtime-dom" "3.5.22" + "@vue/server-renderer" "3.5.22" + "@vue/shared" "3.5.22" -watchpack@^2.4.0, watchpack@^2.4.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" - integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== +watchpack@^2.4.0, watchpack@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.4.tgz#473bda72f0850453da6425081ea46fc0d7602947" + integrity sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -6560,25 +6474,27 @@ webpack-merge@^5.7.3: flat "^5.0.2" wildcard "^2.0.0" -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== +webpack-sources@^3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723" + integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg== webpack@5: - version "5.94.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" - integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== - dependencies: - "@types/estree" "^1.0.5" - "@webassemblyjs/ast" "^1.12.1" - "@webassemblyjs/wasm-edit" "^1.12.1" - "@webassemblyjs/wasm-parser" "^1.12.1" - acorn "^8.7.1" - acorn-import-attributes "^1.9.5" - browserslist "^4.21.10" + version "5.102.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.102.1.tgz#1003a3024741a96ba99c37431938bf61aad3d988" + integrity sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ== + dependencies: + "@types/eslint-scope" "^3.7.7" + "@types/estree" "^1.0.8" + "@types/json-schema" "^7.0.15" + "@webassemblyjs/ast" "^1.14.1" + "@webassemblyjs/wasm-edit" "^1.14.1" + "@webassemblyjs/wasm-parser" "^1.14.1" + acorn "^8.15.0" + acorn-import-phases "^1.0.3" + browserslist "^4.26.3" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.1" + enhanced-resolve "^5.17.3" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" @@ -6588,11 +6504,11 @@ webpack@5: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.2.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.3.10" - watchpack "^2.4.1" - webpack-sources "^3.2.3" + schema-utils "^4.3.3" + tapable "^2.3.0" + terser-webpack-plugin "^5.3.11" + watchpack "^2.4.4" + webpack-sources "^3.3.3" whatwg-encoding@^3.1.1: version "3.1.1" @@ -6606,18 +6522,7 @@ whatwg-mimetype@^4.0.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a" integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg== -which-typed-array@^1.1.11, which-typed-array@^1.1.2: - version "1.1.13" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" - integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.4" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - -which-typed-array@^1.1.16: +which-typed-array@^1.1.16, which-typed-array@^1.1.2: version "1.1.19" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956" integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw== @@ -6696,11 +6601,18 @@ ws@^7.5.10: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9" integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ== -ws@^8.18.2: +ws@^8.18.3: version "8.18.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== +wsl-utils@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/wsl-utils/-/wsl-utils-0.1.0.tgz#8783d4df671d4d50365be2ee4c71917a0557baab" + integrity sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw== + dependencies: + is-wsl "^3.1.0" + xml2js@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7" @@ -6819,6 +6731,11 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418" integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg== +yoctocolors@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/yoctocolors/-/yoctocolors-2.1.2.tgz#d795f54d173494e7d8db93150cec0ed7f678c83a" + integrity sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug== + zip-stream@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.1.tgz#1337fe974dbaffd2fa9a1ba09662a66932bd7135"