diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index db9815b08..faa04a58b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,7 +1,3 @@ # These are supported funding model platforms -open_collective: setup-php -tidelift: "npm/setup-php" -community_bridge: setup-php -patreon: shivammathur -custom: https://www.paypal.me/shivammathur +github: shivammathur diff --git a/.github/SECURITY.md b/.github/SECURITY.md index a32af7ed6..da1607f22 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -7,7 +7,7 @@ The following versions of this project are supported for security updates. | Version | Supported | | ------- | ------------------ | | 1.11.x | :white_check_mark: | -| 2.11.x | :white_check_mark: | +| 2.14.x | :white_check_mark: | ## Supported PHP Versions @@ -18,6 +18,7 @@ This security policy only applies to the latest patches of the following PHP ver | 7.3 | :white_check_mark: | | 7.4 | :white_check_mark: | | 8.0 | :white_check_mark: | +| 8.1 | :white_check_mark: | ## Reporting a Vulnerability diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d43ebb310..d46026adf 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-20.04, ubuntu-18.04, windows-2019, macos-10.15] - php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] + php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] steps: - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -61,7 +61,7 @@ jobs: git config --local user.name "${{ github.repository_owner }}" for os in ubuntu-20.04 ubuntu-18.04 windows-2019 macos-10.15 macos-11; do echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md - for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do + for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2; do if [ "$os" = "macos-11" ]; then cat lists/php"$version"-macos-10.15.md >> Php-extensions-loaded-on-"$os".md else diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index a053961ab..0d1f8d3d1 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-20.04, ubuntu-18.04, windows-latest, macos-latest] - php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] + php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] env: extensions: xml, opcache, xdebug, pcov key: cache-v3 diff --git a/README.md b/README.md index 869111a34..7459a926d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ GitHub Actions status Codecov Code Coverage LICENSE - PHP Versions Supported + PHP Versions Supported

setup-php reddit @@ -97,8 +97,8 @@ Both `GitHub-hosted` and `self-hosted` runners are suppported by `setup-php` on On all supported OS/Platforms the following PHP versions are supported as per the runner. -- PHP 5.3 to PHP 8.1 on GitHub-hosted runners. -- PHP 5.6 to PHP 8.1 on self-hosted runners. +- PHP 5.3 to PHP 8.2 on GitHub-hosted runners. +- PHP 5.6 to PHP 8.2 on self-hosted runners. |PHP Version|Stability|Release Support|Runner Support| |--- |--- |--- |--- | @@ -113,10 +113,11 @@ On all supported OS/Platforms the following PHP versions are supported as per th |`7.4`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`| |`8.0`|`Stable`|`Active`|`GitHub-hosted`, `self-hosted`| |`8.1`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`| +|`8.2`|`Nightly`|`In development`|`GitHub-hosted`, `self-hosted`| **Notes:** -- Specifying `8.1` in `php-version` input installs a nightly build of `PHP 8.1.0-dev`. See [nightly build setup](#nightly-build-setup) for more information. -- To use JIT on `PHP 8.0` and `PHP 8.1` refer to the [JIT configuration](#jit-configuration) section. +- Specifying `8.1` and `8.2` in `php-version` input installs a nightly build of `PHP 8.1.0-dev` and `PHP 8.2.0-dev` respectively. See [nightly build setup](#nightly-build-setup) for more information. +- To use JIT on `PHP 8.0` and above, refer to the [JIT configuration](#jit-configuration) section. ## :heavy_plus_sign: PHP Extension Support @@ -160,16 +161,28 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` extensions: xdebug-beta ``` -- Shared extensions can be removed by prefixing them with a `:`. +- Shared extensions can be disabled by prefixing them with a `:`. All extensions depending on the specified extension will also be disabled. ```yaml -- name: Setup PHP and remove shared extension +- name: Setup PHP and disable opcache uses: shivammathur/setup-php@v2 with: php-version: '8.0' extensions: :opcache ``` +- All shared extensions can be disabled by specifying `none`. When `none` is specified along with other extensions, it is hoisted to the start of the input. So, all the shared extensions will be disabled first, then rest of the extensions in the input will be processed. + +**Note:** This disables all core and third-party shared extensions and thus, can break some tools which need them. So, make sure you add the required extensions after `none` in the `extensions` input. + +```yaml +- name: Setup PHP without any shared extensions except mbstring + uses: shivammathur/setup-php@v2 + with: + php-version: '8.0' + extensions: none, mbstring +``` + - Extension `intl` can be set up with specific `ICU` version for `PHP 5.6` and above in `Ubuntu` workflows by suffixing `intl` with the `ICU` version. `ICU 50.2` and newer versions are supported. Refer to [`ICU builds`](https://github.com/shivammathur/icu-intl#icu4c-builds) for the specific versions supported. ```yaml @@ -187,7 +200,7 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string` - `geos` on `Ubuntu` and `macOS`. - `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3` and `phalcon4` on all supported OS. -- By default, extensions which cannot be added or removed gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. +- By default, extensions which cannot be added or disabled gracefully leave an error message in the logs, the action is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`. ```yaml - name: Setup PHP with fail-fast @@ -341,12 +354,12 @@ Runs on PHP 7.1 and newer PHP versions. ### Disable Coverage -Specify `coverage: none` to remove both `Xdebug` and `PCOV`. +Specify `coverage: none` to disable both `Xdebug` and `PCOV`. Disable coverage for these reasons: - You are not generating coverage reports while testing. -- It will remove `Xdebug`, which will have a positive impact on PHP performance. +- It will disable `Xdebug`, which will have a positive impact on PHP performance. - You are using `phpdbg` for running your tests. - You are profiling your code using `blackfire`. - You are using PHP in JIT mode. Please refer to [JIT configuration](#jit-configuration) section for more details. @@ -370,14 +383,16 @@ Disable coverage for these reasons: - Specify the PHP version you want to set up. - Accepts a `string`. For example `'8.0'`. - Accepts `latest` to set up the latest stable PHP version. +- Accepts `nightly` to set up a nightly build from the master branch of PHP. - Accepts the format `d.x`, where `d` is the major version. For example `5.x`, `7.x` and `8.x`. - See [PHP support](#tada-php-support) for supported PHP versions. #### `extensions` (optional) -- Specify the extensions you want to add or remove. +- Specify the extensions you want to add or disable. - Accepts a `string` in csv-format. For example `mbstring, :opcache`. -- Non-default extensions prefixed with `:` are removed. +- Accepts `none` to disable all shared extensions. +- Shared extensions prefixed with `:` are disabled. - See [PHP extension support](#heavy_plus_sign-php-extension-support) for more info. #### `ini-values` (optional) @@ -388,7 +403,7 @@ Disable coverage for these reasons: #### `coverage` (optional) -- Specify the code coverage driver you want to set up. +- Specify the code-coverage driver you want to set up. - Accepts `xdebug`, `pcov` or `none`. - See [coverage support](#signal_strength-coverage-support) for more info. @@ -490,7 +505,7 @@ jobs: ### Nightly Build Setup -> Setup a nightly build of `PHP 8.1`. +> Setup a nightly build of `PHP 8.1` or `PHP 8.2`. - This version is currently in development. - Some user space extensions might not support this version currently. @@ -651,10 +666,10 @@ act -P ubuntu-18.04=shivammathur/node:1804 ### JIT Configuration -> Enable Just-in-time(JIT) on PHP 8.0 and PHP 8.1. +> Enable Just-in-time(JIT) on PHP 8.0 and above. - To enable JIT, enable `opcache` in cli mode by setting `opcache.enable_cli=1`. -- JIT conflicts with `Xdebug`, `PCOV`, and other extensions which override `zend_execute_ex` function, so set `coverage: none` and remove any such extension if added. +- JIT conflicts with `Xdebug`, `PCOV`, and other extensions which override `zend_execute_ex` function, so set `coverage: none` and disable any such extension if added. - By default, `opcache.jit=1235` and `opcache.jit_buffer_size=256M` are set which can be changed using `ini-values` input. - For detailed information about JIT related directives refer to the [`official PHP documentation`](https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit "opcache.jit documentation"). @@ -871,31 +886,24 @@ Examples of using `setup-php` with various PHP Frameworks and Packages. ## :sparkling_heart: Support This Project -- This project is provided as Free and Open-Source software. We need funds to maintain and do future improvements. Please sponsor setup-php using the below options: - - [Open Collective](https://opencollective.com/setup-php "setup-php Open Collective") - - [Paypal](https://www.paypal.me/shivammathur "Shivam Mathur PayPal") - - [Patreon](https://www.patreon.com/shivammathur "Shivam Mathur Patreon") +- This project is provided as Free and Open-Source software. We need funds to maintain and do future improvements. Please sponsor setup-php using [GitHub sponsors](https://github.com/sponsors/shivammathur). - Please [reach out](mailto:contact@setup-php.com) if you have any questions about sponsoring setup-php. - Please star the project and share it. If you blog, please share your experience of using this action. -*`setup-php` is generously supported by* +### Corporate Sponsors -

- - JetBrains - -           - - Blackfire +

+ + Corporate sponsors of setup-php and related projects -           - - Mac Stadium +

+ +### Individual Sponsors + +

+ + Individual sponsors of setup-php and related projects -           - - Tidelift -

## :package: Dependencies diff --git a/__tests__/config.test.ts b/__tests__/config.test.ts index f17067e96..785d63f60 100644 --- a/__tests__/config.test.ts +++ b/__tests__/config.test.ts @@ -1,52 +1,21 @@ import * as config from '../src/config'; describe('Config tests', () => { - it('checking addINIValuesOnWindows', async () => { - let win32: string = await config.addINIValues( - 'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', - 'win32' - ); - expect(win32).toContain( - 'Add-Content "$php_dir\\php.ini" "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"' - ); - - win32 = await config.addINIValues( - 'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', - 'openbsd' - ); - expect(win32).toContain('Platform openbsd is not supported'); - }); - - it('checking addINIValuesOnLinux', async () => { - let linux: string = await config.addINIValues( - 'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', - 'linux', - true - ); - expect(linux).toContain( - 'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"' - ); - - linux = await config.addINIValues( - 'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', - 'openbsd' - ); - expect(linux).toContain('Platform openbsd is not supported'); - }); - - it('checking addINIValuesOnDarwin', async () => { - let darwin: string = await config.addINIValues( - 'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', - 'darwin' - ); - expect(darwin).toContain( - 'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" | sudo tee -a "${pecl_file:-${ini_file[@]}}"' - ); - - darwin = await config.addINIValues( - 'post_max_size=256M, short_open_tag=On, date.timezone=Asia/Kolkata', - 'openbsd' - ); - expect(darwin).toContain('Platform openbsd is not supported'); - }); + it.each` + ini_values | os_version | output + ${'a=b, c=d'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=b\nc=d"'} + ${'a=b, c=d'} | ${'linux'} | ${'echo "a=b\nc=d" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'} + ${'a=b, c=d'} | ${'darwin'} | ${'echo "a=b\nc=d" | sudo tee -a "${pecl_file:-${ini_file[@]}}"'} + ${'a=b & ~c'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=\'b & ~c\'"'} + ${'a="~(b)"'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=\'~(b)\'"'} + ${'a="b, c"'} | ${'win32'} | ${'Add-Content "$php_dir\\php.ini" "a=b, c"'} + ${'a=b, c=d'} | ${'openbsd'} | ${'Platform openbsd is not supported'} + `( + 'checking addINIValues on $os_version', + async ({ini_values, os_version, output}) => { + expect(await config.addINIValues(ini_values, os_version)).toContain( + output + ); + } + ); }); diff --git a/__tests__/coverage.test.ts b/__tests__/coverage.test.ts index 9b8d6b840..91663db7b 100644 --- a/__tests__/coverage.test.ts +++ b/__tests__/coverage.test.ts @@ -1,110 +1,39 @@ import * as coverage from '../src/coverage'; describe('Config tests', () => { - it('checking addCoverage with PCOV on windows', async () => { - let win32: string = await coverage.addCoverage('PCOV', '7.4', 'win32'); - expect(win32).toContain('Add-Extension pcov'); - expect(win32).toContain('Remove-Extension xdebug'); - - win32 = await coverage.addCoverage('pcov', '7.0', 'win32'); - expect(win32).toContain('PHP 7.1 or newer is required'); - - win32 = await coverage.addCoverage('pcov', '5.6', 'win32'); - expect(win32).toContain('PHP 7.1 or newer is required'); - }); - - it('checking addCoverage with PCOV on linux', async () => { - const linux: string = await coverage.addCoverage('pcov', '7.4', 'linux'); - expect(linux).toContain('add_extension pcov'); - expect(linux).toContain('remove_extension xdebug'); - }); - - it('checking addCoverage with PCOV on darwin', async () => { - const darwin: string = await coverage.addCoverage('pcov', '7.4', 'darwin'); - expect(darwin).toContain('add_brew_extension pcov'); - expect(darwin).toContain('remove_extension xdebug'); - }); - - it('checking addCoverage with Xdebug on windows', async () => { - const win32: string = await coverage.addCoverage('xdebug', '7.4', 'win32'); - expect(win32).toContain('Add-Extension xdebug'); - }); - - it('checking addCoverage with Xdebug3 on windows', async () => { - const win32: string = await coverage.addCoverage('xdebug3', '7.4', 'win32'); - expect(win32).toContain('Add-Extension xdebug'); - }); - - it('checking addCoverage with Xdebug2 on windows', async () => { - const win32: string = await coverage.addCoverage('xdebug2', '7.4', 'win32'); - expect(win32).toContain('Add-Extension xdebug stable 2.9.8'); - }); - - it('checking addCoverage with Xdebug on linux', async () => { - const linux: string = await coverage.addCoverage('xdebug', '8.0', 'linux'); - expect(linux).toContain('add_extension xdebug'); - }); - - it('checking addCoverage with Xdebug3 on linux', async () => { - const linux: string = await coverage.addCoverage('xdebug3', '8.0', 'linux'); - expect(linux).toContain('add_extension xdebug'); - }); - - it('checking addCoverage with Xdebug2 on linux', async () => { - const linux: string = await coverage.addCoverage('xdebug2', '7.4', 'linux'); - expect(linux).toContain('add_pecl_extension xdebug 2.9.8 zend_extension'); - }); - - it('checking addCoverage with Xdebug on darwin', async () => { - const darwin: string = await coverage.addCoverage( - 'xdebug', - '7.4', - 'darwin' - ); - expect(darwin).toContain('add_brew_extension xdebug'); - }); - - it('checking addCoverage with Xdebug3 on darwin', async () => { - const darwin: string = await coverage.addCoverage( - 'xdebug3', - '7.4', - 'darwin' - ); - expect(darwin).toContain('add_brew_extension xdebug'); - }); - - it('checking addCoverage with Xdebug2 on darwin', async () => { - const darwin: string = await coverage.addCoverage( - 'xdebug2', - '7.4', - 'darwin' - ); - expect(darwin).toContain('add_brew_extension xdebug2'); - }); - - it('checking disableCoverage windows', async () => { - const win32 = await coverage.addCoverage('none', '7.4', 'win32'); - expect(win32).toContain('Remove-Extension xdebug'); - expect(win32).toContain('Remove-Extension pcov'); - }); - - it('checking disableCoverage on linux', async () => { - const linux: string = await coverage.addCoverage('none', '7.4', 'linux'); - expect(linux).toContain('remove_extension xdebug'); - expect(linux).toContain('remove_extension pcov'); - }); - - it('checking disableCoverage on darwin', async () => { - const darwin: string = await coverage.addCoverage('none', '7.4', 'darwin'); - expect(darwin).toContain('remove_extension xdebug'); - expect(darwin).toContain('remove_extension pcov'); - }); - - it('checking no or invalid coverage driver', async () => { - let nocov: string = await coverage.addCoverage('nocov', '7.x', 'any'); - expect(nocov).toEqual(''); - - nocov = await coverage.addCoverage('', '7.x', 'any'); - expect(nocov).toEqual(''); - }); + it.each` + driver | php | os | output + ${'PCOV'} | ${'7.4'} | ${'win32'} | ${'Add-Extension pcov,Disable-Extension xdebug false'} + ${'pcov'} | ${'7.0'} | ${'win32'} | ${'PHP 7.1 or newer is required'} + ${'pcov'} | ${'5.6'} | ${'win32'} | ${'PHP 7.1 or newer is required'} + ${'pcov'} | ${'7.4'} | ${'win32'} | ${'Add-Extension pcov,Disable-Extension xdebug false'} + ${'pcov'} | ${'7.4'} | ${'linux'} | ${'add_extension pcov,disable_extension xdebug false'} + ${'pcov'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension pcov,disable_extension xdebug false'} + ${'xdebug'} | ${'7.4'} | ${'win32'} | ${'Add-Extension xdebug'} + ${'xdebug3'} | ${'7.4'} | ${'win32'} | ${'Add-Extension xdebug'} + ${'xdebug2'} | ${'7.4'} | ${'win32'} | ${'Add-Extension xdebug stable 2.9.8'} + ${'xdebug'} | ${'8.0'} | ${'linux'} | ${'add_extension xdebug'} + ${'xdebug3'} | ${'8.0'} | ${'linux'} | ${'add_extension xdebug'} + ${'xdebug2'} | ${'7.4'} | ${'linux'} | ${'add_pecl_extension xdebug 2.9.8 zend_extension'} + ${'xdebug'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension xdebug'} + ${'xdebug3'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension xdebug'} + ${'xdebug2'} | ${'7.4'} | ${'darwin'} | ${'add_brew_extension xdebug2'} + ${'none'} | ${'7.4'} | ${'win32'} | ${'Disable-Extension xdebug false,Disable-Extension pcov false'} + ${'none'} | ${'7.4'} | ${'linux'} | ${'disable_extension xdebug false,disable_extension pcov false'} + ${'none'} | ${'7.4'} | ${'darwin'} | ${'disable_extension xdebug false,disable_extension pcov false'} + ${'nocov'} | ${'7.x'} | ${'any'} | ${''} + ${''} | ${'7.x'} | ${'any'} | ${''} + `( + 'checking addCoverage with $driver on $os', + async ({driver, php, os, output}) => { + const script: string = await coverage.addCoverage(driver, php, os); + if (output) { + output.split(',').forEach((command: string) => { + expect(script).toContain(command); + }); + } else { + expect(script).toEqual(output); + } + } + ); }); diff --git a/__tests__/extensions.test.ts b/__tests__/extensions.test.ts index 75ab8c58e..9a9f54653 100644 --- a/__tests__/extensions.test.ts +++ b/__tests__/extensions.test.ts @@ -3,14 +3,15 @@ import * as extensions from '../src/extensions'; describe('Extension tests', () => { it('checking addExtensionOnWindows', async () => { let win32: string = await extensions.addExtension( - 'Xdebug, pcov, sqlite, :intl, phalcon4, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1', + 'none, Xdebug, pcov, sqlite, :intl, phalcon4, pecl_http, ioncube, oci8, pdo_oci, ast-beta, grpc-1.2.3, inotify-1.2.3alpha2, sqlsrv-1.2.3preview1', '7.4', 'win32' ); + expect(win32).toContain('Disable-AllShared'); expect(win32).toContain('Add-Extension xdebug'); expect(win32).toContain('Add-Extension pcov'); expect(win32).toContain('Add-Extension sqlite3'); - expect(win32).toContain('Remove-Extension intl'); + expect(win32).toContain('Disable-Extension intl'); expect(win32).toContain('Add-Phalcon phalcon4'); expect(win32).toContain('Add-Http'); expect(win32).toContain('Add-Ioncube'); @@ -72,13 +73,14 @@ describe('Extension tests', () => { it('checking addExtensionOnLinux', async () => { let linux: string = await extensions.addExtension( - 'Xdebug, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3', + 'none, Xdebug, pcov, sqlite, :intl, ast, ast-beta, pdo_mysql, pdo-odbc, xdebug-alpha, grpc-1.2.3', '7.4', 'linux' ); + expect(linux).toContain('disable_all_shared'); expect(linux).toContain('add_extension xdebug'); expect(linux).toContain('add_extension sqlite3'); - expect(linux).toContain('remove_extension intl'); + expect(linux).toContain('disable_extension intl'); expect(linux).toContain('add_unstable_extension ast beta extension'); expect(linux).toContain('add_pdo_extension mysql'); expect(linux).toContain('add_pdo_extension odbc'); @@ -160,12 +162,14 @@ describe('Extension tests', () => { it('checking addExtensionOnDarwin', async () => { let darwin: string = await extensions.addExtension( - 'amqp, apcu, Xdebug, pcov, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, phalcon3, phalcon4, protobuf, psr, rdkafka, redis, swoole, yaml, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3', + 'none, amqp, apcu, expect, Xdebug, pcov, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, phalcon3, phalcon4, protobuf, psr, rdkafka, redis, ssh2, swoole, vips, yaml, sqlite, oci8, pdo_oci, :intl, ast-beta, grpc-1.2.3', '7.2', 'darwin' ); + expect(darwin).toContain('disable_all_shared'); expect(darwin).toContain('add_brew_extension amqp extension'); expect(darwin).toContain('add_brew_extension apcu extension'); + expect(darwin).toContain('add_brew_extension expect extension'); expect(darwin).toContain('add_brew_extension xdebug zend_extension'); expect(darwin).toContain('add_brew_extension pcov extension'); expect(darwin).toContain('add_brew_extension grpc extension'); @@ -182,10 +186,12 @@ describe('Extension tests', () => { expect(darwin).toContain('add_brew_extension psr extension'); expect(darwin).toContain('add_brew_extension rdkafka extension'); expect(darwin).toContain('add_brew_extension redis extension'); + expect(darwin).toContain('add_brew_extension ssh2 extension'); expect(darwin).toContain('add_brew_extension swoole extension'); + expect(darwin).toContain('add_brew_extension vips extension'); expect(darwin).toContain('add_brew_extension yaml extension'); expect(darwin).toContain('add_extension sqlite3'); - expect(darwin).toContain('remove_extension intl'); + expect(darwin).toContain('disable_extension intl'); expect(darwin).toContain('add_unstable_extension ast beta extension'); expect(darwin).toContain('add_pecl_extension grpc 1.2.3 extension'); diff --git a/__tests__/install.test.ts b/__tests__/install.test.ts index 649973820..6a6af0da9 100644 --- a/__tests__/install.test.ts +++ b/__tests__/install.test.ts @@ -17,25 +17,11 @@ jest.mock('../src/install', () => ({ const ini_values_csv: string = process.env['ini-values'] || ''; const coverage_driver: string = process.env['coverage'] || ''; let tools_csv: string = process.env['tools'] || ''; - const pecl: string = process.env['pecl'] || ''; - if (pecl == 'true') { - tools_csv = 'pecl, ' + tools_csv; - } - let script = 'initial script ' + filename + version + os_version; - if (tools_csv) { - script += 'add_tool'; - } - if (extension_csv) { - script += 'install extensions'; - } - if (coverage_driver) { - script += 'set coverage driver'; - } - if (ini_values_csv) { - script += 'edit php.ini'; - } - + script += tools_csv ? 'add_tool' : ''; + script += extension_csv ? 'install extensions' : ''; + script += coverage_driver ? 'set coverage driver' : ''; + script += ini_values_csv ? 'edit php.ini' : ''; return script; } ), diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts index 47374be0d..ecc589382 100644 --- a/__tests__/utils.test.ts +++ b/__tests__/utils.test.ts @@ -126,12 +126,9 @@ describe('Utils tests', () => { }); it('checking extensionArray', async () => { - expect(await utils.extensionArray('a, b, php_c, php-d')).toEqual([ - 'a', - 'b', - 'c', - 'd' - ]); + expect( + await utils.extensionArray('a, :b, php_c, none, php-d, Zend e, :Zend f') + ).toEqual(['none', 'a', ':b', 'c', 'd', 'e', ':f']); expect(await utils.extensionArray('')).toEqual([]); expect(await utils.extensionArray(' ')).toEqual([]); diff --git a/dist/index.js b/dist/index.js index 2d8ea9ee8..5a75e0a38 100644 --- a/dist/index.js +++ b/dist/index.js @@ -111,7 +111,8 @@ const config = __importStar(__nccwpck_require__(88)); async function addCoverageXdebug(extension, version, os_version, pipe) { let script = '\n'; script += - (await extensions.addExtension(':pcov', version, os_version, true)) + pipe; + (await extensions.addExtension(':pcov:false', version, os_version, true)) + + pipe; script += (await extensions.addExtension(extension, version, os_version, true)) + pipe; @@ -124,8 +125,7 @@ async function addCoveragePCOV(version, os_version, pipe) { switch (true) { default: script += - (await extensions.addExtension(':xdebug', version, os_version, true)) + - pipe; + (await extensions.addExtension(':xdebug:false', version, os_version, true)) + pipe; script += (await extensions.addExtension('pcov', version, os_version, true)) + pipe; @@ -143,10 +143,10 @@ exports.addCoveragePCOV = addCoveragePCOV; async function disableCoverage(version, os_version, pipe) { let script = '\n'; script += - (await extensions.addExtension(':pcov', version, os_version, true)) + pipe; - script += - (await extensions.addExtension(':xdebug', version, os_version, true)) + + (await extensions.addExtension(':pcov:false', version, os_version, true)) + pipe; + script += + (await extensions.addExtension(':xdebug:false', version, os_version, true)) + pipe; script += await utils.addLog('$tick', 'none', 'Disabled Xdebug and PCOV', os_version); return script; } @@ -210,7 +210,10 @@ async function addExtensionDarwin(extension_csv, version) { const ext_prefix = await utils.getExtensionPrefix(ext_name); switch (true) { case /^:/.test(ext_name): - remove_script += '\nremove_extension ' + ext_name.slice(1); + remove_script += '\ndisable_extension' + ext_name.replace(/:/g, ' '); + return; + case /^none$/.test(ext_name): + add_script += '\ndisable_all_shared'; return; case /.+-.+\/.+@.+/.test(extension): add_script += await utils.parseExtensionSource(extension, ext_prefix); @@ -229,10 +232,11 @@ async function addExtensionDarwin(extension_csv, version) { case /(5\.[3-6]|7\.0)pcov/.test(version_extension): add_script += await utils.getUnsupportedLog('pcov', version, 'darwin'); return; - case /(?=15.0.0" } }, "node_modules/@jest/fake-timers": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.6.tgz", - "integrity": "sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.1.1.tgz", + "integrity": "sha512-u8TJ5VlsVYTsGFatoyIae2l25pku4Bu15QCPTx2Gs5z+R//Ee3tHN85462Vc9yGVcdDvgADbqNkhOLxbEwPjMQ==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@sinonjs/fake-timers": "^7.0.2", "@types/node": "*", - "jest-message-util": "^27.0.6", - "jest-mock": "^27.0.6", - "jest-util": "^27.0.6" + "jest-message-util": "^27.1.1", + "jest-mock": "^27.1.1", + "jest-util": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/@jest/globals": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.6.tgz", - "integrity": "sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.1.1.tgz", + "integrity": "sha512-Q3JcTPmY+DAEHnr4MpnBV3mwy50EGrTC6oSDTNnW7FNGGacTJAfpWNk02D7xv422T1OzK2A2BKx+26xJOvHkyw==", "dev": true, "dependencies": { - "@jest/environment": "^27.0.6", - "@jest/types": "^27.0.6", - "expect": "^27.0.6" + "@jest/environment": "^27.1.1", + "@jest/types": "^27.1.1", + "expect": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/@jest/reporters": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.6.tgz", - "integrity": "sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.1.1.tgz", + "integrity": "sha512-cEERs62n1P4Pqox9HWyNOEkP57G95aK2mBjB6D8Ruz1Yc98fKH53b58rlVEnsY5nLmkLNZk65fxNi9C0Yds/8w==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", @@ -972,10 +973,10 @@ "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.0.2", - "jest-haste-map": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-util": "^27.0.6", - "jest-worker": "^27.0.6", + "jest-haste-map": "^27.1.1", + "jest-resolve": "^27.1.1", + "jest-util": "^27.1.1", + "jest-worker": "^27.1.1", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -1009,13 +1010,13 @@ } }, "node_modules/@jest/test-result": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.6.tgz", - "integrity": "sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.1.1.tgz", + "integrity": "sha512-8vy75A0Jtfz9DqXFUkjC5Co/wRla+D7qRFdShUY8SbPqBS3GBx3tpba7sGKFos8mQrdbe39n+c1zgVKtarfy6A==", "dev": true, "dependencies": { - "@jest/console": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/types": "^27.1.1", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, @@ -1024,36 +1025,36 @@ } }, "node_modules/@jest/test-sequencer": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz", - "integrity": "sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.1.1.tgz", + "integrity": "sha512-l8zD3EdeixvwmLNlJoMX3hhj8iIze95okj4sqmBzOq/zW8gZLElUveH4bpKEMuR+Nweazjlwc7L6g4C26M/y6Q==", "dev": true, "dependencies": { - "@jest/test-result": "^27.0.6", + "@jest/test-result": "^27.1.1", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.0.6", - "jest-runtime": "^27.0.6" + "jest-haste-map": "^27.1.1", + "jest-runtime": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/@jest/transform": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.6.tgz", - "integrity": "sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.1.1.tgz", + "integrity": "sha512-qM19Eu75U6Jc5zosXXVnq900Nl9JDpoGaZ4Mg6wZs7oqbu3heYSMOZS19DlwjlhWdfNRjF4UeAgkrCJCK3fEXg==", "dev": true, "dependencies": { "@babel/core": "^7.1.0", - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "babel-plugin-istanbul": "^6.0.0", "chalk": "^4.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.0.6", + "jest-haste-map": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-util": "^27.0.6", + "jest-util": "^27.1.1", "micromatch": "^4.0.4", "pirates": "^4.0.1", "slash": "^3.0.0", @@ -1065,9 +1066,9 @@ } }, "node_modules/@jest/types": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz", - "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz", + "integrity": "sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==", "dev": true, "dependencies": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -1232,10 +1233,16 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "node_modules/@types/node": { - "version": "16.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz", - "integrity": "sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==", + "version": "16.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz", + "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==", "dev": true }, "node_modules/@types/parse-json": { @@ -1272,13 +1279,13 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz", - "integrity": "sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz", + "integrity": "sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==", "dev": true, "dependencies": { - "@typescript-eslint/experimental-utils": "4.29.2", - "@typescript-eslint/scope-manager": "4.29.2", + "@typescript-eslint/experimental-utils": "4.31.0", + "@typescript-eslint/scope-manager": "4.31.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.1.0", @@ -1303,15 +1310,15 @@ } }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz", - "integrity": "sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz", + "integrity": "sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.29.2", - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/typescript-estree": "4.29.2", + "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/typescript-estree": "4.31.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -1327,14 +1334,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz", - "integrity": "sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz", + "integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "4.29.2", - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/typescript-estree": "4.29.2", + "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/typescript-estree": "4.31.0", "debug": "^4.3.1" }, "engines": { @@ -1354,13 +1361,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz", - "integrity": "sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz", + "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/visitor-keys": "4.29.2" + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0" }, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -1371,9 +1378,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz", - "integrity": "sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz", + "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==", "dev": true, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" @@ -1384,13 +1391,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz", - "integrity": "sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz", + "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/visitor-keys": "4.29.2", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -1411,12 +1418,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz", - "integrity": "sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz", + "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "4.29.2", + "@typescript-eslint/types": "4.31.0", "eslint-visitor-keys": "^2.0.0" }, "engines": { @@ -1428,9 +1435,9 @@ } }, "node_modules/@vercel/ncc": { - "version": "0.29.2", - "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.29.2.tgz", - "integrity": "sha512-eUxibZD92k+rY0oZJFZooGqdVpGkDrrHlUhj9UAWrtoyXCGmNOWC1Kcr2KPrZoHRSlWwHOcRnkn2nGT+aHY2KA==", + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.31.0.tgz", + "integrity": "sha512-vpioWEFk00Sk5CgJj39LFAjqXcM0PLcaSqaEDeZZUKfHEKYmHL5tOns7Xd21/o4SKzRi+XE0qhEv9wWwkfmNaA==", "dev": true, "bin": { "ncc": "dist/ncc/cli.js" @@ -1653,13 +1660,13 @@ "dev": true }, "node_modules/babel-jest": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.6.tgz", - "integrity": "sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.1.1.tgz", + "integrity": "sha512-JA+dzJl4n2RBvWQEnph6HJaTHrsIPiXGQYatt/D8nR4UpX9UG4GaDzykVVPQBbrdTebZREkRb6SOxyIXJRab6Q==", "dev": true, "dependencies": { - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.0.0", "babel-preset-jest": "^27.0.6", @@ -2493,9 +2500,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.24.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz", - "integrity": "sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ==", + "version": "2.24.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz", + "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==", "dev": true, "dependencies": { "array-includes": "^3.1.3", @@ -2512,7 +2519,7 @@ "pkg-up": "^2.0.0", "read-pkg-up": "^3.0.0", "resolve": "^1.20.0", - "tsconfig-paths": "^3.10.1" + "tsconfig-paths": "^3.11.0" }, "engines": { "node": ">=4" @@ -2570,9 +2577,9 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", - "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", "dev": true, "dependencies": { "prettier-linter-helpers": "^1.0.0" @@ -2581,8 +2588,8 @@ "node": ">=6.0.0" }, "peerDependencies": { - "eslint": ">=5.0.0", - "prettier": ">=1.13.0" + "eslint": ">=7.28.0", + "prettier": ">=2.0.0" }, "peerDependenciesMeta": { "eslint-config-prettier": { @@ -2783,16 +2790,16 @@ } }, "node_modules/expect": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz", - "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.1.1.tgz", + "integrity": "sha512-JQAzp0CJoFFHF1RnOtrMUNMdsfx/Tl0+FhRzVl8q0fa23N+JyWdPXwb3T5rkHCvyo9uttnK7lVdKCBl1b/9EDw==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "ansi-styles": "^5.0.0", "jest-get-type": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", "jest-regex-util": "^27.0.6" }, "engines": { @@ -3845,14 +3852,14 @@ } }, "node_modules/jest": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.6.tgz", - "integrity": "sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.1.1.tgz", + "integrity": "sha512-LFTEZOhoZNR/2DQM3OCaK5xC6c55c1OWhYh0njRsoHX0qd6x4nkcgenkSH0JKjsAGMTmmJAoL7/oqYHMfwhruA==", "dev": true, "dependencies": { - "@jest/core": "^27.0.6", + "@jest/core": "^27.1.1", "import-local": "^3.0.2", - "jest-cli": "^27.0.6" + "jest-cli": "^27.1.1" }, "bin": { "jest": "bin/jest.js" @@ -3870,12 +3877,12 @@ } }, "node_modules/jest-changed-files": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.6.tgz", - "integrity": "sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.1.1.tgz", + "integrity": "sha512-5TV9+fYlC2A6hu3qtoyGHprBwCAn0AuGA77bZdUgYvVlRMjHXo063VcWTEAyx6XAZ85DYHqp0+aHKbPlfRDRvA==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "execa": "^5.0.0", "throat": "^6.0.1" }, @@ -3884,27 +3891,27 @@ } }, "node_modules/jest-circus": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.6.tgz", - "integrity": "sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.1.1.tgz", + "integrity": "sha512-Xed1ApiMFu/yzqGMBToHr8sp2gkX/ARZf4nXoGrHJrXrTUdVIWiVYheayfcOaPdQvQEE/uyBLgW7I7YBLIrAXQ==", "dev": true, "dependencies": { - "@jest/environment": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/environment": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", "dedent": "^0.7.0", - "expect": "^27.0.6", + "expect": "^27.1.1", "is-generator-fn": "^2.0.0", - "jest-each": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "pretty-format": "^27.0.6", + "jest-each": "^27.1.1", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "pretty-format": "^27.1.1", "slash": "^3.0.0", "stack-utils": "^2.0.3", "throat": "^6.0.1" @@ -3914,21 +3921,21 @@ } }, "node_modules/jest-cli": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.6.tgz", - "integrity": "sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.1.1.tgz", + "integrity": "sha512-LCjfEYp9D3bcOeVUUpEol9Y1ijZYMWVqflSmtw/wX+6Fb7zP4IlO14/6s9v1pxsoM4Pn46+M2zABgKuQjyDpTw==", "dev": true, "dependencies": { - "@jest/core": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/core": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "import-local": "^3.0.2", - "jest-config": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-config": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "prompts": "^2.0.1", "yargs": "^16.0.3" }, @@ -3948,32 +3955,32 @@ } }, "node_modules/jest-config": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.6.tgz", - "integrity": "sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.1.1.tgz", + "integrity": "sha512-2iSd5zoJV4MsWPcLCGwUVUY/j6pZXm4Qd3rnbCtrd9EHNTg458iHw8PZztPQXfxKBKJxLfBk7tbZqYF8MGtxJA==", "dev": true, "dependencies": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^27.0.6", - "@jest/types": "^27.0.6", - "babel-jest": "^27.0.6", + "@jest/test-sequencer": "^27.1.1", + "@jest/types": "^27.1.1", + "babel-jest": "^27.1.1", "chalk": "^4.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", "graceful-fs": "^4.2.4", "is-ci": "^3.0.0", - "jest-circus": "^27.0.6", - "jest-environment-jsdom": "^27.0.6", - "jest-environment-node": "^27.0.6", + "jest-circus": "^27.1.1", + "jest-environment-jsdom": "^27.1.1", + "jest-environment-node": "^27.1.1", "jest-get-type": "^27.0.6", - "jest-jasmine2": "^27.0.6", + "jest-jasmine2": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-runner": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-resolve": "^27.1.1", + "jest-runner": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "micromatch": "^4.0.4", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -3988,15 +3995,15 @@ } }, "node_modules/jest-diff": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz", - "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.1.1.tgz", + "integrity": "sha512-m/6n5158rqEriTazqHtBpOa2B/gGgXJijX6nsEgZfbJ/3pxQcdpVXBe+FP39b1dxWHyLVVmuVXddmAwtqFO4Lg==", "dev": true, "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^27.0.6", "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -4015,33 +4022,33 @@ } }, "node_modules/jest-each": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.0.6.tgz", - "integrity": "sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.1.1.tgz", + "integrity": "sha512-r6hOsTLavUBb1xN0uDa89jdDeBmJ+K49fWpbyxeGRA2pLY46PlC4z551/cWNQzrj+IUa5/gSRsCIV/01HdNPug==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "jest-get-type": "^27.0.6", - "jest-util": "^27.0.6", - "pretty-format": "^27.0.6" + "jest-util": "^27.1.1", + "pretty-format": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/jest-environment-jsdom": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz", - "integrity": "sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.1.1.tgz", + "integrity": "sha512-6vOnoZ6IaExuw7FvnuJhA1qFYv1DDSnN0sQowzolNwxQp7bG1YhLxj2YU1sVXAYA3IR3MbH2mbnJUsLUWfyfzw==", "dev": true, "dependencies": { - "@jest/environment": "^27.0.6", - "@jest/fake-timers": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/environment": "^27.1.1", + "@jest/fake-timers": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", - "jest-mock": "^27.0.6", - "jest-util": "^27.0.6", + "jest-mock": "^27.1.1", + "jest-util": "^27.1.1", "jsdom": "^16.6.0" }, "engines": { @@ -4049,17 +4056,17 @@ } }, "node_modules/jest-environment-node": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.6.tgz", - "integrity": "sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.1.1.tgz", + "integrity": "sha512-OEGeZh0PwzngNIYWYgWrvTcLygopV8OJbC9HNb0j70VBKgEIsdZkYhwcFnaURX83OHACMqf1pa9Tv5Pw5jemrg==", "dev": true, "dependencies": { - "@jest/environment": "^27.0.6", - "@jest/fake-timers": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/environment": "^27.1.1", + "@jest/fake-timers": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", - "jest-mock": "^27.0.6", - "jest-util": "^27.0.6" + "jest-mock": "^27.1.1", + "jest-util": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -4075,12 +4082,12 @@ } }, "node_modules/jest-haste-map": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.6.tgz", - "integrity": "sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.1.1.tgz", + "integrity": "sha512-NGLYVAdh5C8Ezg5QBFzrNeYsfxptDBPlhvZNaicLiZX77F/rS27a9M6u9ripWAaaD54xnWdZNZpEkdjD5Eo5aQ==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/graceful-fs": "^4.1.2", "@types/node": "*", "anymatch": "^3.0.3", @@ -4088,8 +4095,8 @@ "graceful-fs": "^4.2.4", "jest-regex-util": "^27.0.6", "jest-serializer": "^27.0.6", - "jest-util": "^27.0.6", - "jest-worker": "^27.0.6", + "jest-util": "^27.1.1", + "jest-worker": "^27.1.1", "micromatch": "^4.0.4", "walker": "^1.0.7" }, @@ -4101,28 +4108,28 @@ } }, "node_modules/jest-jasmine2": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz", - "integrity": "sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.1.1.tgz", + "integrity": "sha512-0LAzUmcmvQwjIdJt0cXUVX4G5qjVXE8ELt6nbMNDzv2yAs2hYCCUtQq+Eje70GwAysWCGcS64QeYj5VPHYVxPg==", "dev": true, "dependencies": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^27.0.6", + "@jest/environment": "^27.1.1", "@jest/source-map": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "expect": "^27.0.6", + "expect": "^27.1.1", "is-generator-fn": "^2.0.0", - "jest-each": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "pretty-format": "^27.0.6", + "jest-each": "^27.1.1", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "pretty-format": "^27.1.1", "throat": "^6.0.1" }, "engines": { @@ -4130,46 +4137,46 @@ } }, "node_modules/jest-leak-detector": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz", - "integrity": "sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.1.1.tgz", + "integrity": "sha512-gwSgzmqShoeEsEVpgObymQPrM9P6557jt1EsFW5aCeJ46Cme0EdjYU7xr6llQZ5GpWDl56eOstUaPXiZOfiTKw==", "dev": true, "dependencies": { "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz", - "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.1.1.tgz", + "integrity": "sha512-Q1a10w9Y4sh0wegkdP6reQOa/Dtz7nAvDqBgrat1ItZAUvk4jzXAqyhXPu/ZuEtDaXaNKpdRPRQA8bvkOh2Eaw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^27.0.6", + "jest-diff": "^27.1.1", "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/jest-message-util": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz", - "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.1.1.tgz", + "integrity": "sha512-b697BOJV93+AVGvzLRtVZ0cTVRbd59OaWnbB2D75GRaIMc4I+Z9W0wHxbfjW01JWO+TqqW4yevT0aN7Fd0XWng==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "micromatch": "^4.0.4", - "pretty-format": "^27.0.6", + "pretty-format": "^27.1.1", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, @@ -4190,12 +4197,12 @@ } }, "node_modules/jest-mock": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.6.tgz", - "integrity": "sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.1.1.tgz", + "integrity": "sha512-SClsFKuYBf+6SSi8jtAYOuPw8DDMsTElUWEae3zq7vDhH01ayVSIHUSIa8UgbDOUalCFp6gNsaikN0rbxN4dbw==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/node": "*" }, "engines": { @@ -4229,18 +4236,19 @@ } }, "node_modules/jest-resolve": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.6.tgz", - "integrity": "sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.1.1.tgz", + "integrity": "sha512-M41YFmWhvDVstwe7XuV21zynOiBLJB5Sk0GrIsYYgTkjfEWNLVXDjAyq1W7PHseaYNOxIc0nOGq/r5iwcZNC1A==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "escalade": "^3.1.1", "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.1.1", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "resolve": "^1.20.0", "slash": "^3.0.0" }, @@ -4249,45 +4257,45 @@ } }, "node_modules/jest-resolve-dependencies": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz", - "integrity": "sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.1.1.tgz", + "integrity": "sha512-sYZR+uBjFDCo4VhYeazZf/T+ryYItvdLKu9vHatqkUqHGjDMrdEPOykiqC2iEpaCFTS+3iL/21CYiJuKdRbniw==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-snapshot": "^27.0.6" + "jest-snapshot": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/jest-runner": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.6.tgz", - "integrity": "sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.1.1.tgz", + "integrity": "sha512-lP3MBNQhg75/sQtVkC8dsAQZumvy3lHK/YIwYPfEyqGIX1qEcnYIRxP89q0ZgC5ngvi1vN2P5UFHszQxguWdng==", "dev": true, "dependencies": { - "@jest/console": "^27.0.6", - "@jest/environment": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/environment": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "emittery": "^0.8.1", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "jest-docblock": "^27.0.6", - "jest-environment-jsdom": "^27.0.6", - "jest-environment-node": "^27.0.6", - "jest-haste-map": "^27.0.6", - "jest-leak-detector": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-util": "^27.0.6", - "jest-worker": "^27.0.6", + "jest-environment-jsdom": "^27.1.1", + "jest-environment-node": "^27.1.1", + "jest-haste-map": "^27.1.1", + "jest-leak-detector": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-resolve": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-util": "^27.1.1", + "jest-worker": "^27.1.1", "source-map-support": "^0.5.6", "throat": "^6.0.1" }, @@ -4296,34 +4304,35 @@ } }, "node_modules/jest-runtime": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.6.tgz", - "integrity": "sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.1.1.tgz", + "integrity": "sha512-FEwy+tSzmsvuKaQpyYsUyk31KG5vMmA2r2BSTHgv0yNfcooQdm2Ke91LM9Ud8D3xz8CLDHJWAI24haMFTwrsPg==", "dev": true, "dependencies": { - "@jest/console": "^27.0.6", - "@jest/environment": "^27.0.6", - "@jest/fake-timers": "^27.0.6", - "@jest/globals": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/environment": "^27.1.1", + "@jest/fake-timers": "^27.1.1", + "@jest/globals": "^27.1.1", "@jest/source-map": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/yargs": "^16.0.0", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-mock": "^27.0.6", + "jest-haste-map": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-mock": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-resolve": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "slash": "^3.0.0", "strip-bom": "^4.0.0", "yargs": "^16.0.3" @@ -4346,9 +4355,9 @@ } }, "node_modules/jest-snapshot": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.6.tgz", - "integrity": "sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.1.1.tgz", + "integrity": "sha512-Wi3QGiuRFo3lU+EbQmZnBOks0CJyAMPHvYoG7iJk00Do10jeOyuOEO0Jfoaoun8+8TDv+Nzl7Aswir/IK9+1jg==", "dev": true, "dependencies": { "@babel/core": "^7.7.2", @@ -4357,23 +4366,23 @@ "@babel/plugin-syntax-typescript": "^7.7.2", "@babel/traverse": "^7.7.2", "@babel/types": "^7.0.0", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/babel__traverse": "^7.0.4", "@types/prettier": "^2.1.5", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^27.0.6", + "expect": "^27.1.1", "graceful-fs": "^4.2.4", - "jest-diff": "^27.0.6", + "jest-diff": "^27.1.1", "jest-get-type": "^27.0.6", - "jest-haste-map": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-util": "^27.0.6", + "jest-haste-map": "^27.1.1", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-resolve": "^27.1.1", + "jest-util": "^27.1.1", "natural-compare": "^1.4.0", - "pretty-format": "^27.0.6", + "pretty-format": "^27.1.1", "semver": "^7.3.2" }, "engines": { @@ -4381,12 +4390,12 @@ } }, "node_modules/jest-util": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.0.6.tgz", - "integrity": "sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.1.1.tgz", + "integrity": "sha512-zf9nEbrASWn2mC/L91nNb0K+GkhFvi4MP6XJG2HqnHzHvLYcs7ou/In68xYU1i1dSkJlrWcYfWXQE8nVR+nbOA==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", @@ -4398,17 +4407,17 @@ } }, "node_modules/jest-validate": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.6.tgz", - "integrity": "sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.1.1.tgz", + "integrity": "sha512-N5Er5FKav/8m2dJwn7BGnZwnoD1BSc8jx5T+diG2OvyeugvZDhPeAt5DrNaGkkaKCrSUvuE7A5E4uHyT7Vj0Mw==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "camelcase": "^6.2.0", "chalk": "^4.0.0", "jest-get-type": "^27.0.6", "leven": "^3.1.0", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" @@ -4427,17 +4436,17 @@ } }, "node_modules/jest-watcher": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.6.tgz", - "integrity": "sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.1.1.tgz", + "integrity": "sha512-XQzyHbxziDe+lZM6Dzs40fEt4q9akOGwitJnxQasJ9WG0bv3JGiRlsBgjw13znGapeMtFaEsyhL0Cl04IbaoWQ==", "dev": true, "dependencies": { - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "jest-util": "^27.0.6", + "jest-util": "^27.1.1", "string-length": "^4.0.1" }, "engines": { @@ -4445,9 +4454,9 @@ } }, "node_modules/jest-worker": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz", - "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz", + "integrity": "sha512-XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==", "dev": true, "dependencies": { "@types/node": "*", @@ -4539,9 +4548,9 @@ } }, "node_modules/jsdom/node_modules/acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -5222,9 +5231,9 @@ } }, "node_modules/prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", + "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -5246,12 +5255,12 @@ } }, "node_modules/pretty-format": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz", - "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.1.1.tgz", + "integrity": "sha512-zdBi/xlstKJL42UH7goQti5Hip/B415w1Mfj+WWWYMBylAYtKESnXGUtVVcMVid9ReVjypCotUV6CEevYPHv2g==", "dev": true, "dependencies": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "ansi-regex": "^5.0.0", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" @@ -5635,9 +5644,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "dev": true, "dependencies": { "buffer-from": "^1.0.0", @@ -5911,9 +5920,9 @@ "dev": true }, "node_modules/tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "node_modules/to-fast-properties": { @@ -6004,16 +6013,29 @@ } }, "node_modules/tsconfig-paths": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz", - "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz", + "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==", "dev": true, "dependencies": { - "json5": "^2.2.0", + "@types/json5": "^0.0.29", + "json5": "^1.0.1", "minimist": "^1.2.0", "strip-bom": "^3.0.0" } }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/tsconfig-paths/node_modules/strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -6087,9 +6109,9 @@ } }, "node_modules/typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -6321,9 +6343,9 @@ } }, "node_modules/ws": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", - "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", "dev": true, "engines": { "node": ">=8.3.0" @@ -7042,49 +7064,49 @@ "dev": true }, "@jest/console": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.0.6.tgz", - "integrity": "sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.1.1.tgz", + "integrity": "sha512-VpQJRsWSeAem0zpBjeRtDbcD6DlbNoK11dNYt+PSQ+DDORh9q2/xyEpErfwgnLjWX0EKkSZmTGx/iH9Inzs6vQ==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^27.0.6", - "jest-util": "^27.0.6", + "jest-message-util": "^27.1.1", + "jest-util": "^27.1.1", "slash": "^3.0.0" } }, "@jest/core": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.6.tgz", - "integrity": "sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.1.1.tgz", + "integrity": "sha512-oCkKeTgI0emznKcLoq5OCD0PhxCijA4l7ejDnWW3d5bgSi+zfVaLybVqa+EQOxpNejQWtTna7tmsAXjMN9N43Q==", "dev": true, "requires": { - "@jest/console": "^27.0.6", - "@jest/reporters": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/reporters": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "emittery": "^0.8.1", "exit": "^0.1.2", "graceful-fs": "^4.2.4", - "jest-changed-files": "^27.0.6", - "jest-config": "^27.0.6", - "jest-haste-map": "^27.0.6", - "jest-message-util": "^27.0.6", + "jest-changed-files": "^27.1.1", + "jest-config": "^27.1.1", + "jest-haste-map": "^27.1.1", + "jest-message-util": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-resolve-dependencies": "^27.0.6", - "jest-runner": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", - "jest-watcher": "^27.0.6", + "jest-resolve": "^27.1.1", + "jest-resolve-dependencies": "^27.1.1", + "jest-runner": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", + "jest-watcher": "^27.1.1", "micromatch": "^4.0.4", "p-each-series": "^2.1.0", "rimraf": "^3.0.0", @@ -7093,53 +7115,53 @@ } }, "@jest/environment": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.0.6.tgz", - "integrity": "sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.1.1.tgz", + "integrity": "sha512-+y882/ZdxhyqF5RzxIrNIANjHj991WH7jifdcplzMDosDUOyCACFYUyVTBGbSTocbU+s1cesroRzkwi8hZ9SHg==", "dev": true, "requires": { - "@jest/fake-timers": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/fake-timers": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", - "jest-mock": "^27.0.6" + "jest-mock": "^27.1.1" } }, "@jest/fake-timers": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.0.6.tgz", - "integrity": "sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.1.1.tgz", + "integrity": "sha512-u8TJ5VlsVYTsGFatoyIae2l25pku4Bu15QCPTx2Gs5z+R//Ee3tHN85462Vc9yGVcdDvgADbqNkhOLxbEwPjMQ==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@sinonjs/fake-timers": "^7.0.2", "@types/node": "*", - "jest-message-util": "^27.0.6", - "jest-mock": "^27.0.6", - "jest-util": "^27.0.6" + "jest-message-util": "^27.1.1", + "jest-mock": "^27.1.1", + "jest-util": "^27.1.1" } }, "@jest/globals": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.0.6.tgz", - "integrity": "sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.1.1.tgz", + "integrity": "sha512-Q3JcTPmY+DAEHnr4MpnBV3mwy50EGrTC6oSDTNnW7FNGGacTJAfpWNk02D7xv422T1OzK2A2BKx+26xJOvHkyw==", "dev": true, "requires": { - "@jest/environment": "^27.0.6", - "@jest/types": "^27.0.6", - "expect": "^27.0.6" + "@jest/environment": "^27.1.1", + "@jest/types": "^27.1.1", + "expect": "^27.1.1" } }, "@jest/reporters": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.6.tgz", - "integrity": "sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.1.1.tgz", + "integrity": "sha512-cEERs62n1P4Pqox9HWyNOEkP57G95aK2mBjB6D8Ruz1Yc98fKH53b58rlVEnsY5nLmkLNZk65fxNi9C0Yds/8w==", "dev": true, "requires": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", @@ -7150,10 +7172,10 @@ "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.0.2", - "jest-haste-map": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-util": "^27.0.6", - "jest-worker": "^27.0.6", + "jest-haste-map": "^27.1.1", + "jest-resolve": "^27.1.1", + "jest-util": "^27.1.1", + "jest-worker": "^27.1.1", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -7173,45 +7195,45 @@ } }, "@jest/test-result": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.0.6.tgz", - "integrity": "sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.1.1.tgz", + "integrity": "sha512-8vy75A0Jtfz9DqXFUkjC5Co/wRla+D7qRFdShUY8SbPqBS3GBx3tpba7sGKFos8mQrdbe39n+c1zgVKtarfy6A==", "dev": true, "requires": { - "@jest/console": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/types": "^27.1.1", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" } }, "@jest/test-sequencer": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz", - "integrity": "sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.1.1.tgz", + "integrity": "sha512-l8zD3EdeixvwmLNlJoMX3hhj8iIze95okj4sqmBzOq/zW8gZLElUveH4bpKEMuR+Nweazjlwc7L6g4C26M/y6Q==", "dev": true, "requires": { - "@jest/test-result": "^27.0.6", + "@jest/test-result": "^27.1.1", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.0.6", - "jest-runtime": "^27.0.6" + "jest-haste-map": "^27.1.1", + "jest-runtime": "^27.1.1" } }, "@jest/transform": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.0.6.tgz", - "integrity": "sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.1.1.tgz", + "integrity": "sha512-qM19Eu75U6Jc5zosXXVnq900Nl9JDpoGaZ4Mg6wZs7oqbu3heYSMOZS19DlwjlhWdfNRjF4UeAgkrCJCK3fEXg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "babel-plugin-istanbul": "^6.0.0", "chalk": "^4.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.0.6", + "jest-haste-map": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-util": "^27.0.6", + "jest-util": "^27.1.1", "micromatch": "^4.0.4", "pirates": "^4.0.1", "slash": "^3.0.0", @@ -7220,9 +7242,9 @@ } }, "@jest/types": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz", - "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz", + "integrity": "sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -7372,10 +7394,16 @@ "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", "dev": true }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/node": { - "version": "16.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.7.1.tgz", - "integrity": "sha512-ncRdc45SoYJ2H4eWU9ReDfp3vtFqDYhjOsKlFFUDEn8V1Bgr2RjYal8YT5byfadWIRluhPFU6JiDOl0H6Sl87A==", + "version": "16.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz", + "integrity": "sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==", "dev": true }, "@types/parse-json": { @@ -7412,13 +7440,13 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz", - "integrity": "sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz", + "integrity": "sha512-iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "4.29.2", - "@typescript-eslint/scope-manager": "4.29.2", + "@typescript-eslint/experimental-utils": "4.31.0", + "@typescript-eslint/scope-manager": "4.31.0", "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.1.0", @@ -7427,55 +7455,55 @@ } }, "@typescript-eslint/experimental-utils": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz", - "integrity": "sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz", + "integrity": "sha512-Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw==", "dev": true, "requires": { "@types/json-schema": "^7.0.7", - "@typescript-eslint/scope-manager": "4.29.2", - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/typescript-estree": "4.29.2", + "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/typescript-estree": "4.31.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/parser": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.2.tgz", - "integrity": "sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz", + "integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "4.29.2", - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/typescript-estree": "4.29.2", + "@typescript-eslint/scope-manager": "4.31.0", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/typescript-estree": "4.31.0", "debug": "^4.3.1" } }, "@typescript-eslint/scope-manager": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz", - "integrity": "sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz", + "integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/visitor-keys": "4.29.2" + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0" } }, "@typescript-eslint/types": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.2.tgz", - "integrity": "sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz", + "integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz", - "integrity": "sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz", + "integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==", "dev": true, "requires": { - "@typescript-eslint/types": "4.29.2", - "@typescript-eslint/visitor-keys": "4.29.2", + "@typescript-eslint/types": "4.31.0", + "@typescript-eslint/visitor-keys": "4.31.0", "debug": "^4.3.1", "globby": "^11.0.3", "is-glob": "^4.0.1", @@ -7484,19 +7512,19 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "4.29.2", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz", - "integrity": "sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz", + "integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==", "dev": true, "requires": { - "@typescript-eslint/types": "4.29.2", + "@typescript-eslint/types": "4.31.0", "eslint-visitor-keys": "^2.0.0" } }, "@vercel/ncc": { - "version": "0.29.2", - "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.29.2.tgz", - "integrity": "sha512-eUxibZD92k+rY0oZJFZooGqdVpGkDrrHlUhj9UAWrtoyXCGmNOWC1Kcr2KPrZoHRSlWwHOcRnkn2nGT+aHY2KA==", + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.31.0.tgz", + "integrity": "sha512-vpioWEFk00Sk5CgJj39LFAjqXcM0PLcaSqaEDeZZUKfHEKYmHL5tOns7Xd21/o4SKzRi+XE0qhEv9wWwkfmNaA==", "dev": true }, "abab": { @@ -7655,13 +7683,13 @@ "dev": true }, "babel-jest": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.0.6.tgz", - "integrity": "sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.1.1.tgz", + "integrity": "sha512-JA+dzJl4n2RBvWQEnph6HJaTHrsIPiXGQYatt/D8nR4UpX9UG4GaDzykVVPQBbrdTebZREkRb6SOxyIXJRab6Q==", "dev": true, "requires": { - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.0.0", "babel-preset-jest": "^27.0.6", @@ -8337,9 +8365,9 @@ } }, "eslint-plugin-import": { - "version": "2.24.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.1.tgz", - "integrity": "sha512-KSFWhNxPH8OGJwpRJJs+Z7I0a13E2iFQZJIvSnCu6KUs4qmgAm3xN9GYBCSoiGWmwA7gERZPXqYQjcoCROnYhQ==", + "version": "2.24.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz", + "integrity": "sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==", "dev": true, "requires": { "array-includes": "^3.1.3", @@ -8356,7 +8384,7 @@ "pkg-up": "^2.0.0", "read-pkg-up": "^3.0.0", "resolve": "^1.20.0", - "tsconfig-paths": "^3.10.1" + "tsconfig-paths": "^3.11.0" }, "dependencies": { "debug": { @@ -8395,9 +8423,9 @@ } }, "eslint-plugin-prettier": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", - "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" @@ -8523,16 +8551,16 @@ "dev": true }, "expect": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz", - "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.1.1.tgz", + "integrity": "sha512-JQAzp0CJoFFHF1RnOtrMUNMdsfx/Tl0+FhRzVl8q0fa23N+JyWdPXwb3T5rkHCvyo9uttnK7lVdKCBl1b/9EDw==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "ansi-styles": "^5.0.0", "jest-get-type": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", "jest-regex-util": "^27.0.6" }, "dependencies": { @@ -9296,113 +9324,113 @@ } }, "jest": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.6.tgz", - "integrity": "sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.1.1.tgz", + "integrity": "sha512-LFTEZOhoZNR/2DQM3OCaK5xC6c55c1OWhYh0njRsoHX0qd6x4nkcgenkSH0JKjsAGMTmmJAoL7/oqYHMfwhruA==", "dev": true, "requires": { - "@jest/core": "^27.0.6", + "@jest/core": "^27.1.1", "import-local": "^3.0.2", - "jest-cli": "^27.0.6" + "jest-cli": "^27.1.1" } }, "jest-changed-files": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.0.6.tgz", - "integrity": "sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.1.1.tgz", + "integrity": "sha512-5TV9+fYlC2A6hu3qtoyGHprBwCAn0AuGA77bZdUgYvVlRMjHXo063VcWTEAyx6XAZ85DYHqp0+aHKbPlfRDRvA==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "execa": "^5.0.0", "throat": "^6.0.1" } }, "jest-circus": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.6.tgz", - "integrity": "sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.1.1.tgz", + "integrity": "sha512-Xed1ApiMFu/yzqGMBToHr8sp2gkX/ARZf4nXoGrHJrXrTUdVIWiVYheayfcOaPdQvQEE/uyBLgW7I7YBLIrAXQ==", "dev": true, "requires": { - "@jest/environment": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/environment": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", "dedent": "^0.7.0", - "expect": "^27.0.6", + "expect": "^27.1.1", "is-generator-fn": "^2.0.0", - "jest-each": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "pretty-format": "^27.0.6", + "jest-each": "^27.1.1", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "pretty-format": "^27.1.1", "slash": "^3.0.0", "stack-utils": "^2.0.3", "throat": "^6.0.1" } }, "jest-cli": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.6.tgz", - "integrity": "sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.1.1.tgz", + "integrity": "sha512-LCjfEYp9D3bcOeVUUpEol9Y1ijZYMWVqflSmtw/wX+6Fb7zP4IlO14/6s9v1pxsoM4Pn46+M2zABgKuQjyDpTw==", "dev": true, "requires": { - "@jest/core": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/core": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "import-local": "^3.0.2", - "jest-config": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-config": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "prompts": "^2.0.1", "yargs": "^16.0.3" } }, "jest-config": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.6.tgz", - "integrity": "sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.1.1.tgz", + "integrity": "sha512-2iSd5zoJV4MsWPcLCGwUVUY/j6pZXm4Qd3rnbCtrd9EHNTg458iHw8PZztPQXfxKBKJxLfBk7tbZqYF8MGtxJA==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^27.0.6", - "@jest/types": "^27.0.6", - "babel-jest": "^27.0.6", + "@jest/test-sequencer": "^27.1.1", + "@jest/types": "^27.1.1", + "babel-jest": "^27.1.1", "chalk": "^4.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", "graceful-fs": "^4.2.4", "is-ci": "^3.0.0", - "jest-circus": "^27.0.6", - "jest-environment-jsdom": "^27.0.6", - "jest-environment-node": "^27.0.6", + "jest-circus": "^27.1.1", + "jest-environment-jsdom": "^27.1.1", + "jest-environment-node": "^27.1.1", "jest-get-type": "^27.0.6", - "jest-jasmine2": "^27.0.6", + "jest-jasmine2": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-runner": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-resolve": "^27.1.1", + "jest-runner": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "micromatch": "^4.0.4", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" } }, "jest-diff": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz", - "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.1.1.tgz", + "integrity": "sha512-m/6n5158rqEriTazqHtBpOa2B/gGgXJijX6nsEgZfbJ/3pxQcdpVXBe+FP39b1dxWHyLVVmuVXddmAwtqFO4Lg==", "dev": true, "requires": { "chalk": "^4.0.0", "diff-sequences": "^27.0.6", "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" } }, "jest-docblock": { @@ -9415,45 +9443,45 @@ } }, "jest-each": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.0.6.tgz", - "integrity": "sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.1.1.tgz", + "integrity": "sha512-r6hOsTLavUBb1xN0uDa89jdDeBmJ+K49fWpbyxeGRA2pLY46PlC4z551/cWNQzrj+IUa5/gSRsCIV/01HdNPug==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "jest-get-type": "^27.0.6", - "jest-util": "^27.0.6", - "pretty-format": "^27.0.6" + "jest-util": "^27.1.1", + "pretty-format": "^27.1.1" } }, "jest-environment-jsdom": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz", - "integrity": "sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.1.1.tgz", + "integrity": "sha512-6vOnoZ6IaExuw7FvnuJhA1qFYv1DDSnN0sQowzolNwxQp7bG1YhLxj2YU1sVXAYA3IR3MbH2mbnJUsLUWfyfzw==", "dev": true, "requires": { - "@jest/environment": "^27.0.6", - "@jest/fake-timers": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/environment": "^27.1.1", + "@jest/fake-timers": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", - "jest-mock": "^27.0.6", - "jest-util": "^27.0.6", + "jest-mock": "^27.1.1", + "jest-util": "^27.1.1", "jsdom": "^16.6.0" } }, "jest-environment-node": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.0.6.tgz", - "integrity": "sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.1.1.tgz", + "integrity": "sha512-OEGeZh0PwzngNIYWYgWrvTcLygopV8OJbC9HNb0j70VBKgEIsdZkYhwcFnaURX83OHACMqf1pa9Tv5Pw5jemrg==", "dev": true, "requires": { - "@jest/environment": "^27.0.6", - "@jest/fake-timers": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/environment": "^27.1.1", + "@jest/fake-timers": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", - "jest-mock": "^27.0.6", - "jest-util": "^27.0.6" + "jest-mock": "^27.1.1", + "jest-util": "^27.1.1" } }, "jest-get-type": { @@ -9463,12 +9491,12 @@ "dev": true }, "jest-haste-map": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.0.6.tgz", - "integrity": "sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.1.1.tgz", + "integrity": "sha512-NGLYVAdh5C8Ezg5QBFzrNeYsfxptDBPlhvZNaicLiZX77F/rS27a9M6u9ripWAaaD54xnWdZNZpEkdjD5Eo5aQ==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/graceful-fs": "^4.1.2", "@types/node": "*", "anymatch": "^3.0.3", @@ -9477,73 +9505,73 @@ "graceful-fs": "^4.2.4", "jest-regex-util": "^27.0.6", "jest-serializer": "^27.0.6", - "jest-util": "^27.0.6", - "jest-worker": "^27.0.6", + "jest-util": "^27.1.1", + "jest-worker": "^27.1.1", "micromatch": "^4.0.4", "walker": "^1.0.7" } }, "jest-jasmine2": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz", - "integrity": "sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.1.1.tgz", + "integrity": "sha512-0LAzUmcmvQwjIdJt0cXUVX4G5qjVXE8ELt6nbMNDzv2yAs2hYCCUtQq+Eje70GwAysWCGcS64QeYj5VPHYVxPg==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^27.0.6", + "@jest/environment": "^27.1.1", "@jest/source-map": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "expect": "^27.0.6", + "expect": "^27.1.1", "is-generator-fn": "^2.0.0", - "jest-each": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "pretty-format": "^27.0.6", + "jest-each": "^27.1.1", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "pretty-format": "^27.1.1", "throat": "^6.0.1" } }, "jest-leak-detector": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz", - "integrity": "sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.1.1.tgz", + "integrity": "sha512-gwSgzmqShoeEsEVpgObymQPrM9P6557jt1EsFW5aCeJ46Cme0EdjYU7xr6llQZ5GpWDl56eOstUaPXiZOfiTKw==", "dev": true, "requires": { "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" } }, "jest-matcher-utils": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz", - "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.1.1.tgz", + "integrity": "sha512-Q1a10w9Y4sh0wegkdP6reQOa/Dtz7nAvDqBgrat1ItZAUvk4jzXAqyhXPu/ZuEtDaXaNKpdRPRQA8bvkOh2Eaw==", "dev": true, "requires": { "chalk": "^4.0.0", - "jest-diff": "^27.0.6", + "jest-diff": "^27.1.1", "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" } }, "jest-message-util": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz", - "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.1.1.tgz", + "integrity": "sha512-b697BOJV93+AVGvzLRtVZ0cTVRbd59OaWnbB2D75GRaIMc4I+Z9W0wHxbfjW01JWO+TqqW4yevT0aN7Fd0XWng==", "dev": true, "requires": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "micromatch": "^4.0.4", - "pretty-format": "^27.0.6", + "pretty-format": "^27.1.1", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, @@ -9560,12 +9588,12 @@ } }, "jest-mock": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.0.6.tgz", - "integrity": "sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.1.1.tgz", + "integrity": "sha512-SClsFKuYBf+6SSi8jtAYOuPw8DDMsTElUWEae3zq7vDhH01ayVSIHUSIa8UgbDOUalCFp6gNsaikN0rbxN4dbw==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/node": "*" } }, @@ -9583,92 +9611,94 @@ "dev": true }, "jest-resolve": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.6.tgz", - "integrity": "sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.1.1.tgz", + "integrity": "sha512-M41YFmWhvDVstwe7XuV21zynOiBLJB5Sk0GrIsYYgTkjfEWNLVXDjAyq1W7PHseaYNOxIc0nOGq/r5iwcZNC1A==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "chalk": "^4.0.0", "escalade": "^3.1.1", "graceful-fs": "^4.2.4", + "jest-haste-map": "^27.1.1", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "resolve": "^1.20.0", "slash": "^3.0.0" } }, "jest-resolve-dependencies": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz", - "integrity": "sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.1.1.tgz", + "integrity": "sha512-sYZR+uBjFDCo4VhYeazZf/T+ryYItvdLKu9vHatqkUqHGjDMrdEPOykiqC2iEpaCFTS+3iL/21CYiJuKdRbniw==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-snapshot": "^27.0.6" + "jest-snapshot": "^27.1.1" } }, "jest-runner": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.6.tgz", - "integrity": "sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.1.1.tgz", + "integrity": "sha512-lP3MBNQhg75/sQtVkC8dsAQZumvy3lHK/YIwYPfEyqGIX1qEcnYIRxP89q0ZgC5ngvi1vN2P5UFHszQxguWdng==", "dev": true, "requires": { - "@jest/console": "^27.0.6", - "@jest/environment": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/environment": "^27.1.1", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "emittery": "^0.8.1", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "jest-docblock": "^27.0.6", - "jest-environment-jsdom": "^27.0.6", - "jest-environment-node": "^27.0.6", - "jest-haste-map": "^27.0.6", - "jest-leak-detector": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-runtime": "^27.0.6", - "jest-util": "^27.0.6", - "jest-worker": "^27.0.6", + "jest-environment-jsdom": "^27.1.1", + "jest-environment-node": "^27.1.1", + "jest-haste-map": "^27.1.1", + "jest-leak-detector": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-resolve": "^27.1.1", + "jest-runtime": "^27.1.1", + "jest-util": "^27.1.1", + "jest-worker": "^27.1.1", "source-map-support": "^0.5.6", "throat": "^6.0.1" } }, "jest-runtime": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.6.tgz", - "integrity": "sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.1.1.tgz", + "integrity": "sha512-FEwy+tSzmsvuKaQpyYsUyk31KG5vMmA2r2BSTHgv0yNfcooQdm2Ke91LM9Ud8D3xz8CLDHJWAI24haMFTwrsPg==", "dev": true, "requires": { - "@jest/console": "^27.0.6", - "@jest/environment": "^27.0.6", - "@jest/fake-timers": "^27.0.6", - "@jest/globals": "^27.0.6", + "@jest/console": "^27.1.1", + "@jest/environment": "^27.1.1", + "@jest/fake-timers": "^27.1.1", + "@jest/globals": "^27.1.1", "@jest/source-map": "^27.0.6", - "@jest/test-result": "^27.0.6", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/test-result": "^27.1.1", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/yargs": "^16.0.0", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-mock": "^27.0.6", + "jest-haste-map": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-mock": "^27.1.1", "jest-regex-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-snapshot": "^27.0.6", - "jest-util": "^27.0.6", - "jest-validate": "^27.0.6", + "jest-resolve": "^27.1.1", + "jest-snapshot": "^27.1.1", + "jest-util": "^27.1.1", + "jest-validate": "^27.1.1", "slash": "^3.0.0", "strip-bom": "^4.0.0", "yargs": "^16.0.3" @@ -9685,9 +9715,9 @@ } }, "jest-snapshot": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.6.tgz", - "integrity": "sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.1.1.tgz", + "integrity": "sha512-Wi3QGiuRFo3lU+EbQmZnBOks0CJyAMPHvYoG7iJk00Do10jeOyuOEO0Jfoaoun8+8TDv+Nzl7Aswir/IK9+1jg==", "dev": true, "requires": { "@babel/core": "^7.7.2", @@ -9696,33 +9726,33 @@ "@babel/plugin-syntax-typescript": "^7.7.2", "@babel/traverse": "^7.7.2", "@babel/types": "^7.0.0", - "@jest/transform": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/transform": "^27.1.1", + "@jest/types": "^27.1.1", "@types/babel__traverse": "^7.0.4", "@types/prettier": "^2.1.5", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^27.0.6", + "expect": "^27.1.1", "graceful-fs": "^4.2.4", - "jest-diff": "^27.0.6", + "jest-diff": "^27.1.1", "jest-get-type": "^27.0.6", - "jest-haste-map": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", - "jest-resolve": "^27.0.6", - "jest-util": "^27.0.6", + "jest-haste-map": "^27.1.1", + "jest-matcher-utils": "^27.1.1", + "jest-message-util": "^27.1.1", + "jest-resolve": "^27.1.1", + "jest-util": "^27.1.1", "natural-compare": "^1.4.0", - "pretty-format": "^27.0.6", + "pretty-format": "^27.1.1", "semver": "^7.3.2" } }, "jest-util": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.0.6.tgz", - "integrity": "sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.1.1.tgz", + "integrity": "sha512-zf9nEbrASWn2mC/L91nNb0K+GkhFvi4MP6XJG2HqnHzHvLYcs7ou/In68xYU1i1dSkJlrWcYfWXQE8nVR+nbOA==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/node": "*", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", @@ -9731,17 +9761,17 @@ } }, "jest-validate": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.0.6.tgz", - "integrity": "sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.1.1.tgz", + "integrity": "sha512-N5Er5FKav/8m2dJwn7BGnZwnoD1BSc8jx5T+diG2OvyeugvZDhPeAt5DrNaGkkaKCrSUvuE7A5E4uHyT7Vj0Mw==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "camelcase": "^6.2.0", "chalk": "^4.0.0", "jest-get-type": "^27.0.6", "leven": "^3.1.0", - "pretty-format": "^27.0.6" + "pretty-format": "^27.1.1" }, "dependencies": { "camelcase": { @@ -9753,24 +9783,24 @@ } }, "jest-watcher": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.0.6.tgz", - "integrity": "sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.1.1.tgz", + "integrity": "sha512-XQzyHbxziDe+lZM6Dzs40fEt4q9akOGwitJnxQasJ9WG0bv3JGiRlsBgjw13znGapeMtFaEsyhL0Cl04IbaoWQ==", "dev": true, "requires": { - "@jest/test-result": "^27.0.6", - "@jest/types": "^27.0.6", + "@jest/test-result": "^27.1.1", + "@jest/types": "^27.1.1", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "jest-util": "^27.0.6", + "jest-util": "^27.1.1", "string-length": "^4.0.1" } }, "jest-worker": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz", - "integrity": "sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz", + "integrity": "sha512-XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA==", "dev": true, "requires": { "@types/node": "*", @@ -9841,9 +9871,9 @@ }, "dependencies": { "acorn": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.4.1.tgz", - "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", "dev": true } } @@ -10364,9 +10394,9 @@ "dev": true }, "prettier": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz", - "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", + "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", "dev": true }, "prettier-linter-helpers": { @@ -10379,12 +10409,12 @@ } }, "pretty-format": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz", - "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.1.1.tgz", + "integrity": "sha512-zdBi/xlstKJL42UH7goQti5Hip/B415w1Mfj+WWWYMBylAYtKESnXGUtVVcMVid9ReVjypCotUV6CEevYPHv2g==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "ansi-regex": "^5.0.0", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" @@ -10649,9 +10679,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -10874,9 +10904,9 @@ "dev": true }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-fast-properties": { @@ -10931,16 +10961,26 @@ } }, "tsconfig-paths": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz", - "integrity": "sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==", + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz", + "integrity": "sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==", "dev": true, "requires": { - "json5": "^2.2.0", + "@types/json5": "^0.0.29", + "json5": "^1.0.1", "minimist": "^1.2.0", "strip-bom": "^3.0.0" }, "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -10995,9 +11035,9 @@ } }, "typescript": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz", - "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "dev": true }, "unbox-primitive": { @@ -11185,9 +11225,9 @@ } }, "ws": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", - "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", + "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", "dev": true, "requires": {} }, diff --git a/package.json b/package.json index e91efb1b0..4f9eaf546 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,24 @@ { "name": "setup-php", - "version": "2.13.0", + "version": "2.14.0", "private": false, "description": "Setup PHP for use with GitHub Actions", "main": "lib/install.js", + "types": "lib/install.d.ts", + "directories": { + "lib": "lib", + "test": "__tests__", + "src": "src" + }, + "files": [ + "lib", + "src" + ], "scripts": { "build": "tsc", - "lint": "eslint **/*.ts --cache --fix", - "format": "prettier --write **/*.ts && git add .", - "format-check": "prettier --check **/*.ts", + "lint": "eslint **/src/*.ts --cache --fix", + "format": "prettier --write **/src/*.ts && git add .", + "format-check": "prettier --check **/src/*.ts", "release": "ncc build -o dist && git add -f dist/", "test": "jest" }, @@ -31,21 +41,24 @@ }, "devDependencies": { "@types/jest": "^27.0.1", - "@types/node": "^16.7.1", - "@typescript-eslint/eslint-plugin": "^4.29.2", - "@typescript-eslint/parser": "^4.29.2", - "@vercel/ncc": "^0.29.2", + "@types/node": "^16.9.1", + "@typescript-eslint/eslint-plugin": "^4.31.0", + "@typescript-eslint/parser": "^4.31.0", + "@vercel/ncc": "^0.31.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", - "eslint-plugin-import": "^2.24.1", + "eslint-plugin-import": "^2.24.2", "eslint-plugin-jest": "^24.4.0", - "eslint-plugin-prettier": "^3.4.1", + "eslint-plugin-prettier": "^4.0.0", "husky": "^4.3.8", - "jest": "^27.0.6", - "jest-circus": "^27.0.6", - "prettier": "^2.3.2", + "jest": "^27.1.1", + "jest-circus": "^27.1.1", + "prettier": "^2.4.0", "ts-jest": "^27.0.5", - "typescript": "^4.3.5" + "typescript": "^4.4.3" + }, + "bugs": { + "url": "https://github.com/shivammathur/setup-php/issues" }, "husky": { "skipCI": true, diff --git a/src/configs/php-versions.json b/src/configs/php-versions.json index 1096a264c..24742cbdb 100644 --- a/src/configs/php-versions.json +++ b/src/configs/php-versions.json @@ -1,5 +1,6 @@ { "latest": "8.0", + "nightly": "8.2", "5.x": "5.6", "7.x": "7.4", "8.x": "8.0" diff --git a/src/coverage.ts b/src/coverage.ts index b344e9f54..08912affc 100644 --- a/src/coverage.ts +++ b/src/coverage.ts @@ -18,7 +18,8 @@ export async function addCoverageXdebug( ): Promise { let script = '\n'; script += - (await extensions.addExtension(':pcov', version, os_version, true)) + pipe; + (await extensions.addExtension(':pcov:false', version, os_version, true)) + + pipe; script += (await extensions.addExtension(extension, version, os_version, true)) + pipe; @@ -47,8 +48,12 @@ export async function addCoveragePCOV( switch (true) { default: script += - (await extensions.addExtension(':xdebug', version, os_version, true)) + - pipe; + (await extensions.addExtension( + ':xdebug:false', + version, + os_version, + true + )) + pipe; script += (await extensions.addExtension('pcov', version, os_version, true)) + pipe; @@ -92,10 +97,15 @@ export async function disableCoverage( ): Promise { let script = '\n'; script += - (await extensions.addExtension(':pcov', version, os_version, true)) + pipe; - script += - (await extensions.addExtension(':xdebug', version, os_version, true)) + + (await extensions.addExtension(':pcov:false', version, os_version, true)) + pipe; + script += + (await extensions.addExtension( + ':xdebug:false', + version, + os_version, + true + )) + pipe; script += await utils.addLog( '$tick', 'none', diff --git a/src/extensions.ts b/src/extensions.ts index e5f801279..eb053e0f7 100644 --- a/src/extensions.ts +++ b/src/extensions.ts @@ -21,7 +21,11 @@ export async function addExtensionDarwin( switch (true) { // match :extension case /^:/.test(ext_name): - remove_script += '\nremove_extension ' + ext_name.slice(1); + remove_script += '\ndisable_extension' + ext_name.replace(/:/g, ' '); + return; + // Match none + case /^none$/.test(ext_name): + add_script += '\ndisable_all_shared'; return; // match extensions for compiling from source case /.+-.+\/.+@.+/.test(extension): @@ -68,15 +72,17 @@ export async function addExtensionDarwin( case /(5\.[3-6]|7\.0)pcov/.test(version_extension): add_script += await utils.getUnsupportedLog('pcov', version, 'darwin'); return; - // match 5.6 and newer - amqp, apcu, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, protobuf, raphf, rdkafka, redis, swoole, xdebug, xdebug2, yaml, zmq + // match 5.6 and newer - amqp, apcu, expect, grpc, igbinary, imagick, imap, memcache, memcached, mongodb, msgpack, protobuf, raphf, rdkafka, redis, ssh2, swoole, xdebug, xdebug2, yaml, zmq // match 7.1 and newer - pcov // match 5.6 to 7.4 - propro - case /(? { - const name = 'setup-php'; - const url = 'https://setup-php.com/support'; + const url = 'https://setup-php.com/sponsor'; // taking inputs process.env['fail_fast'] = await utils.getInput('fail-fast', false); const extension_csv: string = await utils.getInput('extensions', false); @@ -29,7 +28,6 @@ export async function getScript( let script: string = await utils.readFile(filename, 'src/scripts'); script += await tools.addTools(tools_csv, version, os_version); - if (extension_csv) { script += await extensions.addExtension(extension_csv, version, os_version); } @@ -39,9 +37,8 @@ export async function getScript( if (ini_values_csv) { script += await config.addINIValues(ini_values_csv, os_version); } - - script += '\n' + (await utils.stepLog('Support this project', os_version)); - script += '\n' + (await utils.addLog('$tick', name, url, os_version)); + script += '\n' + (await utils.stepLog(`Sponsor setup-php`, os_version)); + script += '\n' + (await utils.addLog('$tick', 'setup-php', url, os_version)); return await utils.writeScript(filename, script); } @@ -70,7 +67,7 @@ export async function run(): Promise { core.setFailed('Unable to get the PHP version'); } } catch (error) { - core.setFailed(error.message); + core.setFailed((error as Error).message); } } diff --git a/src/scripts/common.sh b/src/scripts/common.sh index 88c664ca3..fee48610d 100644 --- a/src/scripts/common.sh +++ b/src/scripts/common.sh @@ -102,6 +102,11 @@ check_extension() { fi } +# Function to check if extension is shared +shared_extension() { + [ -e "${ext_dir:?}/$1.so" ] +} + # Function to enable cached extensions. enable_cache_extension() { deps=() @@ -126,13 +131,65 @@ enable_cache_extension() { enable_extension() { modules_dir="/var/lib/php/modules/$version" [ -d "$modules_dir" ] && sudo find "$modules_dir" -path "*disabled*$1" -delete + enable_extension_dependencies "$1" "$2" if [ -d /tmp/extcache/"$1" ]; then enable_cache_extension "$1" "$2" - elif ! check_extension "$1" && [ -e "${ext_dir:?}/$1.so" ]; then + elif ! check_extension "$1" && shared_extension "$1"; then echo "$2=${ext_dir:?}/$1.so" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null fi } +# Function to get a map of extensions and their dependent shared extensions. +get_extension_map() { + php -d'error_reporting=0' "${dist:?}"/../src/scripts/ext/extension_map.php +} + +# Function to enable extension dependencies which are also extensions. +enable_extension_dependencies() { + extension=$1 + prefix=$2 + if ! [ -e /tmp/map.orig ]; then + get_extension_map | sudo tee /tmp/map.orig >/dev/null + fi + for dependency in $(grep "$extension:" /tmp/map.orig | cut -d ':' -f 2 | tr '\n' ' '); do + enable_extension "$dependency" "$prefix" + done +} + +# Function to disable dependent extensions. +disable_extension_dependents() { + local extension=$1 + for dependent in $(get_extension_map | grep -E ".*:.*\s$extension(\s|$)" | cut -d ':' -f 1 | tr '\n' ' '); do + disable_extension_helper "$dependent" true + add_log "${tick:?}" ":$extension" "Disabled $dependent as it depends on $extension" + done +} + +# Function to disable an extension. +disable_extension() { + extension=$1 + if check_extension "$extension"; then + if shared_extension "$extension"; then + disable_extension_helper "$extension" true + (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Disabled") || + add_log "${cross:?}" ":$extension" "Could not disable $extension on PHP ${semver:?}" + else + add_log "${cross:?}" ":$extension" "Could not disable $extension on PHP $semver as it not a shared extension" + fi + elif shared_extension "$extension"; then + add_log "${tick:?}" ":$extension" "Disabled" + else + add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver" + fi +} + +# Function to disable shared extensions. +disable_all_shared() { + sudo sed -i.orig -E -e "/^(zend_)?extension\s*=/d" "${ini_file[@]}" "$pecl_file" 2>/dev/null || true + sudo find "${ini_dir:-$scan_dir}"/.. -name "*.ini" -not -path "*php.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true + add_log "${tick:?}" "none" "Disabled all shared extensions" +} + # Function to configure PHP configure_php() { ( @@ -186,8 +243,7 @@ add_pecl_extension() { if [ "$ext_version" = "$pecl_version" ]; then add_log "${tick:?}" "$extension" "Enabled" else - disable_extension "$extension" >/dev/null 2>&1 - delete_extension "$extension" >/dev/null 2>&1 + disable_extension_helper "$extension" >/dev/null 2>&1 pecl_install "$extension-$pecl_version" add_extension_log "$extension-$pecl_version" "Installed and enabled" fi @@ -301,14 +357,15 @@ add_composertool() { # Function to get PHP version in semver format. php_semver() { - php -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+([0-9]+)?)?" | head -n 1 + php -v | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+((-?[a-zA-Z]+([0-9]+)?)?){2}" | head -n 1 } # Function to get the tag for a php version. php_src_tag() { - php_src_tag='master' - if ! [[ ${version:?} =~ $nightly_versions ]]; then - php_src_tag="php-$semver" + commit=$(php_extra_version | grep -Eo "[0-9a-zA-Z]+") + if [[ -n "${commit}" ]]; then + echo "$commit" + else + echo "php-$semver" fi - echo "$php_src_tag" } diff --git a/src/scripts/darwin.sh b/src/scripts/darwin.sh index e34a59ef3..c5aac20a5 100644 --- a/src/scripts/darwin.sh +++ b/src/scripts/darwin.sh @@ -7,29 +7,15 @@ self_hosted_helper() { fi } -# Function to delete extension. -delete_extension() { - extension=$1 - sudo rm -rf "${scan_dir:?}"/*"$extension"* "${ext_dir:?}"/"$extension".so >/dev/null 2>&1 -} - -# Function to disable extension. -disable_extension() { - extension=$1 - sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}" -} - -# Function to remove extensions. -remove_extension() { - extension=$1 - if check_extension "$extension"; then - disable_extension "$extension" - delete_extension "$extension" - (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") || - add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}" - else - add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver" +# Helper function to disable an extension. +disable_extension_helper() { + local extension=$1 + local disable_dependents=${2:-false} + if [ "$disable_dependents" = "true" ]; then + disable_extension_dependents "$extension" fi + sudo sed -Ei '' "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file:?}" + sudo rm -rf "$scan_dir"/*"$extension"* } # Function to fetch a brew tap. @@ -105,8 +91,8 @@ add_devtools() { # Function to handle request to add PECL. add_pecl() { configure_pecl >/dev/null 2>&1 - pecl_version=$(get_tool_version "pecl" "version") - add_log "${tick:?}" "PECL" "Found PECL $pecl_version" + pear_version=$(get_tool_version "pecl" "version") + add_log "${tick:?}" "PECL" "Found PECL $pear_version" } # Function to link all libraries of a formula. @@ -186,8 +172,9 @@ add_php() { # Function to get extra version. php_extra_version() { - if [[ ${version:?} =~ ${nightly_versions:?} ]]; then - echo " ($(brew cat "$php_formula" | grep -Eo "commit=[0-9a-zA-Z]+" | cut -d'=' -f 2))" + php_formula_file="$tap_dir"/shivammathur/homebrew-php/Formula/php@"$version".rb + if [ -e "$php_formula_file" ] && ! grep -q "deprecate!" $php_formula_file && grep -Eq "archive/[0-9a-zA-Z]+" "$php_formula_file"; then + echo " ($(grep -Eo "archive/[0-9a-zA-Z]+" "$php_formula_file" | cut -d'/' -f 2))" fi } @@ -217,7 +204,7 @@ setup_php() { semver=$(php_semver) extra_version=$(php_extra_version) if [ "${semver%.*}" != "$version" ]; then - add_log "$cross" "PHP" "Could not setup PHP $version" + add_log "${cross:?}" "PHP" "Could not setup PHP $version" exit 1 fi diff --git a/src/scripts/ext/blackfire.sh b/src/scripts/ext/blackfire.sh index 5eb286786..f9d3e3d1a 100644 --- a/src/scripts/ext/blackfire.sh +++ b/src/scripts/ext/blackfire.sh @@ -6,7 +6,7 @@ add_blackfire() { platform=$(uname -s | tr '[:upper:]' '[:lower:]') extension_version=$(echo "$extension" | cut -d '-' -f 2) blackfire_ini_file="${pecl_file:-${ini_file[@]}}" - if [ ! -e "${ext_dir:?}/blackfire.so" ]; then + if ! shared_extension blackfire; then if [ "$extension_version" = "blackfire" ]; then if [[ ${version:?} =~ 5.[3-6] ]]; then extension_version='1.50.0' diff --git a/src/scripts/ext/extension_map.php b/src/scripts/ext/extension_map.php new file mode 100644 index 000000000..fda0080de --- /dev/null +++ b/src/scripts/ext/extension_map.php @@ -0,0 +1,109 @@ +extension_dir = ini_get('extension_dir'); + $this->file_extension = (PHP_OS == 'WINNT' ? '.dll' : '.so'); + $this->file_prefix = (PHP_OS == 'WINNT' ? 'php_' : ''); + $this->map = ''; + } + + /** + * Function to check if a shared extension file exists. + * + * @param string $extension + * @return bool + */ + public function checkSharedExtension($extension) { + $extension_file = $this->extension_dir. DIRECTORY_SEPARATOR . $this->file_prefix . $extension . $this->file_extension; + return file_exists($extension_file); + } + + /** + * Function to get all shared extensions. + * + * @return string[] + */ + public function getSharedExtensions() { + $files = scandir($this->extension_dir); + $extensions = array_diff($files, array('.','..')); + $filter_pattern = "/$this->file_extension|$this->file_prefix/"; + return array_map(function ($extension) use($filter_pattern) { + return preg_replace($filter_pattern, '', $extension); + }, $extensions); + } + + /** + * Function to patch dependencies if there are any bugs in Reflection data. + * + * @param string $extension + * @param array $dependencies + * @return array + */ + public function patchDependencies($extension, $dependencies) { + // memcached 2.2.0 has no dependencies in reflection data. + if($extension == 'memcached') { + $dependencies = array_unique(array_merge($dependencies, array('igbinary', 'json', 'msgpack'))); + } + return $dependencies; + } + + /** + * Function to add extension to the map. + * + * @param string $extension + * @throws ReflectionException + */ + public function addExtensionToMap($extension) { + // PHP 5.3 does not allow using $this. + $self = $this; + + $ref = new ReflectionExtension($extension); + $dependencies = array_keys(array_map('strtolower', $ref->getDependencies())); + $dependencies = $this->patchDependencies($extension, $dependencies); + $dependencies = array_filter($dependencies, function ($dependency) use ($self) { + return $self->checkSharedExtension($dependency); + }); + $self->map .= $extension . ': ' . implode(' ', $dependencies) . PHP_EOL; + } + + /** + * Function to print the map of shared extensions and their dependent extensions. + * + * @return string + */ + public function __toString() { + $extensions = array_map('strtolower', $this->getSharedExtensions()); + foreach ($extensions as $extension) { + try { + $this->addExtensionToMap($extension); + } catch (ReflectionException $e) { + + } + } + return $this->map; + } +} + +$extension_map = new ExtensionMap(); +echo $extension_map; diff --git a/src/scripts/ext/http.ps1 b/src/scripts/ext/http.ps1 index 7b67d2795..fb5260baf 100644 --- a/src/scripts/ext/http.ps1 +++ b/src/scripts/ext/http.ps1 @@ -31,7 +31,7 @@ Function Repair-ICU() { } $zip_url = Get-ICUUrl $icu.Groups[1].Value $installed.Architecture $vs if ($zip_url -ne '') { - New-Item -Path "$php_dir" -Name "icu" -ItemType "directory" | Out-Null + New-Item -Path "$php_dir" -Name "icu" -ItemType "directory" -Force > $null 2>&1 Invoke-WebRequest -Uri $zip_url -OutFile "$php_dir\icu\icu.zip" Expand-Archive -Path $php_dir\icu\icu.zip -DestinationPath $php_dir\icu -Force Get-ChildItem $php_dir\icu\bin -Filter *.dll | Copy-Item -Destination $php_dir -Force diff --git a/src/scripts/ext/http.sh b/src/scripts/ext/http.sh index 35d25c5b8..5cdaeff63 100644 --- a/src/scripts/ext/http.sh +++ b/src/scripts/ext/http.sh @@ -99,7 +99,7 @@ add_http_version() { ext=$1 enable_http if [ "x$(php -r "echo phpversion('http');")" != "x${ext##*-}" ]; then - remove_extension http >/dev/null + disable_extension_helper http >/dev/null add_http_helper pecl_http-"${ext##*-}" "$os" status="Installed and enabled" fi diff --git a/src/scripts/ext/ioncube.sh b/src/scripts/ext/ioncube.sh index 07bbdf0bd..0f2580091 100644 --- a/src/scripts/ext/ioncube.sh +++ b/src/scripts/ext/ioncube.sh @@ -7,11 +7,11 @@ add_license_log() { # Function to install ioncube. add_ioncube() { - if [ ! -e "${ext_dir:?}/ioncube.so" ]; then + if ! shared_extension ioncube; then status='Installed and enabled' os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac' get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp - sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "$ext_dir/ioncube.so" + sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "${ext_dir:?}/ioncube.so" fi echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1 add_extension_log "ioncube" "$status" diff --git a/src/scripts/ext/oci.sh b/src/scripts/ext/oci.sh index f5b53bc47..cd899ad49 100644 --- a/src/scripts/ext/oci.sh +++ b/src/scripts/ext/oci.sh @@ -35,7 +35,7 @@ add_client() { # Function to install oci8 and pdo_oci. add_oci_helper() { - if ! [ -e "${ext_dir:?}/$ext.so" ]; then + if ! shared_extension "$ext"; then status='Installed and enabled' read -r "${ext}_LINUX_LIBS" <<< "libaio-dev" read -r "${ext}_CONFIGURE_OPTS" <<< "--with-php-config=$(command -v php-config) --with-${ext/_/-}=instantclient,$oracle_client" @@ -43,6 +43,8 @@ add_oci_helper() { patch_phpize add_extension_from_source "$ext" https://github.com php php-src "$(php_src_tag)" extension get restore_phpize + else + enable_extension "$ext" extension fi } diff --git a/src/scripts/ext/phalcon.sh b/src/scripts/ext/phalcon.sh index 72dfc9be1..981294a77 100644 --- a/src/scripts/ext/phalcon.sh +++ b/src/scripts/ext/phalcon.sh @@ -10,7 +10,7 @@ add_phalcon_helper() { # Function to add phalcon3. add_phalcon3() { - if [ -e "${ext_dir:?}/phalcon.so" ]; then + if shared_extension phalcon; then phalcon_version=$(php -d="extension=phalcon.so" -r "echo phpversion('phalcon');" | cut -d'.' -f 1) if [ "$phalcon_version" != "$extension_major_version" ]; then add_phalcon_helper @@ -24,10 +24,10 @@ add_phalcon3() { # Function to add phalcon4. add_phalcon4() { - if [ -e "${ext_dir:?}/psr.so" ] && ! php -m | grep -i -q -w psr; then + if shared_extension phalcon && ! php -m | grep -i -q -w psr; then echo "extension=psr.so" | sudo tee -a "${ini_file:?}" fi - if [ -e "$ext_dir/phalcon.so" ]; then + if shared_extension phalcon; then if php -m | grep -i -q -w psr; then phalcon_version=$(php -d="extension=phalcon" -r "echo phpversion('phalcon');" | cut -d'.' -f 1) if [ "$phalcon_version" != "$extension_major_version" ]; then diff --git a/src/scripts/ext/source.sh b/src/scripts/ext/source.sh index ae950b1b7..7128a0a1d 100644 --- a/src/scripts/ext/source.sh +++ b/src/scripts/ext/source.sh @@ -126,7 +126,7 @@ add_extension_from_source() { step_log "Setup $slug" ( add_devtools phpize >/dev/null 2>&1 - delete_extension "$extension" + disable_extension_helper "$extension" fetch_extension "$fetch" if ! [ "$(find . -maxdepth 1 -name '*.m4' -exec grep -H 'PHP_NEW_EXTENSION' {} \; | wc -l)" != "0" ]; then add_log "${cross:?}" "$source" "$source does not have a PHP extension" diff --git a/src/scripts/linux.sh b/src/scripts/linux.sh index 480140436..6f8d109b5 100644 --- a/src/scripts/linux.sh +++ b/src/scripts/linux.sh @@ -19,35 +19,14 @@ install_packages() { } # Function to disable an extension. -disable_extension() { - extension=$1 - sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}" - sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "$pecl_file" - sudo find "$ini_dir"/.. -name "*$extension.ini" -delete >/dev/null 2>&1 || true -} - -# Function to delete an extension. -delete_extension() { - extension=$1 - disable_extension "$extension" - sudo rm -rf "$ext_dir"/"$extension".so >/dev/null 2>&1 - sudo sed -i "/Package: php$version-$extension/,/^$/d" /var/lib/dpkg/status -} - -# Function to disable and delete extensions. -remove_extension() { - extension=$1 - if check_extension "$extension"; then - if [[ ! "$version" =~ ${old_versions:?} ]] && [ -e /etc/php/"$version"/mods-available/"$extension".ini ]; then - sudo phpdismod -v "$version" "$extension" >/dev/null 2>&1 - fi - delete_extension "$extension" - (! check_extension "$extension" && add_log "${tick:?}" ":$extension" "Removed") || - add_log "${cross:?}" ":$extension" "Could not remove $extension on PHP ${semver:?}" - else - delete_extension "$extension" - add_log "${tick:?}" ":$extension" "Could not find $extension on PHP $semver" +disable_extension_helper() { + local extension=$1 + local disable_dependents=${2:-false} + if [ "$disable_dependents" = "true" ]; then + disable_extension_dependents "$extension" fi + sudo sed -Ei "/=(.*\/)?\"?$extension(.so)?$/d" "${ini_file[@]}" "$pecl_file" + sudo find "$ini_dir"/.. -name "*$extension.ini" -not -path "*mods-available*" -delete >/dev/null 2>&1 || true } # Function to add PDO extension. @@ -58,8 +37,8 @@ add_pdo_extension() { else ext=$1 ext_name=$1 - if [ -e "$ext_dir"/pdo.so ]; then - disable_extension pdo + if shared_extension pdo; then + disable_extension_helper pdo echo "extension=pdo.so" | sudo tee "${ini_file[@]/php.ini/conf.d/10-pdo.ini}" >/dev/null 2>&1 fi if [ "$ext" = "mysql" ]; then @@ -126,8 +105,8 @@ add_pecl() { install_packages php-pear fi configure_pecl >/dev/null 2>&1 - pecl_version=$(get_tool_version "pecl" "version") - add_log "${tick:?}" "PECL" "Added PECL $pecl_version" + pear_version=$(get_tool_version "pecl" "version") + add_log "${tick:?}" "PECL" "Added PECL $pear_version" } # Function to switch versions of PHP binaries. @@ -189,7 +168,7 @@ link_pecl_file() { # Function to get extra version. php_extra_version() { - if [[ ${version:?} =~ ${nightly_versions:?} ]]; then + if [ -e /etc/php/"$version"/COMMIT ]; then echo " ($(cat "/etc/php/$version/COMMIT"))" fi } @@ -228,6 +207,7 @@ setup_php() { scan_dir=$(php --ini | grep additional | sed -e "s|.*: s*||") ini_dir=$(php --ini | grep "(php.ini)" | sed -e "s|.*: s*||") pecl_file="$scan_dir"/99-pecl.ini + export ext_dir mapfile -t ini_file < <(sudo find "$ini_dir/.." -name "php.ini" -exec readlink -m {} +) link_pecl_file configure_php diff --git a/src/scripts/tools/ppa.sh b/src/scripts/tools/ppa.sh index 03af1fbcb..42dabaa8e 100644 --- a/src/scripts/tools/ppa.sh +++ b/src/scripts/tools/ppa.sh @@ -96,6 +96,21 @@ add_key() { fi } +# Function to check if a PPA and its lists exist +check_lists() { + ppa=$1 + ppa_search=$2 + if grep -Eqr "$ppa_search" "$list_dir"; then + list_count="$(find /var/lib/apt/lists -name "*${ppa/\//_}*" | wc -l)" + if [ "$list_count" = "0" ]; then + update_lists "$ppa" "$ppa_search" + fi + return 0; + else + return 1; + fi +} + # Function to add a sources list. add_list() { ppa=${1-ondrej/php} @@ -104,13 +119,16 @@ add_list() { package_dist=${4:-"$VERSION_CODENAME"} branches=${5:-main} ppa_search="deb .*$ppa_url $package_dist .*$branches" - grep -Eqr "$ppa_search" "$list_dir" && echo "Repository $ppa already exists" && return; - arch=$(dpkg --print-architecture) - [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg - add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file" - echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa/\//-}".list >/dev/null 2>&1 - update_lists "$ppa" "$ppa_search" - . /etc/os-release + if check_lists "$ppa" "$ppa_search"; then + echo "Repository $ppa already exists"; + else + arch=$(dpkg --print-architecture) + [ -e "$key_source" ] && key_file=$key_source || key_file="$key_dir"/"${ppa/\//-}"-keyring.gpg + add_key "$ppa" "$ppa_url" "$package_dist" "$key_source" "$key_file" + echo "deb [arch=$arch signed-by=$key_file] $ppa_url $package_dist $branches" | sudo tee -a "$list_dir"/"${ppa/\//-}".list >/dev/null 2>&1 + update_lists "$ppa" "$ppa_search" + . /etc/os-release + fi } # Function to remove a PPA. diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index 99e2ff0b6..7fdd569d8 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -74,20 +74,20 @@ Function Add-Path { Function Add-Printf { if (-not(Test-Path "C:\Program Files\Git\usr\bin\printf.exe")) { if(Test-Path "C:\msys64\usr\bin\printf.exe") { - New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe + New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value C:\msys64\usr\bin\printf.exe -Force > $null 2>&1 } else { Invoke-WebRequest -Uri "$github/shivammathur/printf/releases/latest/download/printf-x64.zip" -OutFile "$bin_dir\printf.zip" Expand-Archive -Path $bin_dir\printf.zip -DestinationPath $bin_dir -Force } } else { - New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe" + New-Item -Path $bin_dir\printf.exe -ItemType SymbolicLink -Value "C:\Program Files\Git\usr\bin\printf.exe" -Force > $null 2>&1 } } # Function to get a clean Powershell profile. Function Get-CleanPSProfile { if(-not(Test-Path -LiteralPath $profile)) { - New-Item -Path $profile -ItemType "file" -Force + New-Item -Path $profile -ItemType "file" -Force > $null 2>&1 } Set-Content $current_profile -Value '' Add-ToProfile $profile $current_profile.replace('\', '\\') ". $current_profile" @@ -154,7 +154,7 @@ Function Get-ExtensionPrerequisites{ ) $deps_dir = "$ext_dir\$extension-vc$($installed.VCVersion)-$arch" $extensions_with_dependencies = ('imagick') - New-Item $deps_dir -Type Directory 2>&1 | Out-Null + New-Item $deps_dir -Type Directory -Force > $null 2>&1 if($extensions_with_dependencies.Contains($extension)) { Install-PhpExtensionPrerequisite -Extension $extension -InstallPath $deps_dir -PhpPath $php_dir } @@ -192,6 +192,7 @@ Function Add-Extension { } default { $deps_dir = Get-ExtensionPrerequisites $extension + Enable-ExtensionDependencies $extension Enable-PhpExtension -Extension $extension_info.Handle -Path $php_dir Set-ExtensionPrerequisites $deps_dir Add-Log $tick $extension "Enabled" @@ -214,8 +215,35 @@ Function Add-Extension { } } -# Function to remove PHP extensions. -Function Remove-Extension() { +# Function to get a map of extensions and their dependent shared extensions. +Function Get-ExtensionMap { + php -d'error_reporting=0' $dist\..\src\scripts\ext\extension_map.php +} + +# Function to enable extension dependencies which are also extensions. +Function Enable-ExtensionDependencies { + Param ( + [Parameter(Position = 0, Mandatory = $true)] + [ValidateNotNull()] + [ValidateLength(1, [int]::MaxValue)] + [string] + $extension + ) + if (-not(Test-Path $env:TEMP\map.orig)) { + Get-ExtensionMap | Set-Content -Path $env:TEMP\map.orig + } + $entry = findstr /r "$extension`:.*" $env:TEMP\map.orig + if($entry) { + $entry.split(':')[1].trim().split(' ') | ForEach-Object { + if (-not(php -m | findstr -i $_)) { + Enable-PhpExtension -Extension $_ -Path $php_dir + } + } + } +} + +# Function to disable dependent extensions. +Function Disable-DependentExtensions() { Param ( [Parameter(Position = 0, Mandatory = $true)] [ValidateNotNull()] @@ -223,21 +251,68 @@ Function Remove-Extension() { [string] $extension ) + Get-ExtensionMap | Select-String -Pattern ".*:.*\s$extension(\s|$)" | ForEach-Object { + $dependent = $_.Matches[0].Value.split(':')[0]; + Disable-ExtensionHelper -Extension $dependent -DisableDependents + Add-Log $tick ":$extension" "Disabled $dependent as it depends on $extension" + } +} + +# Helper function to disable an extension. +Function Disable-ExtensionHelper() { + Param ( + [Parameter(Position = 0, Mandatory = $true)] + [ValidateNotNull()] + [ValidateLength(1, [int]::MaxValue)] + [string] + $extension, + [switch] $DisableDependents + ) + if($DisableDependents) { + Disable-DependentExtensions $extension + } + Disable-PhpExtension -Extension $extension -Path $php_dir +} + +# Function to disable an extension. +Function Disable-Extension() { + Param ( + [Parameter(Position = 0, Mandatory = $true)] + [ValidateNotNull()] + [ValidateLength(1, [int]::MaxValue)] + [string] + $extension, + [Parameter(Position = 1, Mandatory = $false)] + [ValidateNotNull()] + [ValidateLength(1, [int]::MaxValue)] + [string] + $DisableDependents + ) if(php -m | findstr -i $extension) { - try { - Disable-PhpExtension $extension $php_dir - if (Test-Path $ext_dir\php_$extension.dll) { - Remove-Item $ext_dir\php_$extension.dll + if(Test-Path $ext_dir\php_$extension.dll) { + try { + $params = @{ Extension = $extension; DisableDependents = ($DisableDependents -ne 'false') } + Disable-ExtensionHelper @params + Add-Log $tick ":$extension" "Disabled" + } catch { + Add-Log $cross ":$extension" "Could not disable $extension on PHP $($installed.FullVersion)" } - Add-Log $tick ":$extension" "Removed" - } catch { - Add-Log $cross ":$extension" "Could not remove $extension on PHP $($installed.FullVersion)" + } else { + Add-Log $cross ":$extension" "Could not disable $extension on PHP $($installed.FullVersion) as it not a shared extension" } + } elseif(Test-Path $ext_dir\php_$extension.dll) { + Add-Log $tick ":$extension" "Disabled" } else { Add-Log $tick ":$extension" "Could not find $extension on PHP $($installed.FullVersion)" } } +# Function to disable shared extensions. +Function Disable-AllShared() { + (Get-Content $php_dir\php.ini) | Where-Object {$_ -notmatch '^(zend_)?extension\s*='} | Set-Content $php_dir\php.ini + Add-Log $tick "none" "Disabled all shared extensions" +} + # Function to configure composer. Function Edit-ComposerConfig() { Param( @@ -414,7 +489,7 @@ if($env:RUNNER -eq 'self-hosted') { $ext_dir = "$php_dir\ext" $cert_source='Curl' Get-CleanPSProfile >$null 2>&1 - New-Item $bin_dir -Type Directory 2>&1 | Out-Null + New-Item $bin_dir -Type Directory -Force > $null 2>&1 Add-Path -PathItem $bin_dir if($version -lt 5.6) { Add-Log $cross "PHP" "PHP $version is not supported on self-hosted runner" @@ -424,7 +499,7 @@ if($env:RUNNER -eq 'self-hosted') { if ((Get-InstalledModule).Name -notcontains 'VcRedist') { Install-Module -Name VcRedist -Force } - New-Item $php_dir -Type Directory 2>&1 | Out-Null + New-Item $php_dir -Type Directory -Force > $null 2>&1 Add-Path -PathItem $php_dir setx PHPROOT $php_dir >$null 2>&1 } else { @@ -457,13 +532,14 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version try { if ($version -match $nightly_versions) { Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1 - & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir > $null 2>&1 + & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1 $extra_version = " ($(Get-Content $php_dir\COMMIT))" } else { Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni Production -Force > $null 2>&1 } } catch { } } else { + Set-PhpIniKey -Key 'extension_dir' -Value $ext_dir -Path $php_dir if($version -match $jit_versions) { ('opcache.enable=1', 'opcache.jit_buffer_size=256M', 'opcache.jit=1235') | ForEach-Object { $p=$_.split('='); Set-PhpIniKey -Key $p[0] -Value $p[1] -Path $php_dir } } @@ -489,6 +565,6 @@ if($version -lt "5.5") { Enable-PhpExtension -Extension $enable_extensions -Path $php_dir Update-PhpCAInfo -Path $php_dir -Source $cert_source Copy-Item -Path $dist\..\src\configs\*.json -Destination $env:RUNNER_TOOL_CACHE -New-Item -ItemType Directory -Path $composer_bin -Force 2>&1 | Out-Null +New-Item -ItemType Directory -Path $composer_bin -Force > $null 2>&1 Write-Output "::set-output name=php-version::$($installed.FullVersion)" Add-Log $tick "PHP" "$status PHP $($installed.FullVersion)$extra_version" diff --git a/src/utils.ts b/src/utils.ts index 2f47cb81c..cd132ad94 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -102,7 +102,7 @@ export async function getManifestURL(): Promise { export async function parseVersion(version: string): Promise { const manifest = await getManifestURL(); switch (true) { - case /^(latest|\d+\.x)$/.test(version): + case /^(latest|nightly|\d+\.x)$/.test(version): return JSON.parse((await fetch(manifest))['data'])[version]; default: switch (true) { @@ -280,18 +280,21 @@ export async function extensionArray( case ' ': return []; default: - return extension_csv - .split(',') - .map(function (extension: string) { - if (/.+-.+\/.+@.+/.test(extension)) { - return extension; - } - return extension - .trim() - .toLowerCase() - .replace(/^php[-_]/, ''); - }) - .filter(Boolean); + return [ + extension_csv.match(/(^|,\s?)none(\s?,|$)/) ? 'none' : '', + ...extension_csv + .split(',') + + .map(function (extension: string) { + if (/.+-.+\/.+@.+/.test(extension)) { + return extension; + } + return extension + .trim() + .toLowerCase() + .replace(/^(:)?(php[-_]|none|zend )/, '$1'); + }) + ].filter(Boolean); } } diff --git a/tsconfig.json b/tsconfig.json index 1cc91ce18..eeeed16ff 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "declaration": true, "esModuleInterop": true, "lib": [ "ES2020"