diff --git a/.github/files/generate-ci-matrix.php b/.github/files/generate-ci-matrix.php index ec6a78d448da2..d852c39f0c0f8 100755 --- a/.github/files/generate-ci-matrix.php +++ b/.github/files/generate-ci-matrix.php @@ -61,6 +61,15 @@ 'timeout' => 15, // 2021-01-18: Successful runs seem to take ~8 minutes for PHP 5.6 and for the 7.4 master run, ~5.5-6 for 7.x and 8.0. ); } +// Merge this into the above once we decide PHP 8.1 is stable and WP latest works with 8.1. +$matrix[] = array( + 'name' => 'PHP tests: PHP 8.1 WP master', + 'script' => 'test-php', + 'php' => '8.1', + 'wp' => 'master', + 'timeout' => 15, + 'experimental' => true, +); foreach ( array( 'previous', 'master' ) as $wp ) { $matrix[] = array( 'name' => "PHP tests: PHP {$versions['PHP_VERSION']} WP $wp", diff --git a/.github/files/phpcompatibility-dev-phpcs.xml b/.github/files/phpcompatibility-dev-phpcs.xml index 048ce00786211..fb68d5e4ea30d 100644 --- a/.github/files/phpcompatibility-dev-phpcs.xml +++ b/.github/files/phpcompatibility-dev-phpcs.xml @@ -7,6 +7,8 @@ + + diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index d97f5f05ede42..d6f7b3e46b35b 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -8,6 +8,13 @@ on: - 'tools/docker/config/*' - '.github/versions.sh' - '.github/workflows/build-docker.yml' + pull_request: + paths: + - 'tools/docker/Dockerfile' + - 'tools/docker/bin/run.sh' + - 'tools/docker/config/*' + - '.github/versions.sh' + - '.github/workflows/build-docker.yml' concurrency: group: build-docker-${{ github.event_name }}-${{ github.ref }} cancel-in-progress: true @@ -19,11 +26,19 @@ jobs: permissions: packages: write contents: read - timeout-minutes: 20 # 2021-10-14: Test run took 5 minutes, but there's lots of downloading involved. + timeout-minutes: 60 # 2021-10-26: Build for arm64 is S-L-O-W. Sigh. steps: - uses: actions/checkout@v2 + - name: Set up qemu + uses: docker/setup-qemu-action@v1 + with: + platforms: arm64 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Log in to Docker Hub uses: docker/login-action@v1 with: @@ -46,16 +61,25 @@ jobs: echo "::set-output name=node-version::$NODE_VERSION" echo "::set-output name=pnpm-version::$PNPM_VERSION" + # We're not git-tagging for the env. Just tag all master builds as latest. + if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then + echo "::set-output name=tags::type=raw,latest" + echo "::set-output name=images::automattic/jetpack-wordpress-dev%0Aghcr.io/automattic/jetpack-wordpress-dev" + elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then + echo "::set-output name=tags::type=ref,event=pr" + echo "::set-output name=images::ghcr.io/automattic/jetpack-wordpress-dev" + else + echo "Unknown GITHUB_EVENT_NAME $GITHUB_EVENT_NAME" + exit 1 + fi + - name: Extract Docker metadata id: meta uses: docker/metadata-action@v3 with: - # We're not git-tagging for the env. Just tag all builds as latest. - tags: | - type=raw,latest - images: | - automattic/jetpack-wordpress-dev - ghcr.io/automattic/jetpack-wordpress-dev + flavor: latest=false + tags: ${{ steps.buildargs.outputs.tags }} + images: ${{ steps.buildargs.outputs.images }} labels: | org.opencontainers.image.title=Jetpack Development Environment org.opencontainers.image.description=Unified environment for developing in the Jetpack Monorepo using Docker containers. @@ -65,6 +89,7 @@ jobs: uses: docker/build-push-action@v2 with: context: tools/docker + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index f34e8eda371b8..a26c37c51d6c9 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -161,7 +161,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ '5.6', '7.0', '7.4', '8.0' ] + php-versions: [ '5.6', '7.0', '7.4', '8.0', '8.1' ] experimental: [ false ] steps: diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 540e5532add48..26b8c6341050f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -90,6 +90,7 @@ jobs: - name: Run project tests env: + EXPERIMENTAL: ${{ matrix.experimental && 'true' || 'false' }} CHANGED: ${{ steps.changed.outputs.projects }} run: | EXIT=0 @@ -109,7 +110,7 @@ jobs: if [[ "$WP_BRANCH" != 'none' ]]; then DIR="/tmp/wordpress-$WP_BRANCH/src/wp-content/$SLUG" fi - elif [[ "$WP_BRANCH" != 'latest' && "$WP_BRANCH" != 'none' ]]; then + elif [[ "$WP_BRANCH" != 'latest' && "$WP_BRANCH" != 'none' && "$EXPERIMENTAL" != "true" ]]; then echo "Skipping $SLUG, only plugins run for WP_BRANCH = $WP_BRANCH" continue fi diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 27d2d39d6d63b..5c8b8ea16232c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -128,8 +128,8 @@ importers: projects/js-packages/connection: specifiers: - '@automattic/jetpack-api': workspace:^0.5.0-alpha - '@automattic/jetpack-components': workspace:^0.4.0-alpha + '@automattic/jetpack-api': workspace:^0.5.0 + '@automattic/jetpack-components': workspace:^0.4.1-alpha '@wordpress/base-styles': 4.0.2 '@wordpress/browserslist-config': 4.1.0 '@wordpress/components': 19.0.0 @@ -180,8 +180,8 @@ importers: projects/js-packages/idc: specifiers: - '@automattic/jetpack-api': workspace:^0.5.0-alpha - '@automattic/jetpack-components': workspace:^0.4.0-alpha + '@automattic/jetpack-api': workspace:^0.5.0 + '@automattic/jetpack-components': workspace:^0.4.1-alpha '@wordpress/base-styles': 4.0.2 '@wordpress/components': 19.0.0 '@wordpress/compose': 5.0.4 @@ -214,7 +214,7 @@ importers: projects/js-packages/storybook: specifiers: '@automattic/jetpack-base-styles': workspace:^0.1.0-alpha - '@automattic/jetpack-components': workspace:^0.4.0-alpha + '@automattic/jetpack-components': workspace:^0.4.1-alpha '@babel/core': 7.15.0 '@babel/plugin-syntax-jsx': 7.14.5 '@babel/runtime-corejs3': 7.15.3 @@ -227,14 +227,14 @@ importers: '@emotion/react': 11.4.1 '@emotion/styled': 11.3.0 '@emotion/utils': 1.0.0 - '@storybook/addon-a11y': 6.3.10 - '@storybook/addon-docs': 6.3.10 - '@storybook/addon-essentials': 6.3.11 - '@storybook/addon-storysource': 6.3.10 - '@storybook/addon-viewport': 6.3.10 - '@storybook/builder-webpack5': 6.3.10 - '@storybook/manager-webpack5': 6.3.10 - '@storybook/react': 6.3.10 + '@storybook/addon-a11y': 6.3.12 + '@storybook/addon-docs': 6.3.12 + '@storybook/addon-essentials': 6.3.12 + '@storybook/addon-storysource': 6.3.12 + '@storybook/addon-viewport': 6.3.12 + '@storybook/builder-webpack5': 6.3.12 + '@storybook/manager-webpack5': 6.3.12 + '@storybook/react': 6.3.12 '@wordpress/babel-preset-default': 6.3.4 '@wordpress/block-editor': 7.0.4 '@wordpress/block-library': 6.0.2 @@ -264,14 +264,14 @@ importers: '@emotion/react': 11.4.1_@babel+core@7.15.0+react@17.0.2 '@emotion/styled': 11.3.0_243922119d1aaff351f43c457f6915e2 '@emotion/utils': 1.0.0 - '@storybook/addon-a11y': 6.3.10_react@17.0.2 - '@storybook/addon-docs': 6.3.10_7c6f67aeb42a0c19bb3de6799faed316 - '@storybook/addon-essentials': 6.3.11_8f5f380c76da2883070f870cd0b14c8c - '@storybook/addon-storysource': 6.3.10_react@17.0.2 - '@storybook/addon-viewport': 6.3.10_react@17.0.2 - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/manager-webpack5': 6.3.10_react@17.0.2 - '@storybook/react': 6.3.10_f4a38cc7593e894a547559a330965df4 + '@storybook/addon-a11y': 6.3.12_react@17.0.2 + '@storybook/addon-docs': 6.3.12_e57664fdc1545aae962ca8eb275c4d02 + '@storybook/addon-essentials': 6.3.12_d66c12973352286b84428c59087cd878 + '@storybook/addon-storysource': 6.3.12_react@17.0.2 + '@storybook/addon-viewport': 6.3.12_react@17.0.2 + '@storybook/builder-webpack5': 6.3.12_react@17.0.2 + '@storybook/manager-webpack5': 6.3.12_react@17.0.2 + '@storybook/react': 6.3.12_2ded6113cfb9f025b1e49a903df4aa11 '@wordpress/babel-preset-default': 6.3.4 '@wordpress/block-editor': 7.0.4_@babel+core@7.15.0+react@17.0.2 '@wordpress/block-library': 6.0.2_@babel+core@7.15.0+react@17.0.2 @@ -293,9 +293,9 @@ importers: projects/packages/connection-ui: specifiers: '@automattic/calypso-build': 9.0.0 - '@automattic/jetpack-api': workspace:^0.5.0-alpha - '@automattic/jetpack-connection': workspace:^0.8.0-alpha - '@automattic/jetpack-idc': workspace:^0.4.0-alpha + '@automattic/jetpack-api': workspace:^0.5.0 + '@automattic/jetpack-connection': workspace:^0.8.1-alpha + '@automattic/jetpack-idc': workspace:^0.4.1-alpha '@babel/core': 7.15.0 '@babel/helper-module-imports': 7.14.5 '@babel/preset-env': 7.15.0 @@ -406,9 +406,9 @@ importers: projects/plugins/backup: specifiers: '@automattic/calypso-build': 9.0.0 - '@automattic/jetpack-api': workspace:^0.5.0-alpha - '@automattic/jetpack-components': workspace:^0.4.0-alpha - '@automattic/jetpack-connection': workspace:^0.8.0-alpha + '@automattic/jetpack-api': workspace:^0.5.0 + '@automattic/jetpack-components': workspace:^0.4.1-alpha + '@automattic/jetpack-connection': workspace:^0.8.1-alpha '@babel/core': 7.15.0 '@babel/helper-module-imports': 7.14.5 '@babel/preset-env': 7.15.0 @@ -537,9 +537,9 @@ importers: '@automattic/components': 1.0.0-alpha.3 '@automattic/format-currency': 1.0.0-alpha.0 '@automattic/jetpack-analytics': workspace:^0.1.2 - '@automattic/jetpack-api': workspace:^0.5.0-alpha - '@automattic/jetpack-components': workspace:^0.4.0-alpha - '@automattic/jetpack-connection': workspace:^0.8.0-alpha + '@automattic/jetpack-api': workspace:^0.5.0 + '@automattic/jetpack-components': workspace:^0.4.1-alpha + '@automattic/jetpack-connection': workspace:^0.8.1-alpha '@automattic/popup-monitor': 1.0.0 '@automattic/request-external-access': 1.0.0 '@automattic/social-previews': 1.1.1 @@ -5026,8 +5026,8 @@ packages: - utf-8-validate dev: true - /@storybook/addon-a11y/6.3.10_react@17.0.2: - resolution: {integrity: sha512-EYDTuGIpyFFE/9yah0R6c8+4fTb7ibf5LHb2hh9k++ZOMJbt8SmSSV3WVvt+uvtmN8LZgMvmAfJC8REk1UV+Lg==} + /@storybook/addon-a11y/6.3.12_react@17.0.2: + resolution: {integrity: sha512-q1NdRHFJV6sLEEJw0hatCc5ZIthELqM/AWdrEWDyhcJNyiq7Tq4nKqQBMTQSYwHiUAmxVgw7i4oa1vM2M51/3g==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5037,14 +5037,14 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/channels': 6.3.10 - '@storybook/client-api': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/components': 6.3.10_react@17.0.2 - '@storybook/core-events': 6.3.10 - '@storybook/theming': 6.3.10_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/channels': 6.3.12 + '@storybook/client-api': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/core-events': 6.3.12 + '@storybook/theming': 6.3.12_react@17.0.2 axe-core: 4.3.3 core-js: 3.18.0 global: 4.4.0 @@ -5058,8 +5058,8 @@ packages: - '@types/react' dev: true - /@storybook/addon-actions/6.3.11_react@17.0.2: - resolution: {integrity: sha512-omNZhA97wsoXQpDDYqLhVyv28DKVUZ/LEmqRY823jv1VM72DAh56v24gJXEUnN8jBZHTaCBGOAguzbLX81tyVA==} + /@storybook/addon-actions/6.3.12_react@17.0.2: + resolution: {integrity: sha512-mzuN4Ano4eyicwycM2PueGzzUCAEzt9/6vyptWEIVJu0sjK0J9KtBRlqFi1xGQxmCfimDR/n/vWBBkc7fp2uJA==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5069,12 +5069,12 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/client-api': 6.3.11_react@17.0.2 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/core-events': 6.3.11 - '@storybook/theming': 6.3.11_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/client-api': 6.3.12_react@17.0.2 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/core-events': 6.3.12 + '@storybook/theming': 6.3.12_react@17.0.2 core-js: 3.18.0 fast-deep-equal: 3.1.3 global: 4.4.0 @@ -5091,8 +5091,8 @@ packages: - '@types/react' dev: true - /@storybook/addon-backgrounds/6.3.11_react@17.0.2: - resolution: {integrity: sha512-nlZHmGskd58A/wcLqxD3ZDKRjQR1ahTrUQtm8P4IjSU6py/0OFdg43MJH1byMhHkCBatRNKah/MfoPI0Mua5lw==} + /@storybook/addon-backgrounds/6.3.12_react@17.0.2: + resolution: {integrity: sha512-51cHBx0HV7K/oRofJ/1pE05qti6sciIo8m4iPred1OezXIrJ/ckzP+gApdaUdzgcLAr6/MXQWLk0sJuImClQ6w==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5102,12 +5102,12 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/client-logger': 6.3.11 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/core-events': 6.3.11 - '@storybook/theming': 6.3.11_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/core-events': 6.3.12 + '@storybook/theming': 6.3.12_react@17.0.2 core-js: 3.18.0 global: 4.4.0 memoizerific: 1.11.3 @@ -5119,136 +5119,37 @@ packages: - '@types/react' dev: true - /@storybook/addon-controls/6.3.11_react@17.0.2: - resolution: {integrity: sha512-ShXwUqfQQeU6D79zoYNfiMGLK3JIUDVcuodjZ28sWPpSD55JhRVqA8NSNNU3YfdvVhvCSXHkQ4SdSeaDllm0aA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/client-api': 6.3.11_react@17.0.2 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/node-logger': 6.3.11 - '@storybook/theming': 6.3.11_react@17.0.2 - core-js: 3.18.0 - react: 17.0.2 - ts-dedent: 2.2.0 - transitivePeerDependencies: - - '@types/react' - dev: true - - /@storybook/addon-docs/6.3.10_7c6f67aeb42a0c19bb3de6799faed316: - resolution: {integrity: sha512-1JMl2E01sUwYlHgc2l+n1MDMSHbZNDPb4/DRpw2p4YZ8VSSOprA4Z4uHmFjabxyfnkv3Sz5isRVeaMqJzHMjdA==} + /@storybook/addon-controls/6.3.12_react@17.0.2: + resolution: {integrity: sha512-WO/PbygE4sDg3BbstJ49q0uM3Xu5Nw4lnHR5N4hXSvRAulZt1d1nhphRTHjfX+CW+uBcfzkq9bksm6nKuwmOyw==} peerDependencies: - '@storybook/angular': 6.3.10 - '@storybook/vue': 6.3.10 - '@storybook/vue3': 6.3.10 - '@storybook/web-components': 6.3.10 - lit: ^2.0.0-rc.1 - lit-html: ^1.4.1 || ^2.0.0-rc.3 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 - svelte: ^3.31.2 - sveltedoc-parser: ^4.1.0 - vue: ^2.6.10 || ^3.0.0 - webpack: '*' peerDependenciesMeta: - '@storybook/angular': - optional: true - '@storybook/vue': - optional: true - '@storybook/vue3': - optional: true - '@storybook/web-components': - optional: true - lit: - optional: true - lit-html: - optional: true react: optional: true react-dom: optional: true - svelte: - optional: true - sveltedoc-parser: - optional: true - vue: - optional: true - webpack: - optional: true dependencies: - '@babel/core': 7.15.5 - '@babel/generator': 7.15.4 - '@babel/parser': 7.15.7 - '@babel/plugin-transform-react-jsx': 7.14.9_@babel+core@7.15.5 - '@babel/preset-env': 7.15.6_@babel+core@7.15.5 - '@jest/transform': 26.6.2 - '@mdx-js/loader': 1.6.22_react@17.0.2 - '@mdx-js/mdx': 1.6.22 - '@mdx-js/react': 1.6.22_react@17.0.2 - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.12_react@17.0.2 - '@storybook/client-api': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/components': 6.3.10_react@17.0.2 - '@storybook/core': 6.3.10_3055788d6b7c624e1f8a9cc831357cab - '@storybook/core-events': 6.3.10 - '@storybook/csf': 0.0.1 - '@storybook/csf-tools': 6.3.10_@babel+core@7.15.5 - '@storybook/node-logger': 6.3.10 - '@storybook/postinstall': 6.3.10 - '@storybook/source-loader': 6.3.10_react@17.0.2 - '@storybook/theming': 6.3.10_react@17.0.2 - acorn: 7.4.1 - acorn-jsx: 5.3.2_acorn@7.4.1 - acorn-walk: 7.2.0 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/client-api': 6.3.12_react@17.0.2 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/node-logger': 6.3.12 + '@storybook/theming': 6.3.12_react@17.0.2 core-js: 3.18.0 - doctrine: 3.0.0 - escodegen: 2.0.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - html-tags: 3.1.0 - js-string-escape: 1.0.1 - loader-utils: 2.0.0 - lodash: 4.17.21 - p-limit: 3.1.0 - prettier: 2.2.1 - prop-types: 15.7.2 react: 17.0.2 - react-element-to-jsx-string: 14.3.2_react@17.0.2 - regenerator-runtime: 0.13.9 - remark-external-links: 8.0.0 - remark-slug: 6.1.0 ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 transitivePeerDependencies: - - '@storybook/builder-webpack5' - - '@storybook/manager-webpack5' - - '@swc/core' - '@types/react' - - esbuild - - supports-color - - typescript - - uglify-js - - webpack-cli dev: true - /@storybook/addon-docs/6.3.11_7c6f67aeb42a0c19bb3de6799faed316: - resolution: {integrity: sha512-E6iHMDicO9OiTUOjj4dzGGtLkkaBWSaIgOebTl8rNJQP9QDlQjjd0qOwYuGOELShlGQ169PO/95GwgI4c2+VIg==} + /@storybook/addon-docs/6.3.12_e57664fdc1545aae962ca8eb275c4d02: + resolution: {integrity: sha512-iUrqJBMTOn2PgN8AWNQkfxfIPkh8pEg27t8UndMgfOpeGK/VWGw2UEifnA82flvntcilT4McxmVbRHkeBY9K5A==} peerDependencies: - '@storybook/angular': 6.3.11 - '@storybook/vue': 6.3.11 - '@storybook/vue3': 6.3.11 - '@storybook/web-components': 6.3.11 + '@storybook/angular': 6.3.12 + '@storybook/vue': 6.3.12 + '@storybook/vue3': 6.3.12 + '@storybook/web-components': 6.3.12 lit: ^2.0.0-rc.1 lit-html: ^1.4.1 || ^2.0.0-rc.3 react: ^16.8.0 || ^17.0.0 @@ -5292,20 +5193,20 @@ packages: '@mdx-js/loader': 1.6.22_react@17.0.2 '@mdx-js/mdx': 1.6.22 '@mdx-js/react': 1.6.22_react@17.0.2 - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.12_react@17.0.2 - '@storybook/client-api': 6.3.11_react@17.0.2 - '@storybook/client-logger': 6.3.11 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/core': 6.3.11_3055788d6b7c624e1f8a9cc831357cab - '@storybook/core-events': 6.3.11 + '@storybook/client-api': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/core': 6.3.12_e9f53a5d0ca8aef7ac47272b2ef359e4 + '@storybook/core-events': 6.3.12 '@storybook/csf': 0.0.1 - '@storybook/csf-tools': 6.3.11_@babel+core@7.15.5 - '@storybook/node-logger': 6.3.11 - '@storybook/postinstall': 6.3.11 - '@storybook/source-loader': 6.3.11_react@17.0.2 - '@storybook/theming': 6.3.11_react@17.0.2 + '@storybook/csf-tools': 6.3.12_@babel+core@7.15.5 + '@storybook/node-logger': 6.3.12 + '@storybook/postinstall': 6.3.12 + '@storybook/source-loader': 6.3.12_react@17.0.2 + '@storybook/theming': 6.3.12_react@17.0.2 acorn: 7.4.1 acorn-jsx: 5.3.2_acorn@7.4.1 acorn-walk: 7.2.0 @@ -5341,12 +5242,12 @@ packages: - webpack-cli dev: true - /@storybook/addon-essentials/6.3.11_8f5f380c76da2883070f870cd0b14c8c: - resolution: {integrity: sha512-KX3bHy/xletqcQqGp1YEQ/hvjtc6hsXLwMHHOsSLFgTbWDF/Zcb8lBhKIYvwqlbFBDhtfg/YT/qgnucceG2UsA==} + /@storybook/addon-essentials/6.3.12_d66c12973352286b84428c59087cd878: + resolution: {integrity: sha512-PK0pPE0xkq00kcbBcFwu/5JGHQTu4GvLIHfwwlEGx6GWNQ05l6Q+1Z4nE7xJGv2PSseSx3CKcjn8qykNLe6O6g==} peerDependencies: '@babel/core': ^7.9.6 - '@storybook/vue': 6.3.11 - '@storybook/web-components': 6.3.11 + '@storybook/vue': 6.3.12 + '@storybook/web-components': 6.3.12 babel-loader: ^8.0.0 lit-html: ^1.4.1 || ^2.0.0-rc.3 react: ^16.8.0 || ^17.0.0 @@ -5367,16 +5268,16 @@ packages: optional: true dependencies: '@babel/core': 7.15.0 - '@storybook/addon-actions': 6.3.11_react@17.0.2 - '@storybook/addon-backgrounds': 6.3.11_react@17.0.2 - '@storybook/addon-controls': 6.3.11_react@17.0.2 - '@storybook/addon-docs': 6.3.11_7c6f67aeb42a0c19bb3de6799faed316 - '@storybook/addon-measure': 2.0.0_0eefb687bdad5bab21f5e3ed8f398c21 - '@storybook/addon-toolbars': 6.3.11_react@17.0.2 - '@storybook/addon-viewport': 6.3.11_react@17.0.2 - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/node-logger': 6.3.11 + '@storybook/addon-actions': 6.3.12_react@17.0.2 + '@storybook/addon-backgrounds': 6.3.12_react@17.0.2 + '@storybook/addon-controls': 6.3.12_react@17.0.2 + '@storybook/addon-docs': 6.3.12_e57664fdc1545aae962ca8eb275c4d02 + '@storybook/addon-measure': 2.0.0_804a70a3de321f47d1c8455e7264bf88 + '@storybook/addon-toolbars': 6.3.12_react@17.0.2 + '@storybook/addon-viewport': 6.3.12_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/node-logger': 6.3.12 core-js: 3.18.0 react: 17.0.2 regenerator-runtime: 0.13.9 @@ -5404,7 +5305,7 @@ packages: - webpack-cli dev: true - /@storybook/addon-measure/2.0.0_0eefb687bdad5bab21f5e3ed8f398c21: + /@storybook/addon-measure/2.0.0_804a70a3de321f47d1c8455e7264bf88: resolution: {integrity: sha512-ZhdT++cX+L9LwjhGYggvYUUVQH/MGn2rwbrAwCMzA/f2QTFvkjxzX8nDgMxIhaLCDC+gHIxfJG2wrWN0jkBr3g==} peerDependencies: '@storybook/addons': ^6.3.0 @@ -5420,13 +5321,13 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 react: 17.0.2 dev: true - /@storybook/addon-storysource/6.3.10_react@17.0.2: - resolution: {integrity: sha512-ULEceW4IOEMlEFzfKEvl13ocbuabj2ntevs8xw9DbgdJXjHDZI9d2ORAWlq4LCxjxEkSKJNGZSIrDoDIzfEQNA==} + /@storybook/addon-storysource/6.3.12_react@17.0.2: + resolution: {integrity: sha512-5ql0NOmpA68qfIiBgW04u1YKbZyvixtDzR2z0HggYxubN2KA6uHWtH2ppxMKq2LQryJzYWXqnE5vThEoadhsdg==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5436,13 +5337,13 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/components': 6.3.10_react@17.0.2 - '@storybook/router': 6.3.10_react@17.0.2 - '@storybook/source-loader': 6.3.10_react@17.0.2 - '@storybook/theming': 6.3.10_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/router': 6.3.12_react@17.0.2 + '@storybook/source-loader': 6.3.12_react@17.0.2 + '@storybook/theming': 6.3.12_react@17.0.2 core-js: 3.18.0 estraverse: 5.2.0 loader-utils: 2.0.0 @@ -5455,31 +5356,8 @@ packages: - '@types/react' dev: true - /@storybook/addon-toolbars/6.3.11_react@17.0.2: - resolution: {integrity: sha512-FvKwX/nqdUSy1g0luUfm55nocQHwvOokvsI/D4MSJwyQ9IoYaJUyu0Bwhre3xhyWqg3eTAFz6U9LheAtA4QpXw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/client-api': 6.3.11_react@17.0.2 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/theming': 6.3.11_react@17.0.2 - core-js: 3.18.0 - react: 17.0.2 - regenerator-runtime: 0.13.9 - transitivePeerDependencies: - - '@types/react' - dev: true - - /@storybook/addon-viewport/6.3.10_react@17.0.2: - resolution: {integrity: sha512-KyR7yajCD1bbiRZthgxYC/7iy3NWp9k6QKR18fq/hEKbNWNoiN00ddFfFJ3sizJUGKourGOoIbSHZlwqI6rtmg==} + /@storybook/addon-toolbars/6.3.12_react@17.0.2: + resolution: {integrity: sha512-8GvP6zmAfLPRnYRARSaIwLkQClLIRbflRh4HZoFk6IMjQLXZb4NL3JS5OLFKG+HRMMU2UQzfoSDqjI7k7ptyRw==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5489,24 +5367,20 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/components': 6.3.10_react@17.0.2 - '@storybook/core-events': 6.3.10 - '@storybook/theming': 6.3.10_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/client-api': 6.3.12_react@17.0.2 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/theming': 6.3.12_react@17.0.2 core-js: 3.18.0 - global: 4.4.0 - memoizerific: 1.11.3 - prop-types: 15.7.2 react: 17.0.2 regenerator-runtime: 0.13.9 transitivePeerDependencies: - '@types/react' dev: true - /@storybook/addon-viewport/6.3.11_react@17.0.2: - resolution: {integrity: sha512-j26P/S/fR9gGs9kL7SNEIIAw8UIkcBBqCgDOcH+HlphhNcQJHeuSBKZY2gOsayjoUxV6TT2tL2SlW+XWp8ys2A==} + /@storybook/addon-viewport/6.3.12_react@17.0.2: + resolution: {integrity: sha512-TRjyfm85xouOPmXxeLdEIzXLfJZZ1ePQ7p/5yphDGBHdxMU4m4qiZr8wYpUaxHsRu/UB3dKfaOyGT+ivogbnbw==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5516,12 +5390,12 @@ packages: react-dom: optional: true dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/client-logger': 6.3.11 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/core-events': 6.3.11 - '@storybook/theming': 6.3.11_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/core-events': 6.3.12 + '@storybook/theming': 6.3.12_react@17.0.2 core-js: 3.18.0 global: 4.4.0 memoizerific: 1.11.3 @@ -5532,42 +5406,6 @@ packages: - '@types/react' dev: true - /@storybook/addons/6.3.10_react@17.0.2: - resolution: {integrity: sha512-nrqyHPFGft6FhLXAB4xfebh3Xe/16574FSV3I96hyhcNwlxRs/ANLQriiDVElz3KfDqyFUIYMoskUBHZNRwWFA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/channels': 6.3.10 - '@storybook/client-logger': 6.3.10 - '@storybook/core-events': 6.3.10 - '@storybook/router': 6.3.10_react@17.0.2 - '@storybook/theming': 6.3.10_react@17.0.2 - core-js: 3.18.0 - global: 4.4.0 - react: 17.0.2 - regenerator-runtime: 0.13.9 - dev: true - - /@storybook/addons/6.3.11_react@17.0.2: - resolution: {integrity: sha512-2Y03lOwzWDRB/glISa/4luBMM5uyYhkIBixbZF9miIb2SCWRlNmom5NCnKsR18Wu6g7zI7os3aAMfKr24aSofQ==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/channels': 6.3.11 - '@storybook/client-logger': 6.3.11 - '@storybook/core-events': 6.3.11 - '@storybook/router': 6.3.11_react@17.0.2 - '@storybook/theming': 6.3.11_react@17.0.2 - core-js: 3.18.0 - global: 4.4.0 - react: 17.0.2 - regenerator-runtime: 0.13.9 - dev: true - /@storybook/addons/6.3.12_react@17.0.2: resolution: {integrity: sha512-UgoMyr7Qr0FS3ezt8u6hMEcHgyynQS9ucr5mAwZky3wpXRPFyUTmMto9r4BBUdqyUvTUj/LRKIcmLBfj+/l0Fg==} peerDependencies: @@ -5586,64 +5424,6 @@ packages: regenerator-runtime: 0.13.9 dev: true - /@storybook/api/6.3.10_react@17.0.2: - resolution: {integrity: sha512-7fB6q718UWvgFI+ZqEU0QpXr5cHHli85bTq/w7kSz1VUWjV7vVqtxE3RTbIjMbKHkIVNkVUbZDeDi+r2soK9Tw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@reach/router': 1.3.4_react@17.0.2 - '@storybook/channels': 6.3.10 - '@storybook/client-logger': 6.3.10 - '@storybook/core-events': 6.3.10 - '@storybook/csf': 0.0.1 - '@storybook/router': 6.3.10_react@17.0.2 - '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.10_react@17.0.2 - '@types/reach__router': 1.3.9 - core-js: 3.18.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - store2: 2.12.0 - telejson: 5.3.3 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - - /@storybook/api/6.3.11_react@17.0.2: - resolution: {integrity: sha512-QmgXM613zy/DPrJLVRJnALT5Rh4VWgvxrHbdLxRWGDrMHNYlm3N1KA+a6ZtIM5Zl94B3y5o0SPCSleSbnA3viA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@reach/router': 1.3.4_react@17.0.2 - '@storybook/channels': 6.3.11 - '@storybook/client-logger': 6.3.11 - '@storybook/core-events': 6.3.11 - '@storybook/csf': 0.0.1 - '@storybook/router': 6.3.11_react@17.0.2 - '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.11_react@17.0.2 - '@types/reach__router': 1.3.9 - core-js: 3.18.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - store2: 2.12.0 - telejson: 5.3.3 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - /@storybook/api/6.3.12_react@17.0.2: resolution: {integrity: sha512-LScRXUeCWEW/OP+jiooNMQICVdusv7azTmULxtm72fhkXFRiQs2CdRNTiqNg46JLLC9z95f1W+pGK66X6HiiQA==} peerDependencies: @@ -5673,8 +5453,8 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/builder-webpack5/6.3.10_react@17.0.2: - resolution: {integrity: sha512-fnDFS25dVaAapp5ECsnTPVQU0ws5Tpj/x8Lfa/wCqSmq5ia79O9pNFt5vQ+tumhjezYxSUeitI0vF1hHlQrJrg==} + /@storybook/builder-webpack5/6.3.12_react@17.0.2: + resolution: {integrity: sha512-+9uVSW2LFpdWnYKKcdH5sW1HqcKwbqyBJV46oN94ZlUw3fyZgz8TsOI+ZpWgCNqmBtXDr+X54deast9f443Mzw==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -5703,19 +5483,19 @@ packages: '@babel/preset-env': 7.15.6_@babel+core@7.15.5 '@babel/preset-react': 7.14.5_@babel+core@7.15.5 '@babel/preset-typescript': 7.15.0_@babel+core@7.15.5 - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/channel-postmessage': 6.3.10 - '@storybook/channels': 6.3.10 - '@storybook/client-api': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/components': 6.3.10_react@17.0.2 - '@storybook/core-common': 6.3.10_react@17.0.2 - '@storybook/core-events': 6.3.10 - '@storybook/node-logger': 6.3.10 - '@storybook/router': 6.3.10_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/api': 6.3.12_react@17.0.2 + '@storybook/channel-postmessage': 6.3.12 + '@storybook/channels': 6.3.12 + '@storybook/client-api': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 + '@storybook/components': 6.3.12_react@17.0.2 + '@storybook/core-common': 6.3.12_react@17.0.2 + '@storybook/core-events': 6.3.12 + '@storybook/node-logger': 6.3.12 + '@storybook/router': 6.3.12_react@17.0.2 '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.10_react@17.0.2 + '@storybook/theming': 6.3.12_react@17.0.2 '@types/node': 14.17.17 babel-loader: 8.2.2_80927b313c74087b681f254ee0e3e2fc babel-plugin-macros: 3.1.0 @@ -5749,108 +5529,8 @@ packages: - webpack-cli dev: true - /@storybook/builder-webpack5/6.3.12_react@17.0.2: - resolution: {integrity: sha512-+9uVSW2LFpdWnYKKcdH5sW1HqcKwbqyBJV46oN94ZlUw3fyZgz8TsOI+ZpWgCNqmBtXDr+X54deast9f443Mzw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@babel/core': 7.15.5 - '@babel/plugin-proposal-class-properties': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-decorators': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-proposal-export-default-from': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-nullish-coalescing-operator': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-object-rest-spread': 7.15.6_@babel+core@7.15.5 - '@babel/plugin-proposal-optional-chaining': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-private-methods': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-transform-arrow-functions': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-transform-block-scoping': 7.15.3_@babel+core@7.15.5 - '@babel/plugin-transform-classes': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-destructuring': 7.14.7_@babel+core@7.15.5 - '@babel/plugin-transform-for-of': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-parameters': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-shorthand-properties': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-transform-spread': 7.14.6_@babel+core@7.15.5 - '@babel/preset-env': 7.15.6_@babel+core@7.15.5 - '@babel/preset-react': 7.14.5_@babel+core@7.15.5 - '@babel/preset-typescript': 7.15.0_@babel+core@7.15.5 - '@storybook/addons': 6.3.12_react@17.0.2 - '@storybook/api': 6.3.12_react@17.0.2 - '@storybook/channel-postmessage': 6.3.12 - '@storybook/channels': 6.3.12 - '@storybook/client-api': 6.3.12_react@17.0.2 - '@storybook/client-logger': 6.3.12 - '@storybook/components': 6.3.12_react@17.0.2 - '@storybook/core-common': 6.3.12_react@17.0.2 - '@storybook/core-events': 6.3.12 - '@storybook/node-logger': 6.3.12 - '@storybook/router': 6.3.12_react@17.0.2 - '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.12_react@17.0.2 - '@types/node': 14.17.17 - babel-loader: 8.2.2_80927b313c74087b681f254ee0e3e2fc - babel-plugin-macros: 3.1.0 - babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.15.5 - case-sensitive-paths-webpack-plugin: 2.4.0 - core-js: 3.18.0 - css-loader: 5.2.7_webpack@5.51.1 - dotenv-webpack: 7.0.3_webpack@5.51.1 - fork-ts-checker-webpack-plugin: 6.3.3 - fs-extra: 9.1.0 - glob: 7.1.7 - glob-promise: 3.4.0_glob@7.1.7 - html-webpack-plugin: 5.3.2_webpack@5.51.1 - react: 17.0.2 - react-dev-utils: 11.0.4 - stable: 0.1.8 - style-loader: 2.0.0_webpack@5.51.1 - terser-webpack-plugin: 5.2.4_webpack@5.51.1 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - webpack-dev-middleware: 4.3.0_webpack@5.51.1 - webpack-hot-middleware: 2.25.1 - webpack-virtual-modules: 0.4.3 - transitivePeerDependencies: - - '@swc/core' - - '@types/react' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - - /@storybook/channel-postmessage/6.3.10: - resolution: {integrity: sha512-LWzT0kvluQxMBOrVb6vPoZWx6GlFhmgoFRLJPsFhFmXS1FqmWolRvqKr2aIVHj+bpqS7ocngMKY8Zg+FuKwctQ==} - dependencies: - '@storybook/channels': 6.3.10 - '@storybook/client-logger': 6.3.10 - '@storybook/core-events': 6.3.10 - core-js: 3.18.0 - global: 4.4.0 - qs: 6.10.1 - telejson: 5.3.3 - dev: true - - /@storybook/channel-postmessage/6.3.11: - resolution: {integrity: sha512-cXmDqs91CLrqPugLLVdmE6iPH0eWJ0LsO3uoYXGDIAkv+C1HJBn5VdO1/gBm/B+lpkZ++DYiZ0tRUOMKsuw8IQ==} - dependencies: - '@storybook/channels': 6.3.11 - '@storybook/client-logger': 6.3.11 - '@storybook/core-events': 6.3.11 - core-js: 3.18.0 - global: 4.4.0 - qs: 6.10.1 - telejson: 5.3.3 - dev: true - - /@storybook/channel-postmessage/6.3.12: - resolution: {integrity: sha512-Ou/2Ga3JRTZ/4sSv7ikMgUgLTeZMsXXWLXuscz4oaYhmOqAU9CrJw0G1NitwBgK/+qC83lEFSLujHkWcoQDOKg==} + /@storybook/channel-postmessage/6.3.12: + resolution: {integrity: sha512-Ou/2Ga3JRTZ/4sSv7ikMgUgLTeZMsXXWLXuscz4oaYhmOqAU9CrJw0G1NitwBgK/+qC83lEFSLujHkWcoQDOKg==} dependencies: '@storybook/channels': 6.3.12 '@storybook/client-logger': 6.3.12 @@ -5861,22 +5541,6 @@ packages: telejson: 5.3.3 dev: true - /@storybook/channels/6.3.10: - resolution: {integrity: sha512-olYxCiYjmhbCHtPe7HR1hdGYJZPuSowqVmhLbqrWMf4HFYqBkO3T7em1S+ztCvLPLKbIK6AM2JUom6ob1F8n4g==} - dependencies: - core-js: 3.18.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - - /@storybook/channels/6.3.11: - resolution: {integrity: sha512-slY3B1zRJaABrkFj2r89O0D6axQjeh6oyuJFrRZ7SoTK26ODi839LD+LwSpk40c4FoQAgT3pcJmjiFyUbBdtRg==} - dependencies: - core-js: 3.18.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - /@storybook/channels/6.3.12: resolution: {integrity: sha512-l4sA+g1PdUV8YCbgs47fIKREdEQAKNdQIZw0b7BfTvY9t0x5yfBywgQhYON/lIeiNGz2OlIuD+VUtqYfCtNSyw==} dependencies: @@ -5885,60 +5549,6 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/client-api/6.3.10_react@17.0.2: - resolution: {integrity: sha512-caqh/TJKQkKSjcBchx44+Fr5Mi9XjAmMvsIJHM2uZv6mV7KUzUqiZNIWj1gvIYeNBF9PXTWUIhEbu6xt65d0UA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/channel-postmessage': 6.3.10 - '@storybook/channels': 6.3.10 - '@storybook/client-logger': 6.3.10 - '@storybook/core-events': 6.3.10 - '@storybook/csf': 0.0.1 - '@types/qs': 6.9.7 - '@types/webpack-env': 1.16.2 - core-js: 3.18.0 - global: 4.4.0 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - stable: 0.1.8 - store2: 2.12.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - - /@storybook/client-api/6.3.11_react@17.0.2: - resolution: {integrity: sha512-YUiVZzQYaGqYCTp1Jcf7zviJSWq3no93wT8uCj2HLW7n56fa5Iwx1O29dY2lhBEGmJ3JjTPNeSrSrzoHb1AZRg==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/channel-postmessage': 6.3.11 - '@storybook/channels': 6.3.11 - '@storybook/client-logger': 6.3.11 - '@storybook/core-events': 6.3.11 - '@storybook/csf': 0.0.1 - '@types/qs': 6.9.7 - '@types/webpack-env': 1.16.2 - core-js: 3.18.0 - global: 4.4.0 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - stable: 0.1.8 - store2: 2.12.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - /@storybook/client-api/6.3.12_react@17.0.2: resolution: {integrity: sha512-xnW+lKKK2T774z+rOr9Wopt1aYTStfb86PSs9p3Fpnc2Btcftln+C3NtiHZl8Ccqft8Mz/chLGgewRui6tNI8g==} peerDependencies: @@ -5966,20 +5576,6 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/client-logger/6.3.10: - resolution: {integrity: sha512-fRwxPiwQBKHK83IJgA5VoFwbaEj9zHLdYGE1wxJXcBYP0hi5h5ZwnGkNumFDntw1xt+RUs5PsGQ16f+rzE3n+w==} - dependencies: - core-js: 3.18.0 - global: 4.4.0 - dev: true - - /@storybook/client-logger/6.3.11: - resolution: {integrity: sha512-U06IuAGZFOJYgtXH02dbNe5lHLcwsSo6JBdFLjcUP3C0WqtskoUGLA2XLUCYasl7OMB0mcLHy4GaZL4wtrW6+Q==} - dependencies: - core-js: 3.18.0 - global: 4.4.0 - dev: true - /@storybook/client-logger/6.3.12: resolution: {integrity: sha512-zNDsamZvHnuqLznDdP9dUeGgQ9TyFh4ray3t1VGO7ZqWVZ2xtVCCXjDvMnOXI2ifMpX5UsrOvshIPeE9fMBmiQ==} dependencies: @@ -5987,76 +5583,6 @@ packages: global: 4.4.0 dev: true - /@storybook/components/6.3.10_react@17.0.2: - resolution: {integrity: sha512-s9iOq0jT+h51hid4Vckmy84XAMm8aoZwD/QHpzWs4aRqrT5lqsen3jnlvqEEdEVUbMIoLPPNfOxOZsm4M/7zpQ==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@popperjs/core': 2.10.1 - '@storybook/client-logger': 6.3.10 - '@storybook/csf': 0.0.1 - '@storybook/theming': 6.3.10_react@17.0.2 - '@types/color-convert': 2.0.0 - '@types/overlayscrollbars': 1.12.1 - '@types/react-syntax-highlighter': 11.0.5 - color-convert: 2.0.1 - core-js: 3.18.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.21 - markdown-to-jsx: 7.1.3_react@17.0.2 - memoizerific: 1.11.3 - overlayscrollbars: 1.13.1 - polished: 4.1.3 - prop-types: 15.7.2 - react: 17.0.2 - react-colorful: 5.4.0_react@17.0.2 - react-popper-tooltip: 3.1.1_react@17.0.2 - react-syntax-highlighter: 13.5.3_react@17.0.2 - react-textarea-autosize: 8.3.3_react@17.0.2 - regenerator-runtime: 0.13.9 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - transitivePeerDependencies: - - '@types/react' - dev: true - - /@storybook/components/6.3.11_react@17.0.2: - resolution: {integrity: sha512-/iajr+kMXQLgXa6hr/nupcHFzdppZ4S/vdDgoyXW/L1jDeKzy5Bxzf4JjjoR/tY6jgiFRja1C1mUGFqceyb9ow==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@popperjs/core': 2.10.1 - '@storybook/client-logger': 6.3.11 - '@storybook/csf': 0.0.1 - '@storybook/theming': 6.3.11_react@17.0.2 - '@types/color-convert': 2.0.0 - '@types/overlayscrollbars': 1.12.1 - '@types/react-syntax-highlighter': 11.0.5 - color-convert: 2.0.1 - core-js: 3.18.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.21 - markdown-to-jsx: 7.1.3_react@17.0.2 - memoizerific: 1.11.3 - overlayscrollbars: 1.13.1 - polished: 4.1.3 - prop-types: 15.7.2 - react: 17.0.2 - react-colorful: 5.4.0_react@17.0.2 - react-popper-tooltip: 3.1.1_react@17.0.2 - react-syntax-highlighter: 13.5.3_react@17.0.2 - react-textarea-autosize: 8.3.3_react@17.0.2 - regenerator-runtime: 0.13.9 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - transitivePeerDependencies: - - '@types/react' - dev: true - /@storybook/components/6.3.12_react@17.0.2: resolution: {integrity: sha512-kdQt8toUjynYAxDLrJzuG7YSNL6as1wJoyzNUaCfG06YPhvIAlKo7le9tS2mThVFN5e9nbKrW3N1V1sp6ypZXQ==} peerDependencies: @@ -6092,74 +5618,6 @@ packages: - '@types/react' dev: true - /@storybook/core-client/6.3.10_react@17.0.2+webpack@5.51.1: - resolution: {integrity: sha512-UnVfFV7qvRI1o5P4lrMmp+DxEoogVYV0/QrlGJFrKotkG815e58OdVM00bQByMdbsId3Ao2TZM78uj1k2F5J7Q==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - webpack: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/channel-postmessage': 6.3.10 - '@storybook/client-api': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/core-events': 6.3.10 - '@storybook/csf': 0.0.1 - '@storybook/ui': 6.3.10_react@17.0.2 - airbnb-js-shims: 2.2.1 - ansi-to-html: 0.6.15 - core-js: 3.18.0 - global: 4.4.0 - lodash: 4.17.21 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - ts-dedent: 2.2.0 - unfetch: 4.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - transitivePeerDependencies: - - '@types/react' - dev: true - - /@storybook/core-client/6.3.11_react@17.0.2+webpack@5.51.1: - resolution: {integrity: sha512-GSVxt6ZnZPboZ0nRJ0b4+r8yL43l0uImgg6tsCwctxj/qvx4O9thh3zVfgu1i6BqG9auJoNby2dTZDaGkPLaIg==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - webpack: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/channel-postmessage': 6.3.11 - '@storybook/client-api': 6.3.11_react@17.0.2 - '@storybook/client-logger': 6.3.11 - '@storybook/core-events': 6.3.11 - '@storybook/csf': 0.0.1 - '@storybook/ui': 6.3.11_react@17.0.2 - airbnb-js-shims: 2.2.1 - ansi-to-html: 0.6.15 - core-js: 3.18.0 - global: 4.4.0 - lodash: 4.17.21 - qs: 6.10.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - ts-dedent: 2.2.0 - unfetch: 4.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - transitivePeerDependencies: - - '@types/react' - dev: true - /@storybook/core-client/6.3.12_react@17.0.2+webpack@5.51.1: resolution: {integrity: sha512-8Smd9BgZHJpAdevLKQYinwtjSyCZAuBMoetP4P5hnn53mWl0NFbrHFaAdT+yNchDLZQUbf7Y18VmIqEH+RCR5w==} peerDependencies: @@ -6194,140 +5652,6 @@ packages: - '@types/react' dev: true - /@storybook/core-common/6.3.10_react@17.0.2: - resolution: {integrity: sha512-E6jlsSPJoISF8B/AwqDZpPNOviSeJTb+ODhnWqz/R4b6hSmuGSPp7LDdOMdQAjTURAxhhjLWQen4smDwuVNzHw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@babel/core': 7.15.5 - '@babel/plugin-proposal-class-properties': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-decorators': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-proposal-export-default-from': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-nullish-coalescing-operator': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-object-rest-spread': 7.15.6_@babel+core@7.15.5 - '@babel/plugin-proposal-optional-chaining': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-private-methods': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-transform-arrow-functions': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-transform-block-scoping': 7.15.3_@babel+core@7.15.5 - '@babel/plugin-transform-classes': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-destructuring': 7.14.7_@babel+core@7.15.5 - '@babel/plugin-transform-for-of': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-parameters': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-shorthand-properties': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-transform-spread': 7.14.6_@babel+core@7.15.5 - '@babel/preset-env': 7.15.6_@babel+core@7.15.5 - '@babel/preset-react': 7.14.5_@babel+core@7.15.5 - '@babel/preset-typescript': 7.15.0_@babel+core@7.15.5 - '@babel/register': 7.15.3_@babel+core@7.15.5 - '@storybook/node-logger': 6.3.10 - '@storybook/semver': 7.3.2 - '@types/glob-base': 0.3.0 - '@types/micromatch': 4.0.2 - '@types/node': 14.17.17 - '@types/pretty-hrtime': 1.0.1 - babel-loader: 8.2.2_80927b313c74087b681f254ee0e3e2fc - babel-plugin-macros: 3.1.0 - babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.15.5 - chalk: 4.1.2 - core-js: 3.18.0 - express: 4.17.1 - file-system-cache: 1.0.5 - find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.3.3 - glob: 7.1.7 - glob-base: 0.3.0 - interpret: 2.2.0 - json5: 2.2.0 - lazy-universal-dotenv: 3.0.1 - micromatch: 4.0.4 - pkg-dir: 5.0.0 - pretty-hrtime: 1.0.3 - react: 17.0.2 - resolve-from: 5.0.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - - /@storybook/core-common/6.3.11_react@17.0.2: - resolution: {integrity: sha512-PR/TndBaItPjItoOMEYCE4rPZGF7dfuqh+SbL0pmk6yLqO5MTSPEVpLEutbKh3uYlt1mgb8cXLuTQ3ybkG5O+Q==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@babel/core': 7.15.5 - '@babel/plugin-proposal-class-properties': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-decorators': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-proposal-export-default-from': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-nullish-coalescing-operator': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-object-rest-spread': 7.15.6_@babel+core@7.15.5 - '@babel/plugin-proposal-optional-chaining': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-proposal-private-methods': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.15.5 - '@babel/plugin-transform-arrow-functions': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-transform-block-scoping': 7.15.3_@babel+core@7.15.5 - '@babel/plugin-transform-classes': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-destructuring': 7.14.7_@babel+core@7.15.5 - '@babel/plugin-transform-for-of': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-parameters': 7.15.4_@babel+core@7.15.5 - '@babel/plugin-transform-shorthand-properties': 7.14.5_@babel+core@7.15.5 - '@babel/plugin-transform-spread': 7.14.6_@babel+core@7.15.5 - '@babel/preset-env': 7.15.6_@babel+core@7.15.5 - '@babel/preset-react': 7.14.5_@babel+core@7.15.5 - '@babel/preset-typescript': 7.15.0_@babel+core@7.15.5 - '@babel/register': 7.15.3_@babel+core@7.15.5 - '@storybook/node-logger': 6.3.11 - '@storybook/semver': 7.3.2 - '@types/glob-base': 0.3.0 - '@types/micromatch': 4.0.2 - '@types/node': 14.17.17 - '@types/pretty-hrtime': 1.0.1 - babel-loader: 8.2.2_80927b313c74087b681f254ee0e3e2fc - babel-plugin-macros: 3.1.0 - babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.15.5 - chalk: 4.1.2 - core-js: 3.18.0 - express: 4.17.1 - file-system-cache: 1.0.5 - find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.3.3 - glob: 7.1.7 - glob-base: 0.3.0 - interpret: 2.2.0 - json5: 2.2.0 - lazy-universal-dotenv: 3.0.1 - micromatch: 4.0.4 - pkg-dir: 5.0.0 - pretty-hrtime: 1.0.3 - react: 17.0.2 - resolve-from: 5.0.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - /@storybook/core-common/6.3.12_react@17.0.2: resolution: {integrity: sha512-xlHs2QXELq/moB4MuXjYOczaxU64BIseHsnFBLyboJYN6Yso3qihW5RB7cuJlGohkjb4JwY74dvfT4Ww66rkBA==} peerDependencies: @@ -6395,29 +5719,17 @@ packages: - webpack-cli dev: true - /@storybook/core-events/6.3.10: - resolution: {integrity: sha512-bw3HuqKIMDnEebVf2DG+TdX21D7z7LGFvr5rehNDnUTdnM9+pVLlZZfGkUU6LMRbIzr27CI5dXWdPRTA5kQIZg==} - dependencies: - core-js: 3.18.0 - dev: true - - /@storybook/core-events/6.3.11: - resolution: {integrity: sha512-wuWZsw2VB2qSuac+40SaeaZ40/4sQhYSnLSN+l944G1kkjZwZcVc1nBTaYBt9H7uH+INkmGblDbGNnme71KCjg==} - dependencies: - core-js: 3.18.0 - dev: true - /@storybook/core-events/6.3.12: resolution: {integrity: sha512-SXfD7xUUMazaeFkB92qOTUV8Y/RghE4SkEYe5slAdjeocSaH7Nz2WV0rqNEgChg0AQc+JUI66no8L9g0+lw4Gw==} dependencies: core-js: 3.18.0 dev: true - /@storybook/core-server/6.3.10_55c5c53bf0314dfdc902b063e43cfb0f: - resolution: {integrity: sha512-bo3suxIy0HrbAaqbUH70F2E3VzWs235K6t0lr09Skn9AwoMnfdvywXQ+9F7d0plGxV0QzZLcU3n+0sw3rBd7sQ==} + /@storybook/core-server/6.3.12_1f912b3bcbcad07187d73309c62606ab: + resolution: {integrity: sha512-T/Mdyi1FVkUycdyOnhXvoo3d9nYXLQFkmaJkltxBFLzAePAJUSgAsPL9odNC3+p8Nr2/UDsDzvu/Ow0IF0mzLQ==} peerDependencies: - '@storybook/builder-webpack5': 6.3.10 - '@storybook/manager-webpack5': 6.3.10 + '@storybook/builder-webpack5': 6.3.12 + '@storybook/manager-webpack5': 6.3.12 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 typescript: '*' @@ -6431,76 +5743,13 @@ packages: dependencies: '@discoveryjs/json-ext': 0.5.5 '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.12_react@17.0.2 - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.10_react@17.0.2+webpack@5.51.1 - '@storybook/core-common': 6.3.10_react@17.0.2 - '@storybook/csf-tools': 6.3.10_@babel+core@7.15.5 - '@storybook/manager-webpack4': /@storybook/manager-webpack5/6.3.12_react@17.0.2 - '@storybook/manager-webpack5': 6.3.10_react@17.0.2 - '@storybook/node-logger': 6.3.10 - '@storybook/semver': 7.3.2 - '@types/node': 14.17.17 - '@types/node-fetch': 2.5.12 - '@types/pretty-hrtime': 1.0.1 - '@types/webpack': 4.41.31 - better-opn: 2.1.1 - boxen: 4.2.0 - chalk: 4.1.2 - cli-table3: 0.6.0 - commander: 6.2.1 - compression: 1.7.4 - core-js: 3.18.0 - cpy: 8.1.2 - detect-port: 1.3.0 - express: 4.17.1 - file-system-cache: 1.0.5 - fs-extra: 9.1.0 - globby: 11.0.4 - ip: 1.1.5 - node-fetch: 2.6.5 - pretty-hrtime: 1.0.3 - prompts: 2.4.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - serve-favicon: 2.5.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - transitivePeerDependencies: - - '@babel/core' - - '@swc/core' - - '@types/react' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - - /@storybook/core-server/6.3.10_f4a38cc7593e894a547559a330965df4: - resolution: {integrity: sha512-bo3suxIy0HrbAaqbUH70F2E3VzWs235K6t0lr09Skn9AwoMnfdvywXQ+9F7d0plGxV0QzZLcU3n+0sw3rBd7sQ==} - peerDependencies: - '@storybook/builder-webpack5': 6.3.10 - '@storybook/manager-webpack5': 6.3.10 - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - '@storybook/builder-webpack5': - optional: true - '@storybook/manager-webpack5': - optional: true - typescript: - optional: true - dependencies: - '@discoveryjs/json-ext': 0.5.5 - '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.12_react@17.0.2 - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.10_react@17.0.2+webpack@5.51.1 - '@storybook/core-common': 6.3.10_react@17.0.2 - '@storybook/csf-tools': 6.3.10_@babel+core@7.15.0 + '@storybook/builder-webpack5': 6.3.12_react@17.0.2 + '@storybook/core-client': 6.3.12_react@17.0.2+webpack@5.51.1 + '@storybook/core-common': 6.3.12_react@17.0.2 + '@storybook/csf-tools': 6.3.12_@babel+core@7.15.5 '@storybook/manager-webpack4': /@storybook/manager-webpack5/6.3.12_react@17.0.2 - '@storybook/manager-webpack5': 6.3.10_react@17.0.2 - '@storybook/node-logger': 6.3.10 + '@storybook/manager-webpack5': 6.3.12_react@17.0.2 + '@storybook/node-logger': 6.3.12 '@storybook/semver': 7.3.2 '@types/node': 14.17.17 '@types/node-fetch': 2.5.12 @@ -6539,11 +5788,11 @@ packages: - webpack-cli dev: true - /@storybook/core-server/6.3.11_55c5c53bf0314dfdc902b063e43cfb0f: - resolution: {integrity: sha512-pQiLtvoa4PkQ0I/i/nA+GSa7XsJeu83BQHirNba8kI+bsRLFWAY6BPM3nIs3n7fa3OlkAVxnYRgmZJXodGFIng==} + /@storybook/core-server/6.3.12_2ded6113cfb9f025b1e49a903df4aa11: + resolution: {integrity: sha512-T/Mdyi1FVkUycdyOnhXvoo3d9nYXLQFkmaJkltxBFLzAePAJUSgAsPL9odNC3+p8Nr2/UDsDzvu/Ow0IF0mzLQ==} peerDependencies: - '@storybook/builder-webpack5': 6.3.11 - '@storybook/manager-webpack5': 6.3.11 + '@storybook/builder-webpack5': 6.3.12 + '@storybook/manager-webpack5': 6.3.12 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 typescript: '*' @@ -6557,13 +5806,13 @@ packages: dependencies: '@discoveryjs/json-ext': 0.5.5 '@storybook/builder-webpack4': /@storybook/builder-webpack5/6.3.12_react@17.0.2 - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.11_react@17.0.2+webpack@5.51.1 - '@storybook/core-common': 6.3.11_react@17.0.2 - '@storybook/csf-tools': 6.3.11_@babel+core@7.15.5 + '@storybook/builder-webpack5': 6.3.12_react@17.0.2 + '@storybook/core-client': 6.3.12_react@17.0.2+webpack@5.51.1 + '@storybook/core-common': 6.3.12_react@17.0.2 + '@storybook/csf-tools': 6.3.12_@babel+core@7.15.0 '@storybook/manager-webpack4': /@storybook/manager-webpack5/6.3.12_react@17.0.2 - '@storybook/manager-webpack5': 6.3.10_react@17.0.2 - '@storybook/node-logger': 6.3.11 + '@storybook/manager-webpack5': 6.3.12_react@17.0.2 + '@storybook/node-logger': 6.3.12 '@storybook/semver': 7.3.2 '@types/node': 14.17.17 '@types/node-fetch': 2.5.12 @@ -6576,65 +5825,36 @@ packages: commander: 6.2.1 compression: 1.7.4 core-js: 3.18.0 - cpy: 8.1.2 - detect-port: 1.3.0 - express: 4.17.1 - file-system-cache: 1.0.5 - fs-extra: 9.1.0 - globby: 11.0.4 - ip: 1.1.5 - node-fetch: 2.6.5 - pretty-hrtime: 1.0.3 - prompts: 2.4.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - serve-favicon: 2.5.0 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - webpack: 5.51.1 - transitivePeerDependencies: - - '@babel/core' - - '@swc/core' - - '@types/react' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - - /@storybook/core/6.3.10_3055788d6b7c624e1f8a9cc831357cab: - resolution: {integrity: sha512-u3Cw09G0CpzrVfd0tiqqCLdEpjYlG6gF9R9bOhSFdgGQbgArh6kKrprQDSjUoLVtUx8Ms7p9sHwith1f1ekXnA==} - peerDependencies: - '@storybook/builder-webpack5': 6.3.10 - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - '@storybook/builder-webpack5': - optional: true - typescript: - optional: true - dependencies: - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.10_react@17.0.2+webpack@5.51.1 - '@storybook/core-server': 6.3.10_55c5c53bf0314dfdc902b063e43cfb0f + cpy: 8.1.2 + detect-port: 1.3.0 + express: 4.17.1 + file-system-cache: 1.0.5 + fs-extra: 9.1.0 + globby: 11.0.4 + ip: 1.1.5 + node-fetch: 2.6.5 + pretty-hrtime: 1.0.3 + prompts: 2.4.1 react: 17.0.2 + regenerator-runtime: 0.13.9 + serve-favicon: 2.5.0 + ts-dedent: 2.2.0 + util-deprecate: 1.0.2 + webpack: 5.51.1 transitivePeerDependencies: - '@babel/core' - - '@storybook/manager-webpack5' - '@swc/core' - '@types/react' - esbuild - supports-color - uglify-js - - webpack - webpack-cli dev: true - /@storybook/core/6.3.10_8f5f380c76da2883070f870cd0b14c8c: - resolution: {integrity: sha512-u3Cw09G0CpzrVfd0tiqqCLdEpjYlG6gF9R9bOhSFdgGQbgArh6kKrprQDSjUoLVtUx8Ms7p9sHwith1f1ekXnA==} + /@storybook/core/6.3.12_d66c12973352286b84428c59087cd878: + resolution: {integrity: sha512-FJm2ns8wk85hXWKslLWiUWRWwS9KWRq7jlkN6M9p57ghFseSGr4W71Orcoab4P3M7jI97l5yqBfppbscinE74g==} peerDependencies: - '@storybook/builder-webpack5': 6.3.10 + '@storybook/builder-webpack5': 6.3.12 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 typescript: '*' @@ -6644,9 +5864,9 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.10_react@17.0.2+webpack@5.51.1 - '@storybook/core-server': 6.3.10_f4a38cc7593e894a547559a330965df4 + '@storybook/builder-webpack5': 6.3.12_react@17.0.2 + '@storybook/core-client': 6.3.12_react@17.0.2+webpack@5.51.1 + '@storybook/core-server': 6.3.12_2ded6113cfb9f025b1e49a903df4aa11 react: 17.0.2 transitivePeerDependencies: - '@babel/core' @@ -6660,10 +5880,10 @@ packages: - webpack-cli dev: true - /@storybook/core/6.3.11_3055788d6b7c624e1f8a9cc831357cab: - resolution: {integrity: sha512-WhDA98hTI01L/R9l7ZCDXqhZ73Esf7VmngxcF8sVZVnM1ZwO3jq0BPYnTPUR65sVZ4XLUx1zuFQ2pAipsM8y1g==} + /@storybook/core/6.3.12_e9f53a5d0ca8aef7ac47272b2ef359e4: + resolution: {integrity: sha512-FJm2ns8wk85hXWKslLWiUWRWwS9KWRq7jlkN6M9p57ghFseSGr4W71Orcoab4P3M7jI97l5yqBfppbscinE74g==} peerDependencies: - '@storybook/builder-webpack5': 6.3.11 + '@storybook/builder-webpack5': 6.3.12 react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 typescript: '*' @@ -6673,9 +5893,9 @@ packages: typescript: optional: true dependencies: - '@storybook/builder-webpack5': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.11_react@17.0.2+webpack@5.51.1 - '@storybook/core-server': 6.3.11_55c5c53bf0314dfdc902b063e43cfb0f + '@storybook/builder-webpack5': 6.3.12_react@17.0.2 + '@storybook/core-client': 6.3.12_react@17.0.2+webpack@5.51.1 + '@storybook/core-server': 6.3.12_1f912b3bcbcad07187d73309c62606ab react: 17.0.2 transitivePeerDependencies: - '@babel/core' @@ -6689,8 +5909,8 @@ packages: - webpack-cli dev: true - /@storybook/csf-tools/6.3.10_@babel+core@7.15.0: - resolution: {integrity: sha512-SRf47ZP91yyD62JZjKhUpAABI44d6J2h+WxdRkH/S+3K5U5olllXjKMA6+bzIdy7x0v/w/sI+oi3zU6wycaPMA==} + /@storybook/csf-tools/6.3.12_@babel+core@7.15.0: + resolution: {integrity: sha512-wNrX+99ajAXxLo0iRwrqw65MLvCV6SFC0XoPLYrtBvyKr+hXOOnzIhO2f5BNEii8velpC2gl2gcLKeacpVYLqA==} dependencies: '@babel/generator': 7.15.4 '@babel/parser': 7.15.7 @@ -6711,30 +5931,8 @@ packages: - supports-color dev: true - /@storybook/csf-tools/6.3.10_@babel+core@7.15.5: - resolution: {integrity: sha512-SRf47ZP91yyD62JZjKhUpAABI44d6J2h+WxdRkH/S+3K5U5olllXjKMA6+bzIdy7x0v/w/sI+oi3zU6wycaPMA==} - dependencies: - '@babel/generator': 7.15.4 - '@babel/parser': 7.15.7 - '@babel/plugin-transform-react-jsx': 7.14.9_@babel+core@7.15.5 - '@babel/preset-env': 7.15.6_@babel+core@7.15.5 - '@babel/traverse': 7.15.4 - '@babel/types': 7.15.6 - '@mdx-js/mdx': 1.6.22 - '@storybook/csf': 0.0.1 - core-js: 3.18.0 - fs-extra: 9.1.0 - js-string-escape: 1.0.1 - lodash: 4.17.21 - prettier: 2.2.1 - regenerator-runtime: 0.13.9 - transitivePeerDependencies: - - '@babel/core' - - supports-color - dev: true - - /@storybook/csf-tools/6.3.11_@babel+core@7.15.5: - resolution: {integrity: sha512-XI9E1nhoD3ALRmHPL6NTVxap6ryh64pJDQyYbji7zRblL+QyCywv6AwUUs00iwjWrLeuthusJ434aX/imATQSA==} + /@storybook/csf-tools/6.3.12_@babel+core@7.15.5: + resolution: {integrity: sha512-wNrX+99ajAXxLo0iRwrqw65MLvCV6SFC0XoPLYrtBvyKr+hXOOnzIhO2f5BNEii8velpC2gl2gcLKeacpVYLqA==} dependencies: '@babel/generator': 7.15.4 '@babel/parser': 7.15.7 @@ -6761,61 +5959,6 @@ packages: lodash: 4.17.21 dev: true - /@storybook/manager-webpack5/6.3.10_react@17.0.2: - resolution: {integrity: sha512-wl57VS/iQl0pUxv4IOVO8BXn1HLeaIN9H62Ja2dJ1Nd3hKb8FiQdt9m81MB/Ig2wTqpclMq8Oribef8j9W4Vow==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@babel/core': 7.15.5 - '@babel/plugin-transform-template-literals': 7.14.5_@babel+core@7.15.5 - '@babel/preset-react': 7.14.5_@babel+core@7.15.5 - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/core-client': 6.3.10_react@17.0.2+webpack@5.51.1 - '@storybook/core-common': 6.3.10_react@17.0.2 - '@storybook/node-logger': 6.3.10 - '@storybook/theming': 6.3.10_react@17.0.2 - '@storybook/ui': 6.3.10_react@17.0.2 - '@types/node': 14.17.17 - babel-loader: 8.2.2_80927b313c74087b681f254ee0e3e2fc - case-sensitive-paths-webpack-plugin: 2.4.0 - chalk: 4.1.2 - core-js: 3.18.0 - css-loader: 5.2.7_webpack@5.51.1 - dotenv-webpack: 7.0.3_webpack@5.51.1 - express: 4.17.1 - file-loader: 6.2.0_webpack@5.51.1 - file-system-cache: 1.0.5 - find-up: 5.0.0 - fs-extra: 9.1.0 - html-webpack-plugin: 5.3.2_webpack@5.51.1 - node-fetch: 2.6.5 - react: 17.0.2 - read-pkg-up: 7.0.1 - regenerator-runtime: 0.13.9 - resolve-from: 5.0.0 - style-loader: 2.0.0_webpack@5.51.1 - telejson: 5.3.3 - terser-webpack-plugin: 5.2.4_webpack@5.51.1 - ts-dedent: 2.2.0 - url-loader: 4.1.1_file-loader@6.2.0+webpack@5.51.1 - util-deprecate: 1.0.2 - webpack: 5.51.1 - webpack-dev-middleware: 4.3.0_webpack@5.51.1 - webpack-virtual-modules: 0.4.3 - transitivePeerDependencies: - - '@swc/core' - - '@types/react' - - esbuild - - supports-color - - uglify-js - - webpack-cli - dev: true - /@storybook/manager-webpack5/6.3.12_react@17.0.2: resolution: {integrity: sha512-wMZYNBAUomlGSGsDFuATgiWRGF8g6TEk33VCESWrMnKLZZyq80KT+EiL/0+edfIbdrgalaqXwch38+tRwErg2A==} peerDependencies: @@ -6871,26 +6014,6 @@ packages: - webpack-cli dev: true - /@storybook/node-logger/6.3.10: - resolution: {integrity: sha512-SqRoCCZxdyK/IJd5IWtNPWtK3g5xzoiFmX43ibPvL8qCl896m5U/+nhQ2vhaU+qd9BmH0LIZjU9QeUB3fsZAqg==} - dependencies: - '@types/npmlog': 4.1.3 - chalk: 4.1.2 - core-js: 3.18.0 - npmlog: 4.1.2 - pretty-hrtime: 1.0.3 - dev: true - - /@storybook/node-logger/6.3.11: - resolution: {integrity: sha512-c6nsOk/AIux89/AVIydLA2ToqHWq4XoUKFkYJ/eOPJTLv3bdl7fV/5Vlx7EqRHqlXYCGbvTaDrMs+0tVHmp2vg==} - dependencies: - '@types/npmlog': 4.1.3 - chalk: 4.1.2 - core-js: 3.18.0 - npmlog: 4.1.2 - pretty-hrtime: 1.0.3 - dev: true - /@storybook/node-logger/6.3.12: resolution: {integrity: sha512-iktOem/Ls2+dsZY9PhPeC6T1QhX/y7OInP88neLsqEPEbB2UXca3Ydv7OZBhBVbvN25W45b05MRzbtNUxYLNRw==} dependencies: @@ -6901,14 +6024,8 @@ packages: pretty-hrtime: 1.0.3 dev: true - /@storybook/postinstall/6.3.10: - resolution: {integrity: sha512-uFaZTKh4d9FzYWxyc9K7AoFUrU8pA+tsDzXva4sAiB8MbGuq8knMtYkxhNrpV6MZuMXcmeN3PozixUM+tXj3YQ==} - dependencies: - core-js: 3.18.0 - dev: true - - /@storybook/postinstall/6.3.11: - resolution: {integrity: sha512-mJQAgnzWI+NXqS/YRx9c9DXyTH4wGbNm7v+stGk3529dnTKVsXzTY/RZCA+DwVG2x7RvofnAX5o4JuqJ6E3C5Q==} + /@storybook/postinstall/6.3.12: + resolution: {integrity: sha512-HkZ+abtZ3W6JbGPS6K7OSnNXbwaTwNNd5R02kRs4gV9B29XsBPDtFT6vIwzM3tmVQC7ihL5a8ceWp2OvzaNOuw==} dependencies: core-js: 3.18.0 dev: true @@ -6931,8 +6048,8 @@ packages: - supports-color dev: true - /@storybook/react/6.3.10_f4a38cc7593e894a547559a330965df4: - resolution: {integrity: sha512-UNznbvkpxrBd3yVcptcednjhdoEWSz9wLE6yuTbrW5/E9lv4wuHmxFA42GHKVTNy8Pa7qqPgW5t1XfWivNwOOg==} + /@storybook/react/6.3.12_2ded6113cfb9f025b1e49a903df4aa11: + resolution: {integrity: sha512-c1Y/3/eNzye+ZRwQ3BXJux6pUMVt3lhv1/M9Qagl9JItP3jDSj5Ed3JHCgwEqpprP8mvNNXwEJ8+M7vEQyDuHg==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -6950,10 +6067,10 @@ packages: '@babel/preset-flow': 7.14.5_@babel+core@7.15.0 '@babel/preset-react': 7.14.5_@babel+core@7.15.0 '@pmmmwh/react-refresh-webpack-plugin': 0.4.3_93428a4abc256bda8a22168e2c276341 - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/core': 6.3.10_8f5f380c76da2883070f870cd0b14c8c - '@storybook/core-common': 6.3.10_react@17.0.2 - '@storybook/node-logger': 6.3.10 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/core': 6.3.12_d66c12973352286b84428c59087cd878 + '@storybook/core-common': 6.3.12_react@17.0.2 + '@storybook/node-logger': 6.3.12 '@storybook/react-docgen-typescript-plugin': 1.0.2-canary.253f8c1.0_webpack@5.51.1 '@storybook/semver': 7.3.2 '@types/webpack-env': 1.16.2 @@ -6988,44 +6105,6 @@ packages: - webpack-plugin-serve dev: true - /@storybook/router/6.3.10_react@17.0.2: - resolution: {integrity: sha512-cRyoNrBeBTOfiLYJumm0559cVJeO7z/ZDVcgLxi16uUjhu4nkio0chTwtdtrtTygKxJq8ibWq6LAjZAHDoeq8g==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@reach/router': 1.3.4_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@types/reach__router': 1.3.9 - core-js: 3.18.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.10.1 - react: 17.0.2 - ts-dedent: 2.2.0 - dev: true - - /@storybook/router/6.3.11_react@17.0.2: - resolution: {integrity: sha512-R9Den9xCGhU5CLx4wi79uHbJqKqpZO7QDpENZGL7bT/IDid7szqFldztrzvmC5LE1TBpU6VQjEGaITWMrG2tsw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@reach/router': 1.3.4_react@17.0.2 - '@storybook/client-logger': 6.3.11 - '@types/reach__router': 1.3.9 - core-js: 3.18.0 - fast-deep-equal: 3.1.3 - global: 4.4.0 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.10.1 - react: 17.0.2 - ts-dedent: 2.2.0 - dev: true - /@storybook/router/6.3.12_react@17.0.2: resolution: {integrity: sha512-G/pNGCnrJRetCwyEZulHPT+YOcqEj/vkPVDTUfii2qgqukup6K0cjwgd7IukAURnAnnzTi1gmgFuEKUi8GE/KA==} peerDependencies: @@ -7054,33 +6133,14 @@ packages: find-up: 4.1.0 dev: true - /@storybook/source-loader/6.3.10_react@17.0.2: - resolution: {integrity: sha512-I8wm8vkLB2S29iAHezkMZzzb1nvc1zZqVaWBlAqK5T2AuQojMIiKapU4Mohj9XORbcFfz7Kn7ULYgrx4cl5lZw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/client-logger': 6.3.10 - '@storybook/csf': 0.0.1 - core-js: 3.18.0 - estraverse: 5.2.0 - global: 4.4.0 - loader-utils: 2.0.0 - lodash: 4.17.21 - prettier: 2.2.1 - react: 17.0.2 - regenerator-runtime: 0.13.9 - dev: true - - /@storybook/source-loader/6.3.11_react@17.0.2: - resolution: {integrity: sha512-uDufIIjuD1S5J+q3kWdFayT3B5nMdIJm2K9X+Tl7y7Unw/Lkb9YAEEUjRr8irjih6E1Bp9paRbMhUoVuJDpC7w==} + /@storybook/source-loader/6.3.12_react@17.0.2: + resolution: {integrity: sha512-Lfe0LOJGqAJYkZsCL8fhuQOeFSCgv8xwQCt4dkcBd0Rw5zT2xv0IXDOiIOXGaWBMDtrJUZt/qOXPEPlL81Oaqg==} peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/client-logger': 6.3.11 + '@storybook/addons': 6.3.12_react@17.0.2 + '@storybook/client-logger': 6.3.12 '@storybook/csf': 0.0.1 core-js: 3.18.0 estraverse: 5.2.0 @@ -7092,48 +6152,6 @@ packages: regenerator-runtime: 0.13.9 dev: true - /@storybook/theming/6.3.10_react@17.0.2: - resolution: {integrity: sha512-yX7qKrnFaa1otjrf21dP9HpMLJLw+iV7gcNo/RVkPSixWzglCIGgQ8T6vVjfjIgBUl6KbiE2qwqaFjLLe4fIYQ==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@emotion/core': 10.1.1_react@17.0.2 - '@emotion/is-prop-valid': 0.8.8 - '@emotion/styled': 10.0.27_33bb31e1d857102242df3642b32eda18 - '@storybook/client-logger': 6.3.10 - core-js: 3.18.0 - deep-object-diff: 1.1.0 - emotion-theming: 10.0.27_33bb31e1d857102242df3642b32eda18 - global: 4.4.0 - memoizerific: 1.11.3 - polished: 4.1.3 - react: 17.0.2 - resolve-from: 5.0.0 - ts-dedent: 2.2.0 - dev: true - - /@storybook/theming/6.3.11_react@17.0.2: - resolution: {integrity: sha512-MbEaGYP9nqu/Sv/FBK/7jRRHGe34TZ7tmZj6ZWE0KZih4Ey39LjPY6XcJ1rMDZclrXmT98p3+KClzdwKD0/Tdw==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@emotion/core': 10.1.1_react@17.0.2 - '@emotion/is-prop-valid': 0.8.8 - '@emotion/styled': 10.0.27_33bb31e1d857102242df3642b32eda18 - '@storybook/client-logger': 6.3.11 - core-js: 3.18.0 - deep-object-diff: 1.1.0 - emotion-theming: 10.0.27_33bb31e1d857102242df3642b32eda18 - global: 4.4.0 - memoizerific: 1.11.3 - polished: 4.1.3 - react: 17.0.2 - resolve-from: 5.0.0 - ts-dedent: 2.2.0 - dev: true - /@storybook/theming/6.3.12_react@17.0.2: resolution: {integrity: sha512-wOJdTEa/VFyFB2UyoqyYGaZdym6EN7RALuQOAMT6zHA282FBmKw8nL5DETHEbctpnHdcrMC/391teK4nNSrdOA==} peerDependencies: @@ -7155,86 +6173,6 @@ packages: ts-dedent: 2.2.0 dev: true - /@storybook/ui/6.3.10_react@17.0.2: - resolution: {integrity: sha512-TkaHgpTBp0nBr6A/v04k1V2rbRy7ajAoL9bFSU7hLNXDyQInUzT/p13+4JMR2TANSzPAycJNa3zRbO7n1MgV5w==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@emotion/core': 10.1.1_react@17.0.2 - '@storybook/addons': 6.3.10_react@17.0.2 - '@storybook/api': 6.3.10_react@17.0.2 - '@storybook/channels': 6.3.10 - '@storybook/client-logger': 6.3.10 - '@storybook/components': 6.3.10_react@17.0.2 - '@storybook/core-events': 6.3.10 - '@storybook/router': 6.3.10_react@17.0.2 - '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.10_react@17.0.2 - '@types/markdown-to-jsx': 6.11.3 - copy-to-clipboard: 3.3.1 - core-js: 3.18.0 - core-js-pure: 3.18.0 - downshift: 6.1.7_react@17.0.2 - emotion-theming: 10.0.27_33bb31e1d857102242df3642b32eda18 - fuse.js: 3.6.1 - global: 4.4.0 - lodash: 4.17.21 - markdown-to-jsx: 6.11.4_react@17.0.2 - memoizerific: 1.11.3 - polished: 4.1.3 - qs: 6.10.1 - react: 17.0.2 - react-draggable: 4.4.4_react@17.0.2 - react-helmet-async: 1.1.2_react@17.0.2 - react-sizeme: 3.0.2 - regenerator-runtime: 0.13.9 - resolve-from: 5.0.0 - store2: 2.12.0 - transitivePeerDependencies: - - '@types/react' - dev: true - - /@storybook/ui/6.3.11_react@17.0.2: - resolution: {integrity: sha512-Jy6J7GRCgcnCp6jOpGcGcjHfzMVqFJ8gnLzrvTPR6EQBl9sJlJMVvYyj/52fDTnrRj+mjs8+cnkQwUHg+U/yrA==} - peerDependencies: - react: ^16.8.0 || ^17.0.0 - react-dom: ^16.8.0 || ^17.0.0 - dependencies: - '@emotion/core': 10.1.1_react@17.0.2 - '@storybook/addons': 6.3.11_react@17.0.2 - '@storybook/api': 6.3.11_react@17.0.2 - '@storybook/channels': 6.3.11 - '@storybook/client-logger': 6.3.11 - '@storybook/components': 6.3.11_react@17.0.2 - '@storybook/core-events': 6.3.11 - '@storybook/router': 6.3.11_react@17.0.2 - '@storybook/semver': 7.3.2 - '@storybook/theming': 6.3.11_react@17.0.2 - '@types/markdown-to-jsx': 6.11.3 - copy-to-clipboard: 3.3.1 - core-js: 3.18.0 - core-js-pure: 3.18.0 - downshift: 6.1.7_react@17.0.2 - emotion-theming: 10.0.27_33bb31e1d857102242df3642b32eda18 - fuse.js: 3.6.1 - global: 4.4.0 - lodash: 4.17.21 - markdown-to-jsx: 6.11.4_react@17.0.2 - memoizerific: 1.11.3 - polished: 4.1.3 - qs: 6.10.1 - react: 17.0.2 - react-draggable: 4.4.4_react@17.0.2 - react-helmet-async: 1.1.2_react@17.0.2 - react-sizeme: 3.0.2 - regenerator-runtime: 0.13.9 - resolve-from: 5.0.0 - store2: 2.12.0 - transitivePeerDependencies: - - '@types/react' - dev: true - /@storybook/ui/6.3.12_react@17.0.2: resolution: {integrity: sha512-PC2yEz4JMfarq7rUFbeA3hCA+31p5es7YPEtxLRvRwIZhtL0P4zQUfHpotb3KgWdoAIfZesAuoIQwMPQmEFYrw==} peerDependencies: @@ -22546,9 +21484,9 @@ packages: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 dependencies: - '@storybook/addons': 6.3.11_react@17.0.2 + '@storybook/addons': 6.3.12_react@17.0.2 '@storybook/api': 6.3.12_react@17.0.2 - '@storybook/components': 6.3.11_react@17.0.2 + '@storybook/components': 6.3.12_react@17.0.2 '@storybook/core-events': 6.3.12 react: 17.0.2 ts-dedent: 2.2.0 diff --git a/projects/js-packages/api/CHANGELOG.md b/projects/js-packages/api/CHANGELOG.md index 06add651f342c..d7aa1b4af3a7c 100644 --- a/projects/js-packages/api/CHANGELOG.md +++ b/projects/js-packages/api/CHANGELOG.md @@ -2,6 +2,10 @@ ### This is a list detailing changes for the Jetpack RNA Components package releases. +## 0.5.0 - 2021-10-26 +### Added +- Add the IDC Start Fresh API method. + ## 0.4.0 - 2021-10-19 ### Added - Add the IDC migrate API method. diff --git a/projects/js-packages/api/changelog/add-rna-idc-start-fresh b/projects/js-packages/api/changelog/add-rna-idc-start-fresh deleted file mode 100644 index a3f394a797705..0000000000000 --- a/projects/js-packages/api/changelog/add-rna-idc-start-fresh +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Add the IDC Start Fresh API method. diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json index bc5a10237c19b..dcad9a40b1ca6 100644 --- a/projects/js-packages/api/package.json +++ b/projects/js-packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-api", - "version": "0.5.0-alpha", + "version": "0.5.0", "description": "Jetpack Api Package", "author": "Automattic", "license": "GPL-2.0-or-later", diff --git a/projects/js-packages/components/CHANGELOG.md b/projects/js-packages/components/CHANGELOG.md index ee49ec848ca03..ba0b7bc08b9ce 100644 --- a/projects/js-packages/components/CHANGELOG.md +++ b/projects/js-packages/components/CHANGELOG.md @@ -2,6 +2,17 @@ ### This is a list detailing changes for the Jetpack RNA Components package releases. +## 0.4.0 - 2021-10-26 +### Added +- Add PricingCard in RNA components. +- New ActionButton component added + +### Changed +- Updated package dependencies + +### Removed +- Removing knobs from Storybook and using propTypes in components instead + ## 0.3.2 - 2021-10-13 ### Changed - Updated package dependencies. diff --git a/projects/js-packages/components/README.md b/projects/js-packages/components/README.md index c59523936279c..ea0e3e902e832 100644 --- a/projects/js-packages/components/README.md +++ b/projects/js-packages/components/README.md @@ -1,4 +1,11 @@ -Components Package -========= +# Components Package The package includes a set of individual components shared between RNA packages. + +## Tools + +### Jetpack Redirects + +A helper function to build URLs using the `jetpack.com/redirect` service. + +See [Docs](tools/jp-redirect/README.md). diff --git a/projects/js-packages/components/changelog/add-rna-pricing-card b/projects/js-packages/components/changelog/add-rna-pricing-card deleted file mode 100644 index 05c521bc0c21c..0000000000000 --- a/projects/js-packages/components/changelog/add-rna-pricing-card +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Add PricingCard in RNA components. diff --git a/projects/js-packages/components/changelog/js-redirects-add-docs-and-tests b/projects/js-packages/components/changelog/js-redirects-add-docs-and-tests new file mode 100644 index 0000000000000..dd107d0e82e4f --- /dev/null +++ b/projects/js-packages/components/changelog/js-redirects-add-docs-and-tests @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Added docs and tests diff --git a/projects/js-packages/components/changelog/remove-knobs-from-stories b/projects/js-packages/components/changelog/remove-knobs-from-stories deleted file mode 100644 index 2267b7feaf473..0000000000000 --- a/projects/js-packages/components/changelog/remove-knobs-from-stories +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: removed - -Removing knobs from Storybook and using propTypes in components instead diff --git a/projects/js-packages/components/changelog/update-connect-button-visual-component b/projects/js-packages/components/changelog/update-connect-button-visual-component deleted file mode 100644 index 6070038f39c3f..0000000000000 --- a/projects/js-packages/components/changelog/update-connect-button-visual-component +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -New ActionButton component added diff --git a/projects/js-packages/components/package.json b/projects/js-packages/components/package.json index c5c519cf0375e..f0d2a219b547e 100644 --- a/projects/js-packages/components/package.json +++ b/projects/js-packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@automattic/jetpack-components", - "version": "0.4.0-alpha", + "version": "0.4.1-alpha", "description": "Jetpack Components Package", "author": "Automattic", "license": "GPL-2.0-or-later", diff --git a/projects/js-packages/components/tools/jp-redirect/README.md b/projects/js-packages/components/tools/jp-redirect/README.md new file mode 100644 index 0000000000000..96788e1ef03ad --- /dev/null +++ b/projects/js-packages/components/tools/jp-redirect/README.md @@ -0,0 +1,61 @@ +# Jetpack Redirects + +A helper function to build URLs using the `jetpack.com/redirect` service. + +If you are an automattician, refer to PCYsg-pY7-p2 for all related information and links to our internal tools. + +## Usage + +```jsx +import { getRedirectUrl } from '@automattic/jetpack-components'; +getRedirectUrl( source, args ); +``` + +### source (required) + +Source can be either a “source handler” or an URL. + +A “source handler” must be registered in the Jetpack Redirects service, on the server side. It’s a slug that points to an URL that may or may not have dynamic parts in it. + +An “URL” is a string that must start with “https://" and doesn’t need to be registered on the server. However, if it is registered, it will point to the URL set as target there rather than to the source. (Note: It will only work for whitelisted domains, unless the URL is explicitly registered on the server) + +### args (optional) + +This is optional and allows you to pass an object with more parameters to build the URL. + +This is not a complete list as any argument passed here will be sent to as a query parameter to the Redirect server. These parameters will not necessarily be passed over to the final destination URL. If you want to add a parameter to the final destination URL, use the `query` argument. + +* **site**: Optional (but recommended). This is used to identify the site and also to fill in the `[site]` placeholder in the target. Will default to the value of `jetpack_redirects.currentSiteRawUrl`, if available. + +* **path**: Optional. Used to fill in the `[path]` placeholder in the target. + +* **query**: Optional. A string with additional variables to be added in the query string. Must be passed as a string in `key=value&foo=bar` format. + +* **anchor**: Optional. An anchor to be added to the final URL. Must be a single string. Example: `section1` + +## Examples + +### Example 1 + +`getRedirectUrl( 'jetpack', { query: 'foo=bar', anchor: 'section' } );` + +This will return the following URL: `https://jetpack.com/redirect?source=jetpack&anchor=section&query=foo%3Dbar` + +When accessing this URL, the user will be redirected to: `https://jetpack.com/?foo=bar#section` + +### Example 2 (placeholders): + +``` +getRedirectUrl( + 'calypso-edit-post', + { + path: '1234', + site: 'example.org' + } +) +``` +This will return the following URL: `https://jetpack.com/redirect?site=example.org&source=calypso-edit-post&path=1234` + +The `calypso-edit-post` source is registered on the server and points to `https://wordpress.com/post/[site]/[path]`, so the final URL that the user will be redirected to is: + +`https://wordpress.com/post/example.org/1234` diff --git a/projects/js-packages/components/tools/jp-redirect/index.jsx b/projects/js-packages/components/tools/jp-redirect/index.jsx index 4d0cbf58cc769..d93c950b8ccbf 100644 --- a/projects/js-packages/components/tools/jp-redirect/index.jsx +++ b/projects/js-packages/components/tools/jp-redirect/index.jsx @@ -2,22 +2,19 @@ /** * Builds an URL using the jetpack.com/redirect/ service * - * If $source is a simple slug, it will be sent using the source query parameter. e.g. jetpack.com/redirect/?source=slug + * If source is a simple slug, it will be sent using the source query parameter. e.g. jetpack.com/redirect/?source=slug * - * If $source is a full URL, starting with https://, it will be sent using the url query parameter. e.g. jetpack.com/redirect/?url=https://wordpress.com + * If source is a full URL, starting with https://, it will be sent using the url query parameter. e.g. jetpack.com/redirect/?url=https://wordpress.com * * Note: if using full URL, query parameters and anchor must be passed in args. Any querystring of url fragment in the URL will be discarded. * * @since 0.2.0 - * @param {string} source - The URL handler registered in the server or the full destination URL (starting with https://). - * @param {object} args - { - * - * Additional arguments to build the url. This is not a complete list as any argument passed here will be sent to as a query parameter to the Redirect server. These parameters will not necessarily be passed over to the final destination URL. If you want to add a parameter to the final destination URL, use the `query` argument. - * @type {string} site URL of the current site. Will default to the value of jetpack_redirects.currentSiteRawUrl, if available. - * @type {string} path Additional path to be appended to the URL - * @type {string} query Query parameters to be added to the final destination URL. should be in query string format (e.g. 'key=value&foo=bar'). - * @type {string} anchor Anchor to be added to the URL - * } + * @param {string} source - The URL handler registered in the server or the full destination URL (starting with https://). + * @param {object} args - Additional arguments to build the url. This is not a complete list as any argument passed here will be sent to as a query parameter to the Redirect server. These parameters will not necessarily be passed over to the final destination URL. If you want to add a parameter to the final destination URL, use the `query` argument. + * @param {string} args.site - URL of the current site. Will default to the value of jetpack_redirects.currentSiteRawUrl, if available. Used to fill in the `[site]` placeholder in the target. + * @param {string} args.path - Additional path to be appended to the URL. Used to fill in the `[path]` placeholder in the target. + * @param {string} args.query - Query parameters to be added to the final destination URL. should be in query string format (e.g. 'key=value&foo=bar'). + * @param {string} args.anchor - Anchor to be added to the URL. Must be a single string. Example: `section1`. * @returns {string} The redirect URL */ export default function getRedirectUrl( source, args = {} ) { diff --git a/projects/js-packages/components/tools/jp-redirect/test/index.jsx b/projects/js-packages/components/tools/jp-redirect/test/index.jsx new file mode 100644 index 0000000000000..d202736996808 --- /dev/null +++ b/projects/js-packages/components/tools/jp-redirect/test/index.jsx @@ -0,0 +1,97 @@ +/** + * External dependencies + */ +import { expect } from 'chai'; + +/** + * Internal dependencies + */ +import getRedirectUrl from '../'; + +describe( 'getRedirectUrl', () => { + it( 'simple url', () => { + const url = getRedirectUrl( 'simple' ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'source' ) ).to.equal( 'simple' ); + } ); + + it( 'Random param', () => { + const url = getRedirectUrl( 'simple', { random: 'asd' } ); + expect( url ).to.equal( 'https://jetpack.com/redirect/?source=simple&random=asd' ); + } ); + + it( 'Test path', () => { + const url = getRedirectUrl( 'simple', { path: '1234' } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'source' ) ).to.equal( 'simple' ); + expect( parsedUrl.searchParams.get( 'path' ) ).to.equal( '1234' ); + } ); + + it( 'Test path with special chars', () => { + const url = getRedirectUrl( 'simple', { path: 'weird value!' } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'source' ) ).to.equal( 'simple' ); + expect( parsedUrl.searchParams.get( 'path' ) ).to.equal( 'weird value!' ); + } ); + + it( 'Test query', () => { + const url = getRedirectUrl( 'simple', { query: 'key=1234&other=super' } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'source' ) ).to.equal( 'simple' ); + expect( parsedUrl.searchParams.get( 'query' ) ).to.equal( 'key=1234&other=super' ); + } ); + + it( 'Test anchor', () => { + const url = getRedirectUrl( 'simple', { anchor: 'section' } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'source' ) ).to.equal( 'simple' ); + expect( parsedUrl.searchParams.get( 'anchor' ) ).to.equal( 'section' ); + } ); + + it( 'Test all', () => { + const url = getRedirectUrl( 'simple', { + query: 'key=1234&other=super', + anchor: 'section', + site: 'example.org', + path: 123, + } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'source' ) ).to.equal( 'simple' ); + expect( parsedUrl.searchParams.get( 'anchor' ) ).to.equal( 'section' ); + expect( parsedUrl.searchParams.get( 'query' ) ).to.equal( 'key=1234&other=super' ); + expect( parsedUrl.searchParams.get( 'site' ) ).to.equal( 'example.org' ); + expect( parsedUrl.searchParams.get( 'path' ) ).to.equal( '123' ); + } ); + + it( 'Test passing an URL as the first parameter', () => { + const url = getRedirectUrl( 'https://wordpress.com/support' ); + const value = encodeURIComponent( 'https://wordpress.com/support' ); + expect( url ).to.equal( `https://jetpack.com/redirect/?url=${ value }` ); + } ); + + it( 'Test passing an URL as the first parameter and query', () => { + const url = getRedirectUrl( 'https://wordpress.com/support', { + query: 'key=1234&other=super', + } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'url' ) ).to.equal( 'https://wordpress.com/support' ); + expect( parsedUrl.searchParams.get( 'query' ) ).to.equal( 'key=1234&other=super' ); + } ); + + it( 'Test passing an URL as the first parameter and query discarding info from url', () => { + const url = getRedirectUrl( 'https://wordpress.com/support?super=mega&key=value#section1', { + query: 'key=1234&other=super', + } ); + const parsedUrl = new URL( url ); + + expect( parsedUrl.searchParams.get( 'url' ) ).to.equal( 'https://wordpress.com/support' ); + expect( parsedUrl.searchParams.get( 'query' ) ).to.equal( 'key=1234&other=super' ); + } ); +} ); diff --git a/projects/js-packages/connection/CHANGELOG.md b/projects/js-packages/connection/CHANGELOG.md index 3b3442a67c7ce..10329b6b1bac7 100644 --- a/projects/js-packages/connection/CHANGELOG.md +++ b/projects/js-packages/connection/CHANGELOG.md @@ -2,6 +2,12 @@ ### This is a list detailing changes for the Jetpack RNA Connection Component releases. +## 0.8.0 - 2021-10-26 +### Changed +- ConnectButton now uses ActionButton component +- Package version bump. +- Updated package dependencies + ## 0.7.2 - 2021-10-19 ### Changed - Bump the RNA API version. diff --git a/projects/js-packages/idc/changelog/update-connect-button-visual-component b/projects/js-packages/connection/changelog/js-redirects-add-docs-and-tests similarity index 100% rename from projects/js-packages/idc/changelog/update-connect-button-visual-component rename to projects/js-packages/connection/changelog/js-redirects-add-docs-and-tests diff --git a/projects/js-packages/connection/changelog/update-connect-button-visual-component b/projects/js-packages/connection/changelog/update-connect-button-visual-component deleted file mode 100644 index 9f9852151abdf..0000000000000 --- a/projects/js-packages/connection/changelog/update-connect-button-visual-component +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: changed - -ConnectButton now uses ActionButton component diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json index a424503328f5e..1de76ec2a14ce 100644 --- a/projects/js-packages/connection/package.json +++ b/projects/js-packages/connection/package.json @@ -1,12 +1,12 @@ { "name": "@automattic/jetpack-connection", - "version": "0.8.0-alpha", + "version": "0.8.1-alpha", "description": "Jetpack Connection Component", "author": "Automattic", "license": "GPL-2.0-or-later", "dependencies": { - "@automattic/jetpack-api": "workspace:^0.5.0-alpha", - "@automattic/jetpack-components": "workspace:^0.4.0-alpha", + "@automattic/jetpack-api": "workspace:^0.5.0", + "@automattic/jetpack-components": "workspace:^0.4.1-alpha", "@wordpress/base-styles": "4.0.2", "@wordpress/browserslist-config": "4.1.0", "@wordpress/components": "19.0.0", diff --git a/projects/js-packages/idc/CHANGELOG.md b/projects/js-packages/idc/CHANGELOG.md index a2f8d84cbf55d..1d2b494834adc 100644 --- a/projects/js-packages/idc/CHANGELOG.md +++ b/projects/js-packages/idc/CHANGELOG.md @@ -2,6 +2,13 @@ ### This is a list detailing changes for the Jetpack RNA IDC package releases. +## 0.4.0 - 2021-10-26 +### Added +- Add the Start Fresh functionality. + +### Changed +- Updated package dependencies + ## 0.3.0 - 2021-10-19 ### Added - Add the migration functionality. diff --git a/projects/js-packages/idc/changelog/add-rna-idc-start-fresh b/projects/js-packages/idc/changelog/add-rna-idc-start-fresh deleted file mode 100644 index 6811091e81589..0000000000000 --- a/projects/js-packages/idc/changelog/add-rna-idc-start-fresh +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Add the Start Fresh functionality. diff --git a/projects/packages/backup/changelog/feature-sync-error-capture b/projects/js-packages/idc/changelog/js-redirects-add-docs-and-tests similarity index 100% rename from projects/packages/backup/changelog/feature-sync-error-capture rename to projects/js-packages/idc/changelog/js-redirects-add-docs-and-tests diff --git a/projects/js-packages/idc/package.json b/projects/js-packages/idc/package.json index cb1f0264cb88f..52d002f8b226b 100644 --- a/projects/js-packages/idc/package.json +++ b/projects/js-packages/idc/package.json @@ -1,12 +1,12 @@ { "name": "@automattic/jetpack-idc", - "version": "0.4.0-alpha", + "version": "0.4.1-alpha", "description": "Jetpack Connection Component", "author": "Automattic", "license": "GPL-2.0-or-later", "dependencies": { - "@automattic/jetpack-api": "workspace:^0.5.0-alpha", - "@automattic/jetpack-components": "workspace:^0.4.0-alpha", + "@automattic/jetpack-api": "workspace:^0.5.0", + "@automattic/jetpack-components": "workspace:^0.4.1-alpha", "@wordpress/base-styles": "4.0.2", "@wordpress/components": "19.0.0", "@wordpress/compose": "5.0.4", diff --git a/projects/packages/connection-ui/changelog/update-connect-button-visual-component b/projects/js-packages/storybook/changelog/2021-10-26-11-37-27-239390 similarity index 100% rename from projects/packages/connection-ui/changelog/update-connect-button-visual-component rename to projects/js-packages/storybook/changelog/2021-10-26-11-37-27-239390 diff --git a/projects/packages/sync/changelog/add-rna-idc-start-fresh b/projects/js-packages/storybook/changelog/js-redirects-add-docs-and-tests similarity index 100% rename from projects/packages/sync/changelog/add-rna-idc-start-fresh rename to projects/js-packages/storybook/changelog/js-redirects-add-docs-and-tests diff --git a/projects/js-packages/components/changelog/renovate-wordpress-monorepo b/projects/js-packages/storybook/changelog/renovate-storybook-monorepo#4 similarity index 100% rename from projects/js-packages/components/changelog/renovate-wordpress-monorepo rename to projects/js-packages/storybook/changelog/renovate-storybook-monorepo#4 diff --git a/projects/js-packages/storybook/package.json b/projects/js-packages/storybook/package.json index a5e44e49b7619..469cb5d986e3a 100644 --- a/projects/js-packages/storybook/package.json +++ b/projects/js-packages/storybook/package.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@automattic/jetpack-base-styles": "workspace:^0.1.0-alpha", - "@automattic/jetpack-components": "workspace:^0.4.0-alpha", + "@automattic/jetpack-components": "workspace:^0.4.1-alpha", "@babel/core": "7.15.0", "@babel/plugin-syntax-jsx": "7.14.5", "@babel/runtime-corejs3": "7.15.3", @@ -40,14 +40,14 @@ "@emotion/react": "11.4.1", "@emotion/styled": "11.3.0", "@emotion/utils": "1.0.0", - "@storybook/addon-essentials": "6.3.11", - "@storybook/addon-a11y": "6.3.10", - "@storybook/addon-docs": "6.3.10", - "@storybook/addon-storysource": "6.3.10", - "@storybook/addon-viewport": "6.3.10", - "@storybook/builder-webpack5": "6.3.10", - "@storybook/manager-webpack5": "6.3.10", - "@storybook/react": "6.3.10", + "@storybook/addon-essentials": "6.3.12", + "@storybook/addon-a11y": "6.3.12", + "@storybook/addon-docs": "6.3.12", + "@storybook/addon-storysource": "6.3.12", + "@storybook/addon-viewport": "6.3.12", + "@storybook/builder-webpack5": "6.3.12", + "@storybook/manager-webpack5": "6.3.12", + "@storybook/react": "6.3.12", "@wordpress/babel-preset-default": "6.3.4", "@wordpress/block-editor": "7.0.4", "@wordpress/block-library": "6.0.2", diff --git a/projects/packages/a8c-mc-stats/changelog/add-test-with-php-8.1 b/projects/packages/a8c-mc-stats/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/a8c-mc-stats/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/a8c-mc-stats/changelog/fix-phpunit-configs b/projects/packages/a8c-mc-stats/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/a8c-mc-stats/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/a8c-mc-stats/phpunit.xml.dist b/projects/packages/a8c-mc-stats/phpunit.xml.dist index e9aeb7be7d9de..942e03602aa00 100644 --- a/projects/packages/a8c-mc-stats/phpunit.xml.dist +++ b/projects/packages/a8c-mc-stats/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - views - + src diff --git a/projects/packages/abtest/changelog/add-test-with-php-8.1 b/projects/packages/abtest/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/abtest/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/abtest/changelog/fix-phpunit-configs b/projects/packages/abtest/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/abtest/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/abtest/phpunit.xml.dist b/projects/packages/abtest/phpunit.xml.dist index 7b161a2035069..942e03602aa00 100644 --- a/projects/packages/abtest/phpunit.xml.dist +++ b/projects/packages/abtest/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,13 +6,7 @@ - . - - tests - vendor - views - wordpress - + src diff --git a/projects/packages/admin-ui/changelog/add-test-with-php-8.1 b/projects/packages/admin-ui/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/admin-ui/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/admin-ui/changelog/fix-phpunit-configs b/projects/packages/admin-ui/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/admin-ui/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/admin-ui/package.json b/projects/packages/admin-ui/package.json index 65f5456d19ee6..5c68fc5e0fc5a 100644 --- a/projects/packages/admin-ui/package.json +++ b/projects/packages/admin-ui/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-admin-ui", - "version": "0.1.0", + "version": "0.1.1-alpha", "description": "Generic Jetpack wp-admin UI elements", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/packages/admin-ui/phpunit.xml.dist b/projects/packages/admin-ui/phpunit.xml.dist index 0bc3e57afc612..2c94e3a1135fb 100644 --- a/projects/packages/admin-ui/phpunit.xml.dist +++ b/projects/packages/admin-ui/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - wordpress - + src diff --git a/projects/packages/admin-ui/src/class-admin-menu.php b/projects/packages/admin-ui/src/class-admin-menu.php index 789f3ca997bd4..f7ec7123fe7ff 100644 --- a/projects/packages/admin-ui/src/class-admin-menu.php +++ b/projects/packages/admin-ui/src/class-admin-menu.php @@ -13,7 +13,7 @@ */ class Admin_Menu { - const PACKAGE_VERSION = '0.1.0'; + const PACKAGE_VERSION = '0.1.1-alpha'; /** * Whether this class has been initialized diff --git a/projects/packages/assets/changelog/add-test-with-php-8.1 b/projects/packages/assets/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/assets/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/assets/changelog/fix-phpunit-configs b/projects/packages/assets/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/assets/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/assets/phpunit.xml.dist b/projects/packages/assets/phpunit.xml.dist index e59df500905c4..55809161b0d3c 100644 --- a/projects/packages/assets/phpunit.xml.dist +++ b/projects/packages/assets/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php index 32b9ef62785e1..6c7321db7df36 100644 --- a/projects/packages/assets/tests/php/test-assets.php +++ b/projects/packages/assets/tests/php/test-assets.php @@ -243,7 +243,7 @@ public function test_enqueue_async_script_calls_wp_enqueue_script() { /** * Test whether static resources are properly updated to use a WordPress.com static domain. * - * @covers Automattic\Jetpack\Status::staticize_subdomain + * @covers Automattic\Jetpack\Assets::staticize_subdomain * @dataProvider get_resources_urls * * @param string $original Source URL. diff --git a/projects/packages/autoloader/changelog/add-test-with-php-8.1 b/projects/packages/autoloader/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/autoloader/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/autoloader/phpunit.xml.dist b/projects/packages/autoloader/phpunit.xml.dist index 9c73a531f3ed7..e42ecaca72063 100644 --- a/projects/packages/autoloader/phpunit.xml.dist +++ b/projects/packages/autoloader/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php/tests/unit diff --git a/projects/packages/backup/CHANGELOG.md b/projects/packages/backup/CHANGELOG.md index 2cc2e09ac7008..df0c8b67911de 100644 --- a/projects/packages/backup/CHANGELOG.md +++ b/projects/packages/backup/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.1.7] - 2021-10-26 +### Changed +- Updated package dependencies. + ## [1.1.6] - 2021-10-13 ### Changed - Updated package dependencies. @@ -67,6 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add API endpoints and Jetpack Backup package for managing Help… +[1.1.7]: https://github.com/Automattic/jetpack-backup/compare/v1.1.6...v1.1.7 [1.1.6]: https://github.com/Automattic/jetpack-backup/compare/v1.1.5...v1.1.6 [1.1.5]: https://github.com/Automattic/jetpack-backup/compare/v1.1.4...v1.1.5 [1.1.4]: https://github.com/Automattic/jetpack-backup/compare/v1.1.3...v1.1.4 diff --git a/projects/packages/backup/changelog/add-test-with-php-8.1 b/projects/packages/backup/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/backup/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/backup/changelog/fix-phpunit-configs b/projects/packages/backup/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/backup/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/backup/phpunit.xml.dist b/projects/packages/backup/phpunit.xml.dist index 47e186dc3d76a..a6b5da129dd2e 100644 --- a/projects/packages/backup/phpunit.xml.dist +++ b/projects/packages/backup/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,8 @@ - . - - tests - vendor - + src + actions.php diff --git a/projects/packages/backup/src/class-package-version.php b/projects/packages/backup/src/class-package-version.php index cbfb3558db0b0..253ee0615b4ce 100644 --- a/projects/packages/backup/src/class-package-version.php +++ b/projects/packages/backup/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.1.7-alpha'; + const PACKAGE_VERSION = '1.1.8-alpha'; const PACKAGE_SLUG = 'backup'; diff --git a/projects/packages/blocks/changelog/add-test-with-php-8.1 b/projects/packages/blocks/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/blocks/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/blocks/changelog/fix-phpunit-configs b/projects/packages/blocks/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/blocks/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/blocks/phpunit.xml.dist b/projects/packages/blocks/phpunit.xml.dist index 0bc3e57afc612..2c94e3a1135fb 100644 --- a/projects/packages/blocks/phpunit.xml.dist +++ b/projects/packages/blocks/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - wordpress - + src diff --git a/projects/packages/changelogger/changelog/add-test-with-php-8.1 b/projects/packages/changelogger/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/changelogger/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/changelogger/changelog/fix-changelogger-php-8.1 b/projects/packages/changelogger/changelog/fix-changelogger-php-8.1 new file mode 100644 index 0000000000000..729fff1565c78 --- /dev/null +++ b/projects/packages/changelogger/changelog/fix-changelogger-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: fixed + +Adjust for PHP 8.1 compatibility. diff --git a/projects/packages/changelogger/changelog/fix-phpunit-configs b/projects/packages/changelogger/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/changelogger/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/changelogger/lib/ChangeEntry.php b/projects/packages/changelogger/lib/ChangeEntry.php index 6e0ca18650bcb..5172c795da536 100644 --- a/projects/packages/changelogger/lib/ChangeEntry.php +++ b/projects/packages/changelogger/lib/ChangeEntry.php @@ -305,6 +305,7 @@ public function setContent( $content ) { * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return array( '__class__' => static::class, diff --git a/projects/packages/changelogger/lib/Changelog.php b/projects/packages/changelogger/lib/Changelog.php index 6f410bdce5815..7105f0074a5e1 100644 --- a/projects/packages/changelogger/lib/Changelog.php +++ b/projects/packages/changelogger/lib/Changelog.php @@ -145,6 +145,7 @@ public function getVersions() { * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return array( '__class__' => static::class, diff --git a/projects/packages/changelogger/lib/ChangelogEntry.php b/projects/packages/changelogger/lib/ChangelogEntry.php index 1a195922b6b3f..25ab3862fe179 100644 --- a/projects/packages/changelogger/lib/ChangelogEntry.php +++ b/projects/packages/changelogger/lib/ChangelogEntry.php @@ -291,6 +291,7 @@ public function getChangesBySubheading( $subheading = null ) { * * @return array */ + #[\ReturnTypeWillChange] public function jsonSerialize() { return array( '__class__' => static::class, diff --git a/projects/packages/changelogger/phpunit.xml.dist b/projects/packages/changelogger/phpunit.xml.dist index ea660e61ba467..3b33f5ce990d1 100644 --- a/projects/packages/changelogger/phpunit.xml.dist +++ b/projects/packages/changelogger/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php/tests @@ -6,11 +6,8 @@ - . - - tests - vendor - + lib + src diff --git a/projects/packages/changelogger/src/AddCommand.php b/projects/packages/changelogger/src/AddCommand.php index eca4aea15e63b..c90763c307287 100644 --- a/projects/packages/changelogger/src/AddCommand.php +++ b/projects/packages/changelogger/src/AddCommand.php @@ -272,7 +272,7 @@ protected function execute( InputInterface $input, OutputInterface $output ) { $question = new Question( "Changelog entry. May not be empty.\n > ", $entry ); $question->setValidator( function ( $v ) { - if ( trim( $v ) === '' ) { + if ( trim( (string) $v ) === '' ) { throw new \RuntimeException( 'An empty changelog entry is only allowed when the significance is "patch".' ); } return $v; diff --git a/projects/packages/changelogger/src/Application.php b/projects/packages/changelogger/src/Application.php index 5a24b0285550d..6db71d340520e 100644 --- a/projects/packages/changelogger/src/Application.php +++ b/projects/packages/changelogger/src/Application.php @@ -18,7 +18,7 @@ */ class Application extends SymfonyApplication { - const VERSION = '3.0.1'; + const VERSION = '3.0.2-alpha'; /** * Constructor. diff --git a/projects/packages/codesniffer/changelog/add-test-with-php-8.1 b/projects/packages/codesniffer/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/codesniffer/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/codesniffer/changelog/fix-phpunit-configs b/projects/packages/codesniffer/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/codesniffer/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/codesniffer/phpunit.xml.dist b/projects/packages/codesniffer/phpunit.xml.dist index 98ca0f0599aee..fc66ada43af61 100644 --- a/projects/packages/codesniffer/phpunit.xml.dist +++ b/projects/packages/codesniffer/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php/tests @@ -6,11 +6,8 @@ - . - - tests - vendor - + hacks + Jetpack diff --git a/projects/packages/connection-ui/CHANGELOG.md b/projects/packages/connection-ui/CHANGELOG.md index e47c989021412..aeff00e3a5cc2 100644 --- a/projects/packages/connection-ui/CHANGELOG.md +++ b/projects/packages/connection-ui/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.5.3] - 2021-10-26 +### Added +- Add the redirect URI for RNA IDC "Start Fresh" functionality. + +### Changed +- Updated package dependencies. + ## [1.5.2] - 2021-10-19 ### Changed - Bump the RNA API version. @@ -98,6 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Connection UI: Building the Framework +[1.5.3]: https://github.com/Automattic/jetpack-connection-ui/compare/v1.5.2...v1.5.3 [1.5.2]: https://github.com/Automattic/jetpack-connection-ui/compare/v1.5.1...v1.5.2 [1.5.1]: https://github.com/Automattic/jetpack-connection-ui/compare/v1.5.0...v1.5.1 [1.5.0]: https://github.com/Automattic/jetpack-connection-ui/compare/v1.4.1...v1.5.0 diff --git a/projects/packages/connection-ui/changelog/add-rna-idc-start-fresh b/projects/packages/connection-ui/changelog/add-rna-idc-start-fresh deleted file mode 100644 index 44763ed0cfabe..0000000000000 --- a/projects/packages/connection-ui/changelog/add-rna-idc-start-fresh +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: added - -Add the redirect URI for RNA IDC "Start Fresh" functionality. diff --git a/projects/plugins/jetpack/changelog/update-connect-button-visual-component b/projects/packages/connection-ui/changelog/js-redirects-add-docs-and-tests similarity index 78% rename from projects/plugins/jetpack/changelog/update-connect-button-visual-component rename to projects/packages/connection-ui/changelog/js-redirects-add-docs-and-tests index a77e1d3bdc173..c47cb18e82997 100644 --- a/projects/plugins/jetpack/changelog/update-connect-button-visual-component +++ b/projects/packages/connection-ui/changelog/js-redirects-add-docs-and-tests @@ -1,4 +1,4 @@ Significance: patch -Type: compat +Type: changed Updated package dependencies. diff --git a/projects/packages/connection-ui/package.json b/projects/packages/connection-ui/package.json index ae447392eda83..516f4b1314fef 100644 --- a/projects/packages/connection-ui/package.json +++ b/projects/packages/connection-ui/package.json @@ -1,6 +1,6 @@ { "name": "jetpack-connection-manager-ui", - "version": "1.5.3-alpha", + "version": "1.5.4-alpha", "description": "Jetpack Connection Manager UI", "main": "_inc/admin.jsx", "repository": "https://github.com/Automattic/jetpack-connection-ui", @@ -15,9 +15,9 @@ }, "dependencies": { "@automattic/calypso-build": "9.0.0", - "@automattic/jetpack-api": "workspace:^0.5.0-alpha", - "@automattic/jetpack-connection": "workspace:^0.8.0-alpha", - "@automattic/jetpack-idc": "workspace:^0.4.0-alpha", + "@automattic/jetpack-api": "workspace:^0.5.0", + "@automattic/jetpack-connection": "workspace:^0.8.1-alpha", + "@automattic/jetpack-idc": "workspace:^0.4.1-alpha", "@babel/core": "7.15.0", "@babel/helper-module-imports": "7.14.5", "@babel/preset-env": "7.15.0", diff --git a/projects/packages/connection/CHANGELOG.md b/projects/packages/connection/CHANGELOG.md index a8625b0f67c7d..7f1d62d866763 100644 --- a/projects/packages/connection/CHANGELOG.md +++ b/projects/packages/connection/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.30.11] - 2021-10-26 +### Changed +- Change the error code returned when a remoteRegister XMLRPC call is executed to the more helpful "already_registered" when the blog is already registered +- Updated package dependencies. + ## [1.30.10] - 2021-10-19 ### Deprecated - General: remove numerous long-deprecated functions. @@ -446,6 +451,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Separate the connection library into its own package. +[1.30.11]: https://github.com/Automattic/jetpack-connection/compare/v1.30.10...v1.30.11 [1.30.10]: https://github.com/Automattic/jetpack-connection/compare/v1.30.9...v1.30.10 [1.30.9]: https://github.com/Automattic/jetpack-connection/compare/v1.30.8...v1.30.9 [1.30.8]: https://github.com/Automattic/jetpack-connection/compare/v1.30.7...v1.30.8 diff --git a/projects/packages/connection/changelog/add-test-with-php-8.1 b/projects/packages/connection/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/connection/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/connection/changelog/fix-phpunit-configs b/projects/packages/connection/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/connection/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/connection/changelog/update-remote-register-error-when-connected b/projects/packages/connection/changelog/update-remote-register-error-when-connected deleted file mode 100644 index 11f85bf2a936e..0000000000000 --- a/projects/packages/connection/changelog/update-remote-register-error-when-connected +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Change the error code returned when a remoteRegister XMLRPC call is executed to the more helpful "already_registered" when the blog is already registered diff --git a/projects/packages/connection/changelog/update-remote_request_query_args b/projects/packages/connection/changelog/update-remote_request_query_args new file mode 100644 index 0000000000000..6e4197504f86e --- /dev/null +++ b/projects/packages/connection/changelog/update-remote_request_query_args @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Client: add IDC query args to remote requests diff --git a/projects/packages/connection/composer.json b/projects/packages/connection/composer.json index 60dbedb208af0..2de879c046525 100644 --- a/projects/packages/connection/composer.json +++ b/projects/packages/connection/composer.json @@ -9,7 +9,7 @@ "automattic/jetpack-heartbeat": "^1.3", "automattic/jetpack-options": "^1.13", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9", "automattic/jetpack-tracking": "^1.13", "automattic/jetpack-redirect": "^1.7" diff --git a/projects/packages/connection/phpunit.xml.dist b/projects/packages/connection/phpunit.xml.dist index c320a122a62a5..76cce77ad0b15 100644 --- a/projects/packages/connection/phpunit.xml.dist +++ b/projects/packages/connection/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,8 @@ - . - - tests - vendor - wordpress - + src + legacy diff --git a/projects/packages/connection/src/class-client.php b/projects/packages/connection/src/class-client.php index 5500a75cd2c6f..2ea9a7374c5c8 100644 --- a/projects/packages/connection/src/class-client.php +++ b/projects/packages/connection/src/class-client.php @@ -23,6 +23,17 @@ class Client { * @return array|WP_Error WP HTTP response on success */ public static function remote_request( $args, $body = null ) { + if ( isset( $args['url'] ) ) { + /** + * Filters the remote request url. + * + * @since $$next-version$$ + * + * @param string The remote request url. + */ + $args['url'] = apply_filters( 'jetpack_remote_request_url', $args['url'] ); + } + $result = self::build_signed_request( $args, $body ); if ( ! $result || is_wp_error( $result ) ) { return $result; diff --git a/projects/packages/connection/src/class-package-version.php b/projects/packages/connection/src/class-package-version.php index 0a597359ca546..5c2cce2f65b7c 100644 --- a/projects/packages/connection/src/class-package-version.php +++ b/projects/packages/connection/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.30.11-alpha'; + const PACKAGE_VERSION = '1.30.12-alpha'; const PACKAGE_SLUG = 'connection'; diff --git a/projects/packages/connection/tests/php/test_Manager_unit.php b/projects/packages/connection/tests/php/test_Manager_unit.php index 923fcb101c497..453071ad2a890 100644 --- a/projects/packages/connection/tests/php/test_Manager_unit.php +++ b/projects/packages/connection/tests/php/test_Manager_unit.php @@ -557,7 +557,7 @@ public function test_update_connection_owner_with_successful_wpcom_request() { /** * Test disconnecting the site will remove tracked package verions. * - * @covers Automattic\Jetpack\Connection\Manager::test_disconnect_site + * @covers Automattic\Jetpack\Connection\Manager::disconnect_site */ public function test_disconnect_site_will_remove_tracked_package_versions() { $this->manager->method( 'disconnect_site_wpcom' ) diff --git a/projects/packages/constants/CHANGELOG.md b/projects/packages/constants/CHANGELOG.md index af561e6b95ef3..eaeee6dfaec58 100644 --- a/projects/packages/constants/CHANGELOG.md +++ b/projects/packages/constants/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.6.10] - 2021-10-26 +### Fixed +- Updated is_true docblock to be more accurate. + ## [1.6.9] - 2021-10-13 ### Changed - Updated package dependencies. @@ -96,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Packages: Finish the constants package +[1.6.10]: https://github.com/Automattic/jetpack-constants/compare/v1.6.9...v1.6.10 [1.6.9]: https://github.com/Automattic/jetpack-constants/compare/v1.6.8...v1.6.9 [1.6.8]: https://github.com/Automattic/jetpack-constants/compare/v1.6.7...v1.6.8 [1.6.7]: https://github.com/Automattic/jetpack-constants/compare/v1.6.6...v1.6.7 diff --git a/projects/packages/constants/changelog/add-test-with-php-8.1 b/projects/packages/constants/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/constants/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/constants/changelog/fix-phpunit-configs b/projects/packages/constants/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/constants/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/constants/changelog/kraftbj-patch-2 b/projects/packages/constants/changelog/kraftbj-patch-2 deleted file mode 100644 index d4401d18943ad..0000000000000 --- a/projects/packages/constants/changelog/kraftbj-patch-2 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -Updated is_true docblock to be more accurate. diff --git a/projects/packages/constants/phpunit.xml.dist b/projects/packages/constants/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/constants/phpunit.xml.dist +++ b/projects/packages/constants/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/device-detection/changelog/add-test-with-php-8.1 b/projects/packages/device-detection/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/device-detection/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/device-detection/changelog/fix-phpunit-configs b/projects/packages/device-detection/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/device-detection/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/device-detection/phpunit.xml.dist b/projects/packages/device-detection/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/device-detection/phpunit.xml.dist +++ b/projects/packages/device-detection/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/error/changelog/add-test-with-php-8.1 b/projects/packages/error/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/error/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/error/changelog/fix-phpunit-configs b/projects/packages/error/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/error/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/error/phpunit.xml.dist b/projects/packages/error/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/error/phpunit.xml.dist +++ b/projects/packages/error/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/identity-crisis/CHANGELOG.md b/projects/packages/identity-crisis/CHANGELOG.md index aff8efb1a2129..68fef4f1afd10 100644 --- a/projects/packages/identity-crisis/CHANGELOG.md +++ b/projects/packages/identity-crisis/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.3.0] - 2021-10-26 +### Added +- Add redirect_uri parameter for IDC Start Fresh endpoint. +- Delete the migrate_for_idc option when a remote request returns migrated_for_idc + +### Changed +- Updated package dependencies + ## [0.2.8] - 2021-10-13 ### Changed - Updated package dependencies. @@ -62,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated package dependencies. - Use Connection/Urls for home_url and site_url functions migrated from Sync. +[0.3.0]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.2.8...v0.3.0 [0.2.8]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.2.7...v0.2.8 [0.2.7]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.2.6...v0.2.7 [0.2.6]: https://github.com/Automattic/jetpack-identity-crisis/compare/v0.2.5...v0.2.6 diff --git a/projects/packages/identity-crisis/changelog/add-rna-idc-start-fresh b/projects/packages/identity-crisis/changelog/add-rna-idc-start-fresh deleted file mode 100644 index f4957d0361e06..0000000000000 --- a/projects/packages/identity-crisis/changelog/add-rna-idc-start-fresh +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Add redirect_uri parameter for IDC Start Fresh endpoint. diff --git a/projects/packages/identity-crisis/changelog/add-test-with-php-8.1 b/projects/packages/identity-crisis/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/identity-crisis/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/identity-crisis/changelog/fix-phpunit-configs b/projects/packages/identity-crisis/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/identity-crisis/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo b/projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo deleted file mode 100644 index 302aa8cf46b5c..0000000000000 --- a/projects/packages/identity-crisis/changelog/renovate-wordpress-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: changed - -Updated package dependencies diff --git a/projects/packages/identity-crisis/changelog/update-check_for_migrated_response b/projects/packages/identity-crisis/changelog/update-check_for_migrated_response deleted file mode 100644 index 69d2f3c474913..0000000000000 --- a/projects/packages/identity-crisis/changelog/update-check_for_migrated_response +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: added - -Delete the migrate_for_idc option when a remote request returns migrated_for_idc diff --git a/projects/packages/identity-crisis/changelog/update-remote_request_query_args b/projects/packages/identity-crisis/changelog/update-remote_request_query_args new file mode 100644 index 0000000000000..22d4b92686497 --- /dev/null +++ b/projects/packages/identity-crisis/changelog/update-remote_request_query_args @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Add the idc url query args to remote requests diff --git a/projects/packages/identity-crisis/changelog/update-remove_unused_idc_transient b/projects/packages/identity-crisis/changelog/update-remove_unused_idc_transient deleted file mode 100644 index 383bb4b779cd4..0000000000000 --- a/projects/packages/identity-crisis/changelog/update-remove_unused_idc_transient +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: removed -Comment: Remove the unused jetpack_idc_option transient - - diff --git a/projects/packages/identity-crisis/composer.json b/projects/packages/identity-crisis/composer.json index 70c883798533a..b1962bb6f766f 100644 --- a/projects/packages/identity-crisis/composer.json +++ b/projects/packages/identity-crisis/composer.json @@ -7,7 +7,7 @@ "automattic/jetpack-connection": "^1.30", "automattic/jetpack-constants": "^1.6", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-tracking": "^1.13", "automattic/jetpack-logo": "^1.5" }, diff --git a/projects/packages/identity-crisis/package.json b/projects/packages/identity-crisis/package.json index 0310be80d71cf..f472d3a6228b6 100644 --- a/projects/packages/identity-crisis/package.json +++ b/projects/packages/identity-crisis/package.json @@ -1,6 +1,6 @@ { "name": "jetpack-identity-crisis", - "version": "0.3.0-alpha", + "version": "0.3.1-alpha", "description": "Jetpack Identity Crisis", "main": "_inc/admin.jsx", "repository": "https://github.com/Automattic/jetpack-identity-crisis", diff --git a/projects/packages/identity-crisis/phpunit.xml.dist b/projects/packages/identity-crisis/phpunit.xml.dist index e9aeb7be7d9de..942e03602aa00 100644 --- a/projects/packages/identity-crisis/phpunit.xml.dist +++ b/projects/packages/identity-crisis/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - views - + src diff --git a/projects/packages/identity-crisis/src/class-identity-crisis.php b/projects/packages/identity-crisis/src/class-identity-crisis.php index 4d931855cde84..ee2a8783096cc 100644 --- a/projects/packages/identity-crisis/src/class-identity-crisis.php +++ b/projects/packages/identity-crisis/src/class-identity-crisis.php @@ -28,7 +28,7 @@ class Identity_Crisis { /** * Package Version */ - const PACKAGE_VERSION = '0.3.0-alpha'; + const PACKAGE_VERSION = '0.3.1-alpha'; /** * Instance of the object. @@ -84,6 +84,8 @@ private function __construct() { add_filter( 'jetpack_connection_disconnect_site_wpcom', array( __CLASS__, 'jetpack_connection_disconnect_site_wpcom_filter' ) ); + add_filter( 'jetpack_remote_request_url', array( $this, 'add_idc_query_args_to_url' ) ); + $urls_in_crisis = self::check_identity_crisis(); if ( false === $urls_in_crisis ) { return; @@ -191,6 +193,32 @@ public function wordpress_init() { } } + /** + * Add the idc query arguments to the url. + * + * @param string $url The remote request url. + */ + public function add_idc_query_args_to_url( $url ) { + if ( ! is_string( $url ) || self::validate_sync_error_idc_option() ) { + return $url; + } + + $query_args = array( + 'home' => Urls::home_url(), + 'siteurl' => Urls::site_url(), + ); + + if ( self::should_handle_idc() ) { + $query_args['idc'] = true; + } + + if ( \Jetpack_Options::get_option( 'migrate_for_idc', false ) ) { + $query_args['migrate_for_idc'] = true; + } + + return add_query_arg( $query_args, $url ); + } + /** * Non-admins current screen check. * diff --git a/projects/packages/identity-crisis/tests/php/test-identity-crisis.php b/projects/packages/identity-crisis/tests/php/test-identity-crisis.php index 24ec08adcff07..97970cbc7c1a2 100644 --- a/projects/packages/identity-crisis/tests/php/test-identity-crisis.php +++ b/projects/packages/identity-crisis/tests/php/test-identity-crisis.php @@ -15,6 +15,9 @@ * Test Identity_Crisis class */ class Test_Identity_Crisis extends BaseTestCase { + + const TEST_URL = 'https://www.example.org/test'; + /** * Set up tests. * @@ -345,6 +348,126 @@ public function test_get_sync_idc_option_with_ip_address_in_option() { $this->assertSame( $expected, $result ); } + /** + * Test the add_idc_query_args_to_url with null input. + */ + public function test_add_idc_query_args_to_url_input_null() { + $this->set_up_for_test_add_idc_query_args_to_url(); + + $result = Identity_Crisis::init()->add_idc_query_args_to_url( null ); + + $this->tear_down_for_test_add_idc_query_args_to_url(); + + $this->assertNull( $result ); + } + + /** + * Test the add_idc_query_args_to_url with a non-string input. + */ + public function test_add_idc_query_args_to_url_input_not_string() { + $this->set_up_for_test_add_idc_query_args_to_url(); + + $input = 123; + $result = Identity_Crisis::init()->add_idc_query_args_to_url( $input ); + + $this->tear_down_for_test_add_idc_query_args_to_url(); + + $this->assertSame( $input, $result ); + } + + /** + * Test the test_add_idc_query_args_to_url method with a valid url input. + */ + public function test_add_idc_query_args_to_url() { + $this->set_up_for_test_add_idc_query_args_to_url(); + $input_url = 'https://www.example.com'; + + $result = Identity_Crisis::init()->add_idc_query_args_to_url( $input_url ); + $url_parts = wp_parse_url( $result ); + $query_args = wp_parse_args( $url_parts['query'] ); + + $this->tear_down_for_test_add_idc_query_args_to_url(); + + $this->assertSame( self::TEST_URL, $query_args['siteurl'] ); + $this->assertSame( self::TEST_URL, $query_args['home'] ); + $this->assertSame( $input_url, $url_parts['scheme'] . '://' . $url_parts['host'] ); + + $this->assertSame( '1', $query_args['idc'] ); + $this->assertFalse( isset( $query_args['migrate_for_idc'] ) ); + } + + /** + * Test the add_idc_query_args_to_url with idc disabled with the `jetpack_should_handle_idc` + * filter. + */ + public function test_add_idc_query_args_to_url_no_idc() { + $this->set_up_for_test_add_idc_query_args_to_url(); + add_filter( 'jetpack_should_handle_idc', '__return_false' ); + + $input_url = 'https://www.example.com'; + + $result = Identity_Crisis::init()->add_idc_query_args_to_url( $input_url ); + $url_parts = wp_parse_url( $result ); + $query_args = wp_parse_args( $url_parts['query'] ); + + $this->tear_down_for_test_add_idc_query_args_to_url(); + remove_filter( 'jetpack_should_handle_idc', '__return_false' ); + + $this->assertSame( self::TEST_URL, $query_args['siteurl'] ); + $this->assertSame( self::TEST_URL, $query_args['home'] ); + $this->assertSame( $input_url, $url_parts['scheme'] . '://' . $url_parts['host'] ); + + $this->assertFalse( isset( $query_args['idc'] ) ); + $this->assertFalse( isset( $query_args['migrate_for_idc'] ) ); + } + + /** + * Test the add_idc_query_args_to_url with a migrade_for_idc option value of 1. + */ + public function test_add_idc_query_args_to_url_migrate_for_idc() { + $this->set_up_for_test_add_idc_query_args_to_url(); + \Jetpack_Options::update_option( 'migrate_for_idc', true ); + + $input_url = 'https://www.example.com'; + + $result = Identity_Crisis::init()->add_idc_query_args_to_url( $input_url ); + $url_parts = wp_parse_url( $result ); + $query_args = wp_parse_args( $url_parts['query'] ); + + $this->tear_down_for_test_add_idc_query_args_to_url(); + \Jetpack_Options::delete_option( 'migrate_for_idc' ); + + $this->assertSame( self::TEST_URL, $query_args['siteurl'] ); + $this->assertSame( self::TEST_URL, $query_args['home'] ); + $this->assertSame( $input_url, $url_parts['scheme'] . '://' . $url_parts['host'] ); + + $this->assertSame( '1', $query_args['idc'] ); + $this->assertSame( '1', $query_args['migrate_for_idc'] ); + } + + /** + * Set up test_add_idc_query_args_to_url test environment. + */ + public function set_up_for_test_add_idc_query_args_to_url() { + add_filter( 'jetpack_sync_site_url', array( $this, 'return_test_url' ) ); + add_filter( 'jetpack_sync_home_url', array( $this, 'return_test_url' ) ); + } + + /** + * Tear down test_add_idc_query_args_to_url test environment. + */ + public function tear_down_for_test_add_idc_query_args_to_url() { + remove_filter( 'jetpack_sync_site_url', array( $this, 'return_test_url' ) ); + remove_filter( 'jetpack_sync_home_url', array( $this, 'return_test_url' ) ); + } + + /** + * Returns the test url. + */ + public function return_test_url() { + return self::TEST_URL; + } + /** * Test the check_response_for_idc method when the response does not contain an error code. * diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md index 4267cdb26424b..5c57b0e17455e 100644 --- a/projects/packages/jitm/CHANGELOG.md +++ b/projects/packages/jitm/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.4] - 2021-10-26 +### Changed +- Updated package dependencies. + ## [2.0.3] - 2021-10-19 ### Changed - Updated package dependencies. @@ -314,6 +318,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Update Jetpack to use new JITM package +[2.0.4]: https://github.com/Automattic/jetpack-jitm/compare/v2.0.3...v2.0.4 [2.0.3]: https://github.com/Automattic/jetpack-jitm/compare/v2.0.2...v2.0.3 [2.0.2]: https://github.com/Automattic/jetpack-jitm/compare/v2.0.1...v2.0.2 [2.0.1]: https://github.com/Automattic/jetpack-jitm/compare/v2.0.0...v2.0.1 diff --git a/projects/packages/jitm/changelog/add-test-with-php-8.1 b/projects/packages/jitm/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/jitm/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/jitm/changelog/fix-phpunit-configs b/projects/packages/jitm/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/jitm/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json index c60d2123eacf5..91e7a5459891f 100644 --- a/projects/packages/jitm/composer.json +++ b/projects/packages/jitm/composer.json @@ -12,7 +12,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-partner": "^1.5", "automattic/jetpack-redirect": "^1.7", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-tracking": "^1.13" }, "require-dev": { diff --git a/projects/packages/jitm/phpunit.xml.dist b/projects/packages/jitm/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/jitm/phpunit.xml.dist +++ b/projects/packages/jitm/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php index 726899d672ce1..31550700b956c 100644 --- a/projects/packages/jitm/src/class-jitm.php +++ b/projects/packages/jitm/src/class-jitm.php @@ -20,7 +20,7 @@ */ class JITM { - const PACKAGE_VERSION = '2.0.3'; + const PACKAGE_VERSION = '2.0.5-alpha'; /** * The configuration method that is called from the jetpack-config package. diff --git a/projects/packages/lazy-images/changelog/add-test-with-php-8.1 b/projects/packages/lazy-images/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/lazy-images/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/lazy-images/changelog/fix-phpunit-configs b/projects/packages/lazy-images/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/lazy-images/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/lazy-images/phpunit.xml.dist b/projects/packages/lazy-images/phpunit.xml.dist index 0bc3e57afc612..2c94e3a1135fb 100644 --- a/projects/packages/lazy-images/phpunit.xml.dist +++ b/projects/packages/lazy-images/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - wordpress - + src diff --git a/projects/packages/licensing/changelog/add-test-with-php-8.1 b/projects/packages/licensing/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/licensing/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/licensing/changelog/fix-phpunit-configs b/projects/packages/licensing/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/licensing/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/licensing/phpunit.xml.dist b/projects/packages/licensing/phpunit.xml.dist index a2db1d1e41adb..ead7a82ff4b7d 100644 --- a/projects/packages/licensing/phpunit.xml.dist +++ b/projects/packages/licensing/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - wordpress - + src diff --git a/projects/packages/logo/changelog/add-test-with-php-8.1 b/projects/packages/logo/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/logo/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/logo/changelog/fix-phpunit-configs b/projects/packages/logo/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/logo/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/logo/phpunit.xml.dist b/projects/packages/logo/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/logo/phpunit.xml.dist +++ b/projects/packages/logo/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/partner/changelog/add-test-with-php-8.1 b/projects/packages/partner/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/partner/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/partner/changelog/fix-phpunit-configs b/projects/packages/partner/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/partner/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/partner/phpunit.xml.dist b/projects/packages/partner/phpunit.xml.dist index 035cc4607ab2b..4f347eb18836b 100644 --- a/projects/packages/partner/phpunit.xml.dist +++ b/projects/packages/partner/phpunit.xml.dist @@ -2,6 +2,7 @@ bootstrap="tests/php/bootstrap.php" backupGlobals="false" colors="true" + convertDeprecationsToExceptions="true" > @@ -10,11 +11,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/partner/tests/php/test-partner.php b/projects/packages/partner/tests/php/test-partner.php index 4607310f4eace..50df161f3469f 100644 --- a/projects/packages/partner/tests/php/test-partner.php +++ b/projects/packages/partner/tests/php/test-partner.php @@ -16,6 +16,7 @@ * Class Partner_Test * * @package Automattic\Jetpack + * @covers Automattic\Jetpack\Partner */ class Partner_Test extends TestCase { @@ -33,8 +34,6 @@ public function set_up() { /** * Tests the class returns the instance. - * - * @covers Automattic\Jetpack\Partner->init(); */ public function test_init_returns_instance() { $this->assertInstanceOf( Partner::class, Partner::init() ); @@ -71,8 +70,6 @@ public function code_provider() { * @param string $option_name Option and filter name. * * @throws Monkey\Expectation\Exception\ExpectationArgsRequired Function requires args. - * - * @covers Automattic\Partner->get_partner_code(); */ public function test_partner_code_is_empty_by_default( $code_type, $option_name ) { Functions\expect( 'get_option' )->once()->with( $option_name )->andReturn( '' ); @@ -88,8 +85,6 @@ public function test_partner_code_is_empty_by_default( $code_type, $option_name * @param string $option_name Option and filter name. * * @throws Monkey\Expectation\Exception\ExpectationArgsRequired Function requires args. - * - * @covers Automattic\Partner->get_partner_code(); */ public function test_partner_code_is_set_via_option( $code_type, $option_name ) { Functions\expect( 'get_option' )->once()->with( $option_name, '' )->andReturn( self::TEST_CODE ); @@ -105,8 +100,6 @@ public function test_partner_code_is_set_via_option( $code_type, $option_name ) * @param string $option_name Option and filter name. * * @throws Monkey\Expectation\Exception\ExpectationArgsRequired Function requires args. - * - * @covers Automattic\Partner->get_partner_code(); */ public function test_partner_code_is_set_via_filter( $code_type, $option_name ) { Functions\expect( 'get_option' )->once()->with( $option_name )->andReturn( '' ); diff --git a/projects/packages/password-checker/changelog/add-test-with-php-8.1 b/projects/packages/password-checker/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/password-checker/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/password-checker/changelog/fix-phpunit-configs b/projects/packages/password-checker/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/password-checker/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/password-checker/phpunit.xml.dist b/projects/packages/password-checker/phpunit.xml.dist index e9aeb7be7d9de..942e03602aa00 100644 --- a/projects/packages/password-checker/phpunit.xml.dist +++ b/projects/packages/password-checker/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - views - + src diff --git a/projects/packages/post-list/changelog/add-test-with-php-8.1 b/projects/packages/post-list/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/post-list/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/post-list/changelog/fix-phpunit-configs b/projects/packages/post-list/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/post-list/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/post-list/phpunit.xml.dist b/projects/packages/post-list/phpunit.xml.dist index 8fe1cf6a494b9..942e03602aa00 100644 --- a/projects/packages/post-list/phpunit.xml.dist +++ b/projects/packages/post-list/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - wordpress - + src diff --git a/projects/packages/redirect/CHANGELOG.md b/projects/packages/redirect/CHANGELOG.md index 2a35f3e72c6f5..9a602cb181b39 100644 --- a/projects/packages/redirect/CHANGELOG.md +++ b/projects/packages/redirect/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.7.5] - 2021-10-26 +### Changed +- Updated package dependencies. + ## [1.7.4] - 2021-10-13 ### Changed - Updated package dependencies. @@ -96,6 +100,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Create Jetpack Redirect package +[1.7.5]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.4...v1.7.5 [1.7.4]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.3...v1.7.4 [1.7.3]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.2...v1.7.3 [1.7.2]: https://github.com/Automattic/jetpack-redirect/compare/v1.7.1...v1.7.2 diff --git a/projects/packages/redirect/changelog/add-test-with-php-8.1 b/projects/packages/redirect/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/redirect/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/redirect/changelog/fix-phpunit-configs b/projects/packages/redirect/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/redirect/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/redirect/composer.json b/projects/packages/redirect/composer.json index 06d54e9ca1a29..2a0317a976bc1 100644 --- a/projects/packages/redirect/composer.json +++ b/projects/packages/redirect/composer.json @@ -4,7 +4,7 @@ "type": "library", "license": "GPL-2.0-or-later", "require": { - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "brain/monkey": "2.6.0", diff --git a/projects/packages/redirect/phpunit.xml.dist b/projects/packages/redirect/phpunit.xml.dist index e59df500905c4..55809161b0d3c 100644 --- a/projects/packages/redirect/phpunit.xml.dist +++ b/projects/packages/redirect/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/roles/changelog/add-test-with-php-8.1 b/projects/packages/roles/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/roles/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/roles/changelog/fix-phpunit-configs b/projects/packages/roles/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/roles/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/roles/phpunit.xml.dist b/projects/packages/roles/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/roles/phpunit.xml.dist +++ b/projects/packages/roles/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/search/changelog/add-test-with-php-8.1 b/projects/packages/search/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/search/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/search/changelog/fix-phpunit-configs b/projects/packages/search/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/search/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/search/phpunit.xml.dist b/projects/packages/search/phpunit.xml.dist index 47e186dc3d76a..942e03602aa00 100644 --- a/projects/packages/search/phpunit.xml.dist +++ b/projects/packages/search/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/status/CHANGELOG.md b/projects/packages/status/CHANGELOG.md index d587980f2cc66..062313c396f41 100644 --- a/projects/packages/status/CHANGELOG.md +++ b/projects/packages/status/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.9.0] - 2021-10-26 +### Added +- Added Host class for reporting known hosting environment information. + ## [1.8.4] - 2021-10-13 ### Changed - Updated package dependencies. @@ -120,6 +124,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Packages: Introduce a status package +[1.9.0]: https://github.com/Automattic/jetpack-status/compare/v1.8.4...v1.9.0 [1.8.4]: https://github.com/Automattic/jetpack-status/compare/v1.8.3...v1.8.4 [1.8.3]: https://github.com/Automattic/jetpack-status/compare/v1.8.2...v1.8.3 [1.8.2]: https://github.com/Automattic/jetpack-status/compare/v1.8.1...v1.8.2 diff --git a/projects/packages/status/changelog/add-test-with-php-8.1 b/projects/packages/status/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/status/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/status/changelog/fix-phpunit-configs b/projects/packages/status/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/status/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/status/composer.json b/projects/packages/status/composer.json index 638766258e520..0b8f27f703aca 100644 --- a/projects/packages/status/composer.json +++ b/projects/packages/status/composer.json @@ -3,7 +3,9 @@ "description": "Used to retrieve information about the current status of Jetpack and the site overall.", "type": "library", "license": "GPL-2.0-or-later", - "require": {}, + "require": { + "automattic/jetpack-constants": "^1.6" + }, "require-dev": { "brain/monkey": "2.6.0", "yoast/phpunit-polyfills": "1.0.2", @@ -45,7 +47,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.9.x-dev" } } } diff --git a/projects/packages/status/phpunit.xml.dist b/projects/packages/status/phpunit.xml.dist index 5a8d39342f5fc..2c94e3a1135fb 100644 --- a/projects/packages/status/phpunit.xml.dist +++ b/projects/packages/status/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/status/src/class-host.php b/projects/packages/status/src/class-host.php new file mode 100644 index 0000000000000..a0765f6d8f5ab --- /dev/null +++ b/projects/packages/status/src/class-host.php @@ -0,0 +1,40 @@ +is_atomic_platform() && ( ! empty( $at_options ) || Constants::is_true( 'WPCOMSH__PLUGIN_FILE' ) ); + } + + /** + * Determine if site is hosted on the Atomic hosting platform. + * + * @since $$next_version$$ + * + * @return bool; + */ + public function is_atomic_platform() { + return Constants::is_true( 'ATOMIC_SITE_ID' ) && Constants::is_true( 'ATOMIC_CLIENT_ID' ); + } + +} diff --git a/projects/packages/status/tests/php/test-host.php b/projects/packages/status/tests/php/test-host.php new file mode 100644 index 0000000000000..f5b9bb1b1d238 --- /dev/null +++ b/projects/packages/status/tests/php/test-host.php @@ -0,0 +1,102 @@ +host_obj = new Host(); + } + + /** + * Test teardown. + * + * @after + */ + public function tear_down() { + Monkey\tearDown(); + Constants::clear_constants(); + } + + /** + * Setup Atomic-defining constants. + */ + private function setup_atomic_constants() { + Constants::set_constant( 'ATOMIC_CLIENT_ID', 999 ); + Constants::set_constant( 'ATOMIC_SITE_ID', 999 ); + } + + /** + * Tests if WoA Site based on option + */ + public function test_woa_site_based_on_option() { + $this->setup_atomic_constants(); + Functions\when( 'get_option' )->justReturn( array( 'fruit' => 'apples' ) ); // Just need a non-empty value. + $this->assertTrue( $this->host_obj->is_woa_site() ); + } + + /** + * Tests if WoA Site based on option + */ + public function test_woa_site_based_on_constant() { + $this->setup_atomic_constants(); + Constants::set_constant( 'WPCOMSH__PLUGIN_FILE', true ); + Functions\when( 'get_option' )->justReturn( array() ); // Intentionally want to return empty the option. + $this->assertTrue( $this->host_obj->is_woa_site() ); + } + + /** + * Confirms a site is Atomic, but not WoA + */ + public function test_atomic_not_woa() { + $this->setup_atomic_constants(); + Constants::set_constant( 'WPCOMSH__PLUGIN_FILE', false ); + Functions\when( 'get_option' )->justReturn( array() ); // Intentionally want to return empty the option. + $this->assertTrue( $this->host_obj->is_atomic_platform() ); + $this->assertFalse( $this->host_obj->is_woa_site() ); + } + + /** + * Test if Atomic site based on constants. + */ + public function test_atomic_site_based_on_constants() { + $this->setup_atomic_constants(); + $this->assertTrue( $this->host_obj->is_atomic_platform() ); + } + + /** + * Test that lack of Atomic constants is false. + */ + public function test_false_for_not_atomic() { + Constants::set_constant( 'ATOMIC_CLIENT_ID', false ); + Constants::set_constant( 'ATOMIC_SITE_ID', false ); + $this->assertFalse( $this->host_obj->is_atomic_platform() ); + } + +} diff --git a/projects/packages/sync/CHANGELOG.md b/projects/packages/sync/CHANGELOG.md index 6770f8a461dfd..fc0e0cd32eb7c 100644 --- a/projects/packages/sync/CHANGELOG.md +++ b/projects/packages/sync/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.27.0] - 2021-10-26 +### Added +- Added the _wpas_feature_enabled meta key to the sync list +- Sync Error Log to capture failed sync requests. + +### Fixed +- Check the return value of get_comment() before to use it. +- Increase send timeout to 20 seconds allowing capture of WP.com 408 responses. + ## [1.26.4] - 2021-10-13 ### Changed - Sync Checksums: Convert text fields to latin1 before generating checksum. @@ -500,6 +509,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Packages: Move sync to a classmapped package +[1.27.0]: https://github.com/Automattic/jetpack-sync/compare/v1.26.4...v1.27.0 [1.26.4]: https://github.com/Automattic/jetpack-sync/compare/v1.26.3...v1.26.4 [1.26.3]: https://github.com/Automattic/jetpack-sync/compare/v1.26.2...v1.26.3 [1.26.2]: https://github.com/Automattic/jetpack-sync/compare/v1.26.1...v1.26.2 diff --git a/projects/packages/sync/changelog/add-test-with-php-8.1 b/projects/packages/sync/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/sync/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/sync/changelog/cfinke-get-comment b/projects/packages/sync/changelog/cfinke-get-comment deleted file mode 100644 index 812b2b7028a06..0000000000000 --- a/projects/packages/sync/changelog/cfinke-get-comment +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -Check the return value of get_comment() before to use it. diff --git a/projects/packages/sync/changelog/feature-sync-error-capture b/projects/packages/sync/changelog/feature-sync-error-capture deleted file mode 100644 index 58cace583c27c..0000000000000 --- a/projects/packages/sync/changelog/feature-sync-error-capture +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: added - -Sync Error Log to capture failed sync requests. diff --git a/projects/packages/sync/changelog/fix-phpunit-configs b/projects/packages/sync/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/sync/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/sync/changelog/fix-share-enabled-meta b/projects/packages/sync/changelog/fix-share-enabled-meta deleted file mode 100644 index 852c62572205c..0000000000000 --- a/projects/packages/sync/changelog/fix-share-enabled-meta +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: added - -Added the _wpas_feature_enabled meta key to the sync list diff --git a/projects/packages/sync/changelog/fix-sync-timeout-20 b/projects/packages/sync/changelog/fix-sync-timeout-20 deleted file mode 100644 index 9f058959abf69..0000000000000 --- a/projects/packages/sync/changelog/fix-sync-timeout-20 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fixed - -Increase send timeout to 20 seconds allowing capture of WP.com 408 responses. diff --git a/projects/packages/sync/changelog/update-remote_request_query_args b/projects/packages/sync/changelog/update-remote_request_query_args new file mode 100644 index 0000000000000..0636fe94468d0 --- /dev/null +++ b/projects/packages/sync/changelog/update-remote_request_query_args @@ -0,0 +1,5 @@ +Significance: patch +Type: removed +Comment: Actions: remove the IDC query args from sync requests + + diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json index 018055ae2e896..395a5ea39f55b 100644 --- a/projects/packages/sync/composer.json +++ b/projects/packages/sync/composer.json @@ -11,7 +11,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-password-checker": "^0.1", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", diff --git a/projects/packages/sync/phpunit.xml.dist b/projects/packages/sync/phpunit.xml.dist index e9aeb7be7d9de..942e03602aa00 100644 --- a/projects/packages/sync/phpunit.xml.dist +++ b/projects/packages/sync/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,7 @@ - . - - tests - vendor - views - + src diff --git a/projects/packages/sync/src/class-actions.php b/projects/packages/sync/src/class-actions.php index a6cbb7ec02b98..9fac9723eb625 100644 --- a/projects/packages/sync/src/class-actions.php +++ b/projects/packages/sync/src/class-actions.php @@ -8,7 +8,6 @@ namespace Automattic\Jetpack\Sync; use Automattic\Jetpack\Connection\Manager as Jetpack_Connection; -use Automattic\Jetpack\Connection\Urls; use Automattic\Jetpack\Constants; use Automattic\Jetpack\Identity_Crisis; use Automattic\Jetpack\Status; @@ -384,24 +383,14 @@ public static function send_data( $data, $codec_name, $sent_timestamp, $queue_id 'codec' => $codec_name, 'timestamp' => $sent_timestamp, 'queue' => $queue_id, - 'home' => Urls::home_url(), // Send home url option to check for Identity Crisis server-side. - 'siteurl' => Urls::site_url(), // Send siteurl option to check for Identity Crisis server-side. 'cd' => sprintf( '%.4f', $checkout_duration ), 'pd' => sprintf( '%.4f', $preprocess_duration ), 'queue_size' => $queue_size, 'buffer_id' => $buffer_id, ); - // Has the site opted in to IDC mitigation? - if ( Identity_Crisis::should_handle_idc() ) { - $query_args['idc'] = true; - } - - if ( \Jetpack_Options::get_option( 'migrate_for_idc', false ) ) { - $query_args['migrate_for_idc'] = true; - } - $query_args['timeout'] = Settings::is_doing_cron() ? 30 : 20; + if ( 'immediate-send' === $queue_id ) { $query_args['timeout'] = 30; } diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php index 61a57699fa728..74a08776d5d82 100644 --- a/projects/packages/sync/src/class-package-version.php +++ b/projects/packages/sync/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '1.27.0-alpha'; + const PACKAGE_VERSION = '1.27.1-alpha'; const PACKAGE_SLUG = 'sync'; diff --git a/projects/packages/terms-of-service/CHANGELOG.md b/projects/packages/terms-of-service/CHANGELOG.md index daed2cd919d76..741af0a502681 100644 --- a/projects/packages/terms-of-service/CHANGELOG.md +++ b/projects/packages/terms-of-service/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.9.13] - 2021-10-26 +### Changed +- Updated package dependencies. + ## [1.9.12] - 2021-10-13 ### Changed - Updated package dependencies. @@ -156,6 +160,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Package: Create new TOS package +[1.9.13]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.12...v1.9.13 [1.9.12]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.11...v1.9.12 [1.9.11]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.10...v1.9.11 [1.9.10]: https://github.com/Automattic/jetpack-terms-of-service/compare/v1.9.9...v1.9.10 diff --git a/projects/packages/terms-of-service/changelog/add-test-with-php-8.1 b/projects/packages/terms-of-service/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/terms-of-service/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/terms-of-service/changelog/fix-phpunit-configs b/projects/packages/terms-of-service/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/terms-of-service/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/terms-of-service/composer.json b/projects/packages/terms-of-service/composer.json index d77e848563061..421c8a570ab14 100644 --- a/projects/packages/terms-of-service/composer.json +++ b/projects/packages/terms-of-service/composer.json @@ -5,7 +5,7 @@ "license": "GPL-2.0-or-later", "require": { "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "brain/monkey": "2.6.0", diff --git a/projects/packages/terms-of-service/phpunit.xml.dist b/projects/packages/terms-of-service/phpunit.xml.dist index e59df500905c4..55809161b0d3c 100644 --- a/projects/packages/terms-of-service/phpunit.xml.dist +++ b/projects/packages/terms-of-service/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,7 @@ - . - - tests - vendor - + src diff --git a/projects/packages/tracking/CHANGELOG.md b/projects/packages/tracking/CHANGELOG.md index d7971b29e7410..3d5f6dae6cbe6 100644 --- a/projects/packages/tracking/CHANGELOG.md +++ b/projects/packages/tracking/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.13.14] - 2021-10-26 +### Changed +- Updated package dependencies. + ## [1.13.13] - 2021-10-13 ### Changed - Updated package dependencies. @@ -175,6 +179,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Create package for Jetpack Tracking +[1.13.14]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.13...v1.13.14 [1.13.13]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.12...v1.13.13 [1.13.12]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.11...v1.13.12 [1.13.11]: https://github.com/Automattic/jetpack-tracking/compare/v1.13.10...v1.13.11 diff --git a/projects/packages/tracking/changelog/add-test-with-php-8.1 b/projects/packages/tracking/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/packages/tracking/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/tracking/changelog/fix-phpunit-configs b/projects/packages/tracking/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/packages/tracking/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/packages/tracking/composer.json b/projects/packages/tracking/composer.json index f13a2f3a760b2..e0fd586d4bdd7 100644 --- a/projects/packages/tracking/composer.json +++ b/projects/packages/tracking/composer.json @@ -6,7 +6,7 @@ "require": { "automattic/jetpack-assets": "^1.11", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9" }, "require-dev": { diff --git a/projects/packages/tracking/phpunit.xml.dist b/projects/packages/tracking/phpunit.xml.dist index 5a8d39342f5fc..0847641107379 100644 --- a/projects/packages/tracking/phpunit.xml.dist +++ b/projects/packages/tracking/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,11 +6,8 @@ - . - - tests - vendor - + src + legacy diff --git a/projects/packages/tracking/tests/php/test-tracking.php b/projects/packages/tracking/tests/php/test-tracking.php index 79975e520857c..0043381527892 100644 --- a/projects/packages/tracking/tests/php/test-tracking.php +++ b/projects/packages/tracking/tests/php/test-tracking.php @@ -39,12 +39,12 @@ public function tear_down() { } /** - * Tests the Automattic\Jetpack\Tracking::should_enabled_tracking() method. + * Tests the Automattic\Jetpack\Tracking::should_enable_tracking() method. * * @param array $inputs The test input values. - * @param boolean $expected_output The expected output of Automattic\Jetpack\Tracking::should_enabled_tracking(). + * @param boolean $expected_output The expected output of Automattic\Jetpack\Tracking::should_enable_tracking(). * - * @covers Automattic\Jetpack\Tracking::should_enabled_tracking + * @covers Automattic\Jetpack\Tracking::should_enable_tracking * @dataProvider data_provider_test_should_enable_tracking */ public function test_should_enable_tracking( $inputs, $expected_output ) { diff --git a/projects/js-packages/connection/changelog/renovate-wordpress-monorepo b/projects/plugins/backup/changelog/2021-10-26-11-37-56-855892 similarity index 53% rename from projects/js-packages/connection/changelog/renovate-wordpress-monorepo rename to projects/plugins/backup/changelog/2021-10-26-11-37-56-855892 index 302aa8cf46b5c..c47cb18e82997 100644 --- a/projects/js-packages/connection/changelog/renovate-wordpress-monorepo +++ b/projects/plugins/backup/changelog/2021-10-26-11-37-56-855892 @@ -1,4 +1,4 @@ Significance: patch Type: changed -Updated package dependencies +Updated package dependencies. diff --git a/projects/plugins/backup/changelog/add-test-with-php-8.1 b/projects/plugins/backup/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/plugins/backup/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/packages/connection-ui/changelog/renovate-wordpress-monorepo b/projects/plugins/backup/changelog/fix-atomic-return-is-dev-version similarity index 53% rename from projects/packages/connection-ui/changelog/renovate-wordpress-monorepo rename to projects/plugins/backup/changelog/fix-atomic-return-is-dev-version index 302aa8cf46b5c..c47cb18e82997 100644 --- a/projects/packages/connection-ui/changelog/renovate-wordpress-monorepo +++ b/projects/plugins/backup/changelog/fix-atomic-return-is-dev-version @@ -1,4 +1,4 @@ Significance: patch Type: changed -Updated package dependencies +Updated package dependencies. diff --git a/projects/plugins/backup/changelog/fix-phpunit-configs b/projects/plugins/backup/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/plugins/backup/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/js-packages/idc/changelog/renovate-wordpress-monorepo b/projects/plugins/backup/changelog/js-redirects-add-docs-and-tests similarity index 53% rename from projects/js-packages/idc/changelog/renovate-wordpress-monorepo rename to projects/plugins/backup/changelog/js-redirects-add-docs-and-tests index 302aa8cf46b5c..c47cb18e82997 100644 --- a/projects/js-packages/idc/changelog/renovate-wordpress-monorepo +++ b/projects/plugins/backup/changelog/js-redirects-add-docs-and-tests @@ -1,4 +1,4 @@ Significance: patch Type: changed -Updated package dependencies +Updated package dependencies. diff --git a/projects/plugins/backup/composer.json b/projects/plugins/backup/composer.json index 79589f13972e6..18ecaf6d15eed 100644 --- a/projects/plugins/backup/composer.json +++ b/projects/plugins/backup/composer.json @@ -11,7 +11,7 @@ "automattic/jetpack-connection": "1.30.x-dev", "automattic/jetpack-connection-ui": "1.5.x-dev", "automattic/jetpack-sync": "1.27.x-dev", - "automattic/jetpack-status": "1.8.x-dev" + "automattic/jetpack-status": "1.9.x-dev" }, "require-dev": { "yoast/phpunit-polyfills": "1.0.2", diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 59246e1ac94f6..7e66a7ff46b59 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "21928cdc31a5d2103c7322f7a1c39e9a", + "content-hash": "f29723d98d27e645184209a8d262ff97", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -331,7 +331,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "047e6bc32be905fb4f282e38e1f560efdd347cdc" + "reference": "5ab0c2586815f558f97fb563395545dfa3dc0a70" }, "require": { "automattic/jetpack-a8c-mc-stats": "^1.4", @@ -340,7 +340,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-redirect": "^1.7", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9", "automattic/jetpack-tracking": "^1.13" }, @@ -593,14 +593,14 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "a9cabeec4cf44cc53b5dda1e726b55444f1b0d2e" + "reference": "973a4a14a59a209c16d7007a32b8d1653c84013f" }, "require": { "automattic/jetpack-connection": "^1.30", "automattic/jetpack-constants": "^1.6", "automattic/jetpack-logo": "^1.5", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-tracking": "^1.13" }, "require-dev": { @@ -810,10 +810,10 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "5b0dc4ca597044b0a2f211544b39fd509586a361" + "reference": "7c4c39cc68439aa3dfd732ee337ed546e3102cbf" }, "require": { - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -915,7 +915,10 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "e1ee707b99db540ad6ff853d053784e70d99bfd7" + "reference": "571e2e935ec72d87ebc020942221b932c1c8de7b" + }, + "require": { + "automattic/jetpack-constants": "^1.6" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -930,7 +933,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -966,7 +969,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ed861caa2a15b673f0e48b4ce75a7835541abf3f" + "reference": "c4857020268c97d26c0a9c63ce1da1f4b801eafd" }, "require": { "automattic/jetpack-connection": "^1.30", @@ -976,7 +979,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-password-checker": "^0.1", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -1033,11 +1036,11 @@ "dist": { "type": "path", "url": "../../packages/terms-of-service", - "reference": "3594a0ceb044973ed4a8198cca4b420c39d4e67b" + "reference": "b076ade5374c5fd5301e9fbab8f7e6783d6ac957" }, "require": { "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -1088,12 +1091,12 @@ "dist": { "type": "path", "url": "../../packages/tracking", - "reference": "0c8562d1f209ef123b72e607f79d76140e67f5a4" + "reference": "a9ed9bde1de5ab89483369ef2e76d06376efc695" }, "require": { "automattic/jetpack-assets": "^1.11", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9" }, "require-dev": { @@ -1560,16 +1563,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -1580,7 +1583,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -1610,9 +1614,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3053,7 +3057,6 @@ "type": "github" } ], - "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { diff --git a/projects/plugins/backup/package.json b/projects/plugins/backup/package.json index 10cb8f11fa1cc..c1e08e2a9afd0 100644 --- a/projects/plugins/backup/package.json +++ b/projects/plugins/backup/package.json @@ -27,9 +27,9 @@ "extends @wordpress/browserslist-config" ], "dependencies": { - "@automattic/jetpack-api": "workspace:^0.5.0-alpha", - "@automattic/jetpack-components": "workspace:^0.4.0-alpha", - "@automattic/jetpack-connection": "workspace:^0.8.0-alpha", + "@automattic/jetpack-api": "workspace:^0.5.0", + "@automattic/jetpack-components": "workspace:^0.4.1-alpha", + "@automattic/jetpack-connection": "workspace:^0.8.1-alpha", "@wordpress/api-fetch": "5.2.4", "@wordpress/data": "6.1.2", "@wordpress/date": "4.2.2", diff --git a/projects/plugins/backup/phpunit.xml.dist b/projects/plugins/backup/phpunit.xml.dist index 0bc3e57afc612..f0abf135b48ab 100644 --- a/projects/plugins/backup/phpunit.xml.dist +++ b/projects/plugins/backup/phpunit.xml.dist @@ -1,4 +1,4 @@ - + tests/php @@ -6,12 +6,8 @@ - . - - tests - vendor - wordpress - + src + jetpack-backup.php diff --git a/projects/plugins/boost/changelog/add-test-with-php-8.1 b/projects/plugins/boost/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..b250022fc78be --- /dev/null +++ b/projects/plugins/boost/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/plugins/boost/changelog/e2e-simplify-tunnel-cmd b/projects/plugins/boost/changelog/e2e-simplify-tunnel-cmd new file mode 100644 index 0000000000000..5d7a87912086a --- /dev/null +++ b/projects/plugins/boost/changelog/e2e-simplify-tunnel-cmd @@ -0,0 +1,4 @@ +Significance: minor +Type: changed + +E2E tests: update pnpm commands to use new tunnel wrapper script diff --git a/projects/packages/identity-crisis/changelog/update-idc-readme b/projects/plugins/boost/changelog/fix-atomic-return-is-dev-version similarity index 52% rename from projects/packages/identity-crisis/changelog/update-idc-readme rename to projects/plugins/boost/changelog/fix-atomic-return-is-dev-version index 2a9b002913875..9aa70e3ec1f75 100644 --- a/projects/packages/identity-crisis/changelog/update-idc-readme +++ b/projects/plugins/boost/changelog/fix-atomic-return-is-dev-version @@ -1,5 +1,5 @@ Significance: patch Type: changed -Comment: Update the readme +Comment: Updated composer.lock. diff --git a/projects/plugins/boost/changelog/fix-phpunit-configs b/projects/plugins/boost/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..5ea0395b59a01 --- /dev/null +++ b/projects/plugins/boost/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't. diff --git a/projects/js-packages/connection/changelog/add-rna-idc-start-fresh b/projects/plugins/boost/changelog/js-redirects-add-docs-and-tests similarity index 53% rename from projects/js-packages/connection/changelog/add-rna-idc-start-fresh rename to projects/plugins/boost/changelog/js-redirects-add-docs-and-tests index 91bb68306843b..b583093dfa997 100644 --- a/projects/js-packages/connection/changelog/add-rna-idc-start-fresh +++ b/projects/plugins/boost/changelog/js-redirects-add-docs-and-tests @@ -1,4 +1,4 @@ Significance: patch Type: changed -Package version bump. +updating internal dependencies diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 39d5ff88d3cdb..ca940f033ef43 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -267,7 +267,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "047e6bc32be905fb4f282e38e1f560efdd347cdc" + "reference": "5ab0c2586815f558f97fb563395545dfa3dc0a70" }, "require": { "automattic/jetpack-a8c-mc-stats": "^1.4", @@ -276,7 +276,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-redirect": "^1.7", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9", "automattic/jetpack-tracking": "^1.13" }, @@ -584,10 +584,10 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "5b0dc4ca597044b0a2f211544b39fd509586a361" + "reference": "7c4c39cc68439aa3dfd732ee337ed546e3102cbf" }, "require": { - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -689,7 +689,10 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "e1ee707b99db540ad6ff853d053784e70d99bfd7" + "reference": "571e2e935ec72d87ebc020942221b932c1c8de7b" + }, + "require": { + "automattic/jetpack-constants": "^1.6" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -704,7 +707,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -740,11 +743,11 @@ "dist": { "type": "path", "url": "../../packages/terms-of-service", - "reference": "3594a0ceb044973ed4a8198cca4b420c39d4e67b" + "reference": "b076ade5374c5fd5301e9fbab8f7e6783d6ac957" }, "require": { "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -795,12 +798,12 @@ "dist": { "type": "path", "url": "../../packages/tracking", - "reference": "0c8562d1f209ef123b72e607f79d76140e67f5a4" + "reference": "a9ed9bde1de5ab89483369ef2e76d06376efc695" }, "require": { "automattic/jetpack-assets": "^1.11", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9" }, "require-dev": { diff --git a/projects/plugins/boost/phpunit.xml.dist b/projects/plugins/boost/phpunit.xml.dist index 8b96b4ba69083..378c02b110e6f 100644 --- a/projects/plugins/boost/phpunit.xml.dist +++ b/projects/plugins/boost/phpunit.xml.dist @@ -5,6 +5,7 @@ convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" + convertDeprecationsToExceptions="true" > @@ -15,16 +16,8 @@ - ./ - - ./index.php - ./jetpack-boost.php - ./node_modules - ./tests - ./vendor - ./package - ./.github - + app + compatibility diff --git a/projects/plugins/boost/tests/e2e/package.json b/projects/plugins/boost/tests/e2e/package.json index b87c29918cb34..4ee3ce3da014e 100644 --- a/projects/plugins/boost/tests/e2e/package.json +++ b/projects/plugins/boost/tests/e2e/package.json @@ -18,10 +18,10 @@ "env-start": "e2e-env start --activate-plugins boost", "env-stop": "e2e-env stop", "env-reset": "e2e-env reset --activate-plugins boost", - "tunnel-on": "pm2 start ./node_modules/jetpack-e2e-commons/config/ecosystem.config.js && pm2 logs --nostream --lines 4", - "tunnel-reset": "rm -rf config/tmp && pnpm run tunnel-on", - "tunnel-off": "pm2 delete ./node_modules/jetpack-e2e-commons/config/ecosystem.config.js && NODE_ENV=test tunnel off", - "tunnel-write-logs": "pm2 logs --nostream --lines 10000 > output/logs/tunnel.log", + "tunnel-on": "tunnel up", + "tunnel-reset": "tunnel reset", + "tunnel-off": "tunnel down", + "tunnel-write-logs": "tunnel logs output/logs/tunnel.log", "pretest-e2e": "pnpm run clean", "test-e2e": ". ./node_modules/jetpack-e2e-commons/bin/app-password.sh && NODE_CONFIG_DIR='./config' jest --config jest.config.js --runInBand --verbose --detectOpenHandles --json --outputFile=output/summary.json", "test-decrypt-config": "openssl enc -md sha1 -aes-256-cbc -d -pass env:CONFIG_KEY -in ./node_modules/jetpack-e2e-commons/config/encrypted.enc -out ./config/local-test.js", @@ -41,8 +41,7 @@ "jest-junit": "^12.3.0", "jest-runner-groups": "^2.1.0", "jetpack-cli": "link:../../../../../tools/cli", - "jetpack-e2e-commons": "link:../../../../../tools/e2e-commons", - "pm2": "^5.1.2" + "jetpack-e2e-commons": "link:../../../../../tools/e2e-commons" }, "engines": { "node": "^14.17.6 || ^16.7.0", diff --git a/projects/plugins/boost/tests/e2e/pnpm-lock.yaml b/projects/plugins/boost/tests/e2e/pnpm-lock.yaml index f7b0f0760e10d..b97b15168ce4a 100644 --- a/projects/plugins/boost/tests/e2e/pnpm-lock.yaml +++ b/projects/plugins/boost/tests/e2e/pnpm-lock.yaml @@ -17,7 +17,6 @@ importers: jest-runner-groups: ^2.1.0 jetpack-cli: link:../../../../../tools/cli jetpack-e2e-commons: link:../../../../../tools/e2e-commons - pm2: ^5.1.2 devDependencies: '@babel/core': 7.15.8 '@babel/preset-env': 7.15.8_@babel+core@7.15.8 @@ -32,7 +31,6 @@ importers: jest-runner-groups: 2.1.0 jetpack-cli: link:../../../../../tools/cli jetpack-e2e-commons: link:../../../../../tools/e2e-commons - pm2: 5.1.2 packages: @@ -1474,99 +1472,6 @@ packages: fastq: 1.12.0 dev: true - /@opencensus/core/0.0.8: - resolution: {integrity: sha512-yUFT59SFhGMYQgX0PhoTR0LBff2BEhPrD9io1jWfF/VDbakRfs6Pq60rjv0Z7iaTav5gQlttJCX2+VPxFWCuoQ==} - engines: {node: '>=6.0'} - dependencies: - continuation-local-storage: 3.2.1 - log-driver: 1.2.7 - semver: 5.7.1 - shimmer: 1.2.1 - uuid: 3.4.0 - dev: true - - /@opencensus/core/0.0.9: - resolution: {integrity: sha512-31Q4VWtbzXpVUd2m9JS6HEaPjlKvNMOiF7lWKNmXF84yUcgfAFL5re7/hjDmdyQbOp32oGc+RFV78jXIldVz6Q==} - engines: {node: '>=6.0'} - dependencies: - continuation-local-storage: 3.2.1 - log-driver: 1.2.7 - semver: 5.7.1 - shimmer: 1.2.1 - uuid: 3.4.0 - dev: true - - /@opencensus/propagation-b3/0.0.8: - resolution: {integrity: sha512-PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A==} - engines: {node: '>=6.0'} - dependencies: - '@opencensus/core': 0.0.8 - uuid: 3.4.0 - dev: true - - /@pm2/agent/2.0.0: - resolution: {integrity: sha512-W1LvdyF1tGaVU5f/hV8DjpI5joI7MEgXiQMLZnTwZlFwDVP00O9s86571Q8xSiweTcFZFyye0F4wORN/PjSgGA==} - dependencies: - async: 3.2.1 - chalk: 3.0.0 - dayjs: 1.8.36 - debug: 4.3.2 - eventemitter2: 5.0.1 - fast-json-patch: 3.1.0 - fclone: 1.0.11 - nssocket: 0.6.0 - pm2-axon: 4.0.1 - pm2-axon-rpc: 0.7.1 - proxy-agent: 4.0.1 - semver: 7.2.3 - ws: 7.4.6 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - - /@pm2/io/5.0.0: - resolution: {integrity: sha512-3rToDVJaRoob5Lq8+7Q2TZFruoEkdORxwzFpZaqF4bmH6Bkd7kAbdPrI/z8X6k1Meq5rTtScM7MmDgppH6aLlw==} - engines: {node: '>=6.0'} - dependencies: - '@opencensus/core': 0.0.9 - '@opencensus/propagation-b3': 0.0.8 - async: 2.6.3 - debug: 4.3.2 - eventemitter2: 6.4.4 - require-in-the-middle: 5.1.0 - semver: 6.3.0 - shimmer: 1.2.1 - signal-exit: 3.0.3 - tslib: 1.9.3 - transitivePeerDependencies: - - supports-color - dev: true - - /@pm2/js-api/0.6.7: - resolution: {integrity: sha512-jiJUhbdsK+5C4zhPZNnyA3wRI01dEc6a2GhcQ9qI38DyIk+S+C8iC3fGjcjUbt/viLYKPjlAaE+hcT2/JMQPXw==} - engines: {node: '>=4.0'} - dependencies: - async: 2.6.3 - axios: 0.21.1_debug@4.3.2 - debug: 4.3.2 - eventemitter2: 6.4.4 - ws: 7.5.4 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - - /@pm2/pm2-version-check/1.0.4: - resolution: {integrity: sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA==} - dependencies: - debug: 4.3.2 - transitivePeerDependencies: - - supports-color - dev: true - /@sinonjs/commons/1.8.3: resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==} dependencies: @@ -1870,16 +1775,6 @@ packages: uri-js: 4.4.1 dev: true - /amp-message/0.1.2: - resolution: {integrity: sha1-p48cmJlQh602GSpBKY5NtJ49/EU=} - dependencies: - amp: 0.3.1 - dev: true - - /amp/0.3.1: - resolution: {integrity: sha1-at+NWKdPNh6CwfqNOJwHnhOfxH0=} - dev: true - /ansi-colors/4.1.1: resolution: {integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==} engines: {node: '>=6'} @@ -1987,36 +1882,11 @@ packages: resolution: {integrity: sha1-9wtzXGvKGlycItmCw+Oef+ujva0=} dev: true - /ast-types/0.13.4: - resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==} - engines: {node: '>=4'} - dependencies: - tslib: 2.3.1 - dev: true - /astral-regex/2.0.0: resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} engines: {node: '>=8'} dev: true - /async-listener/0.6.10: - resolution: {integrity: sha512-gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==} - engines: {node: <=0.11.8 || >0.11.10} - dependencies: - semver: 5.7.1 - shimmer: 1.2.1 - dev: true - - /async/2.6.3: - resolution: {integrity: sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==} - dependencies: - lodash: 4.17.21 - dev: true - - /async/3.2.1: - resolution: {integrity: sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==} - dev: true - /asynckit/0.4.0: resolution: {integrity: sha1-x57Zf380y48robyXkLzDZkdLS3k=} dev: true @@ -2026,14 +1896,6 @@ packages: engines: {node: '>=4'} dev: true - /axios/0.21.1_debug@4.3.2: - resolution: {integrity: sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==} - dependencies: - follow-redirects: 1.14.2_debug@4.3.2 - transitivePeerDependencies: - - debug - dev: true - /axobject-query/2.2.0: resolution: {integrity: sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==} dev: true @@ -2175,21 +2037,6 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} dev: true - /binary-extensions/2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - dev: true - - /blessed/0.1.81: - resolution: {integrity: sha1-+WLWh+wsNpVwrnGvhDJW5tDKESk=} - engines: {node: '>= 0.8.0'} - hasBin: true - dev: true - - /bodec/0.1.0: - resolution: {integrity: sha1-vIUVVUMPI8n3ZQp172TGqUw0GMw=} - dev: true - /brace-expansion/1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -2230,11 +2077,6 @@ packages: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} dev: true - /bytes/3.1.0: - resolution: {integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==} - engines: {node: '>= 0.8'} - dev: true - /call-bind/1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} dependencies: @@ -2270,14 +2112,6 @@ packages: supports-color: 5.5.0 dev: true - /chalk/3.0.0: - resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==} - engines: {node: '>=8'} - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - dev: true - /chalk/4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} @@ -2291,25 +2125,6 @@ packages: engines: {node: '>=10'} dev: true - /charm/0.1.2: - resolution: {integrity: sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=} - dev: true - - /chokidar/3.5.2: - resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==} - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.2 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.1 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /ci-info/3.2.0: resolution: {integrity: sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==} dev: true @@ -2318,13 +2133,6 @@ packages: resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==} dev: true - /cli-tableau/2.0.1: - resolution: {integrity: sha512-he+WTicka9cl0Fg/y+YyxcN6/bfQ/1O3QmgxRXDhABKqLzvoOSM4fMzp39uMyLBulAFuywD2N7UaoQE7WaADxQ==} - engines: {node: '>=8.10.0'} - dependencies: - chalk: 3.0.0 - dev: true - /cliui/7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} dependencies: @@ -2374,10 +2182,6 @@ packages: delayed-stream: 1.0.0 dev: true - /commander/2.15.1: - resolution: {integrity: sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==} - dev: true - /comment-parser/1.1.5: resolution: {integrity: sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==} engines: {node: '>= 10.0.0'} @@ -2394,13 +2198,6 @@ packages: json5: 2.2.0 dev: true - /continuation-local-storage/3.2.1: - resolution: {integrity: sha512-jx44cconVqkCEEyLSKWwkvUXwO561jXMa3LPjTPsm5QR22PA0/mhe33FT4Xb5y74JDvt/Cq+5lm8S8rskLv9ZA==} - dependencies: - async-listener: 0.6.10 - emitter-listener: 1.1.2 - dev: true - /convert-source-map/1.8.0: resolution: {integrity: sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==} dependencies: @@ -2419,10 +2216,6 @@ packages: requiresBuild: true dev: true - /core-util-is/1.0.2: - resolution: {integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=} - dev: true - /cosmiconfig/7.0.1: resolution: {integrity: sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==} engines: {node: '>=10'} @@ -2434,12 +2227,6 @@ packages: yaml: 1.10.2 dev: true - /cron/1.8.2: - resolution: {integrity: sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==} - dependencies: - moment-timezone: 0.5.33 - dev: true - /cross-spawn/7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} @@ -2464,19 +2251,10 @@ packages: cssom: 0.3.8 dev: true - /culvert/0.1.2: - resolution: {integrity: sha1-lQL18BVKLVoioCPnn3HMk2+m728=} - dev: true - /damerau-levenshtein/1.0.7: resolution: {integrity: sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==} dev: true - /data-uri-to-buffer/3.0.1: - resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==} - engines: {node: '>= 6'} - dev: true - /data-urls/2.0.0: resolution: {integrity: sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==} engines: {node: '>=10'} @@ -2486,10 +2264,6 @@ packages: whatwg-url: 8.7.0 dev: true - /dayjs/1.8.36: - resolution: {integrity: sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw==} - dev: true - /debug/2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} dependencies: @@ -2538,25 +2312,11 @@ packages: object-keys: 1.1.1 dev: true - /degenerator/2.2.0: - resolution: {integrity: sha512-aiQcQowF01RxFI4ZLFMpzyotbQonhNpBao6dkI8JPk5a+hmSjR5ErHp2CQySmQe8os3VBqLCIh87nDBgZXvsmg==} - engines: {node: '>= 6'} - dependencies: - ast-types: 0.13.4 - escodegen: 1.14.3 - esprima: 4.0.1 - dev: true - /delayed-stream/1.0.0: resolution: {integrity: sha1-3zrhmayt+31ECqrgsp4icrJOxhk=} engines: {node: '>=0.4.0'} dev: true - /depd/1.1.2: - resolution: {integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=} - engines: {node: '>= 0.6'} - dev: true - /detect-newline/3.1.0: resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==} engines: {node: '>=8'} @@ -2599,12 +2359,6 @@ packages: resolution: {integrity: sha512-Fk+5aD0HDi9i9ZKt9n2VPOZO1dQy7PV++hz2wJ/KIn+CvVfu4fny39squHtyVDPuHNuoJGAZIbuReEklqYIqfA==} dev: true - /emitter-listener/1.1.2: - resolution: {integrity: sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==} - dependencies: - shimmer: 1.2.1 - dev: true - /emittery/0.8.1: resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==} engines: {node: '>=10'} @@ -2683,19 +2437,6 @@ packages: engines: {node: '>=10'} dev: true - /escodegen/1.14.3: - resolution: {integrity: sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==} - engines: {node: '>=4.0'} - hasBin: true - dependencies: - esprima: 4.0.1 - estraverse: 4.3.0 - esutils: 2.0.3 - optionator: 0.8.3 - optionalDependencies: - source-map: 0.6.1 - dev: true - /escodegen/2.0.0: resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==} engines: {node: '>=6.0'} @@ -3008,18 +2749,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /eventemitter2/0.4.14: - resolution: {integrity: sha1-j2G3XN4BKy6esoTUVFWDtWQ7Yas=} - dev: true - - /eventemitter2/5.0.1: - resolution: {integrity: sha1-YZegldX7a1folC9v1+qtY6CclFI=} - dev: true - - /eventemitter2/6.4.4: - resolution: {integrity: sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw==} - dev: true - /execa/5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} @@ -3075,10 +2804,6 @@ packages: micromatch: 4.0.4 dev: true - /fast-json-patch/3.1.0: - resolution: {integrity: sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==} - dev: true - /fast-json-stable-stringify/2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} dev: true @@ -3099,10 +2824,6 @@ packages: bser: 2.1.1 dev: true - /fclone/1.0.11: - resolution: {integrity: sha1-EOhdo4v+p/xZk0HClu4ddyZu5kA=} - dev: true - /file-entry-cache/6.0.1: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} @@ -3110,11 +2831,6 @@ packages: flat-cache: 3.0.4 dev: true - /file-uri-to-path/2.0.0: - resolution: {integrity: sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==} - engines: {node: '>= 6'} - dev: true - /fill-range/7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -3149,18 +2865,6 @@ packages: resolution: {integrity: sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==} dev: true - /follow-redirects/1.14.2_debug@4.3.2: - resolution: {integrity: sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dependencies: - debug: 4.3.2 - dev: true - /form-data/3.0.1: resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==} engines: {node: '>= 6'} @@ -3170,15 +2874,6 @@ packages: mime-types: 2.1.32 dev: true - /fs-extra/8.1.0: - resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} - engines: {node: '>=6 <7 || >=8'} - dependencies: - graceful-fs: 4.2.8 - jsonfile: 4.0.0 - universalify: 0.1.2 - dev: true - /fs.realpath/1.0.0: resolution: {integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=} dev: true @@ -3187,17 +2882,10 @@ packages: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] + requiresBuild: true dev: true optional: true - /ftp/0.3.10: - resolution: {integrity: sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=} - engines: {node: '>=0.8.0'} - dependencies: - readable-stream: 1.1.14 - xregexp: 2.0.0 - dev: true - /function-bind/1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} dev: true @@ -3234,28 +2922,6 @@ packages: engines: {node: '>=10'} dev: true - /get-uri/3.0.2: - resolution: {integrity: sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==} - engines: {node: '>= 6'} - dependencies: - '@tootallnate/once': 1.1.2 - data-uri-to-buffer: 3.0.1 - debug: 4.3.2 - file-uri-to-path: 2.0.0 - fs-extra: 8.1.0 - ftp: 0.3.10 - transitivePeerDependencies: - - supports-color - dev: true - - /git-node-fs/1.0.0: - resolution: {integrity: sha1-SbIV4kLr5Dqkx1Ybu6SZUhdSCA8=} - dev: true - - /git-sha1/0.1.2: - resolution: {integrity: sha1-WZrBkrcYdYJeE6RF86bgURjC90U=} - dev: true - /glob-parent/5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -3357,17 +3023,6 @@ packages: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} dev: true - /http-errors/1.7.3: - resolution: {integrity: sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==} - engines: {node: '>= 0.6'} - dependencies: - depd: 1.1.2 - inherits: 2.0.4 - setprototypeof: 1.1.1 - statuses: 1.5.0 - toidentifier: 1.0.0 - dev: true - /http-proxy-agent/4.0.1: resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==} engines: {node: '>= 6'} @@ -3444,10 +3099,6 @@ packages: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} dev: true - /ini/1.3.8: - resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - dev: true - /internal-slot/1.0.3: resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==} engines: {node: '>= 0.4'} @@ -3457,10 +3108,6 @@ packages: side-channel: 1.0.4 dev: true - /ip/1.1.5: - resolution: {integrity: sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=} - dev: true - /is-arrayish/0.2.1: resolution: {integrity: sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=} dev: true @@ -3471,13 +3118,6 @@ packages: has-bigints: 1.0.1 dev: true - /is-binary-path/2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - dependencies: - binary-extensions: 2.2.0 - dev: true - /is-boolean-object/1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} @@ -3585,10 +3225,6 @@ packages: resolution: {integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=} dev: true - /isarray/0.0.1: - resolution: {integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=} - dev: true - /isexe/2.0.0: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} dev: true @@ -4128,15 +3764,6 @@ packages: - utf-8-validate dev: true - /js-git/0.7.8: - resolution: {integrity: sha1-UvplWrYYd9bxB578ZTS1VPMeVEQ=} - dependencies: - bodec: 0.1.0 - culvert: 0.1.2 - git-sha1: 0.1.2 - pako: 0.2.9 - dev: true - /js-tokens/4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true @@ -4228,11 +3855,6 @@ packages: resolution: {integrity: sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=} dev: true - /json-stringify-safe/5.0.1: - resolution: {integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=} - dev: true - optional: true - /json5/1.0.1: resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==} hasBin: true @@ -4248,12 +3870,6 @@ packages: minimist: 1.2.5 dev: true - /jsonfile/4.0.0: - resolution: {integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=} - optionalDependencies: - graceful-fs: 4.2.8 - dev: true - /jsx-ast-utils/3.2.0: resolution: {integrity: sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q==} engines: {node: '>=4.0'} @@ -4277,11 +3893,6 @@ packages: language-subtag-registry: 0.3.21 dev: true - /lazy/1.0.11: - resolution: {integrity: sha1-2qBoIGKCVCwIgojpdcKXwa53tpA=} - engines: {node: '>=0.2.0'} - dev: true - /leven/3.1.0: resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} engines: {node: '>=6'} @@ -4352,11 +3963,6 @@ packages: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} dev: true - /log-driver/1.2.7: - resolution: {integrity: sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==} - engines: {node: '>=0.8.6'} - dev: true - /loose-envify/1.4.0: resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==} hasBin: true @@ -4364,12 +3970,6 @@ packages: js-tokens: 4.0.0 dev: true - /lru-cache/5.1.1: - resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - dependencies: - yallist: 3.1.1 - dev: true - /lru-cache/6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} @@ -4440,20 +4040,6 @@ packages: hasBin: true dev: true - /module-details-from-path/1.0.3: - resolution: {integrity: sha1-EUyUlnPiqKNenTV4hSeqN7Z52is=} - dev: true - - /moment-timezone/0.5.33: - resolution: {integrity: sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w==} - dependencies: - moment: 2.29.1 - dev: true - - /moment/2.29.1: - resolution: {integrity: sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==} - dev: true - /ms/2.0.0: resolution: {integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=} dev: true @@ -4466,29 +4052,10 @@ packages: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} dev: true - /mute-stream/0.0.8: - resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==} - dev: true - /natural-compare/1.4.0: resolution: {integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=} dev: true - /needle/2.4.0: - resolution: {integrity: sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==} - engines: {node: '>= 4.4.x'} - hasBin: true - dependencies: - debug: 3.2.7 - iconv-lite: 0.4.24 - sax: 1.2.4 - dev: true - - /netmask/2.0.2: - resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==} - engines: {node: '>= 0.4.0'} - dev: true - /node-int64/0.4.0: resolution: {integrity: sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=} dev: true @@ -4523,14 +4090,6 @@ packages: path-key: 3.1.1 dev: true - /nssocket/0.6.0: - resolution: {integrity: sha1-Wflvb/MhVm8zxw99vu7N/cBxVPo=} - engines: {node: '>= 0.10.x'} - dependencies: - eventemitter2: 0.4.14 - lazy: 1.0.11 - dev: true - /nwsapi/2.2.0: resolution: {integrity: sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==} dev: true @@ -4662,36 +4221,6 @@ packages: engines: {node: '>=6'} dev: true - /pac-proxy-agent/4.1.0: - resolution: {integrity: sha512-ejNgYm2HTXSIYX9eFlkvqFp8hyJ374uDf0Zq5YUAifiSh1D6fo+iBivQZirGvVv8dCYUsLhmLBRhlAYvBKI5+Q==} - engines: {node: '>= 6'} - dependencies: - '@tootallnate/once': 1.1.2 - agent-base: 6.0.2 - debug: 4.3.2 - get-uri: 3.0.2 - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.0 - pac-resolver: 4.2.0 - raw-body: 2.4.1 - socks-proxy-agent: 5.0.1 - transitivePeerDependencies: - - supports-color - dev: true - - /pac-resolver/4.2.0: - resolution: {integrity: sha512-rPACZdUyuxT5Io/gFKUeeZFfE5T7ve7cAkE5TUZRRfuKP0u5Hocwe48X7ZEm6mYB+bTB0Qf+xlVlA/RM/i6RCQ==} - engines: {node: '>= 6'} - dependencies: - degenerator: 2.2.0 - ip: 1.1.5 - netmask: 2.0.2 - dev: true - - /pako/0.2.9: - resolution: {integrity: sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=} - dev: true - /parent-module/1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} engines: {node: '>=6'} @@ -4762,13 +4291,6 @@ packages: engines: {node: '>=8.6'} dev: true - /pidusage/2.0.21: - resolution: {integrity: sha512-cv3xAQos+pugVX+BfXpHsbyz/dLzX+lr44zNMsYiGxUw+kV5sgQCIcLd1z+0vq+KyC7dJ+/ts2PsfgWfSC3WXA==} - engines: {node: '>=8'} - dependencies: - safe-buffer: 5.2.1 - dev: true - /pify/3.0.0: resolution: {integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=} engines: {node: '>=4'} @@ -4802,96 +4324,6 @@ packages: find-up: 2.1.0 dev: true - /pm2-axon-rpc/0.7.1: - resolution: {integrity: sha512-FbLvW60w+vEyvMjP/xom2UPhUN/2bVpdtLfKJeYM3gwzYhoTEEChCOICfFzxkxuoEleOlnpjie+n1nue91bDQw==} - engines: {node: '>=5'} - dependencies: - debug: 4.3.2 - transitivePeerDependencies: - - supports-color - dev: true - - /pm2-axon/4.0.1: - resolution: {integrity: sha512-kES/PeSLS8orT8dR5jMlNl+Yu4Ty3nbvZRmaAtROuVm9nYYGiaoXqqKQqQYzWQzMYWUKHMQTvBlirjE5GIIxqg==} - engines: {node: '>=5'} - dependencies: - amp: 0.3.1 - amp-message: 0.1.2 - debug: 4.3.2 - escape-string-regexp: 4.0.0 - transitivePeerDependencies: - - supports-color - dev: true - - /pm2-deploy/1.0.2: - resolution: {integrity: sha512-YJx6RXKrVrWaphEYf++EdOOx9EH18vM8RSZN/P1Y+NokTKqYAca/ejXwVLyiEpNju4HPZEk3Y2uZouwMqUlcgg==} - engines: {node: '>=4.0.0'} - dependencies: - run-series: 1.1.9 - tv4: 1.3.0 - dev: true - - /pm2-multimeter/0.1.2: - resolution: {integrity: sha1-Gh5VFT1BoFU0zqI8/oYKuqDrSs4=} - dependencies: - charm: 0.1.2 - dev: true - - /pm2-sysmonit/1.2.8: - resolution: {integrity: sha512-ACOhlONEXdCTVwKieBIQLSi2tQZ8eKinhcr9JpZSUAL8Qy0ajIgRtsLxG/lwPOW3JEKqPyw/UaHmTWhUzpP4kA==} - dependencies: - async: 3.2.1 - debug: 4.3.2 - pidusage: 2.0.21 - systeminformation: 5.8.6 - tx2: 1.0.4 - transitivePeerDependencies: - - supports-color - dev: true - optional: true - - /pm2/5.1.2: - resolution: {integrity: sha512-2nJQeCWjkN0WnTkWctaoZpqrJTiUN/Icw76IMVHHzPhr/p7yQYlEQgHzlL5IFWxO2N1HdBNXNdZft2p4HUmUcA==} - engines: {node: '>=10.0.0'} - hasBin: true - dependencies: - '@pm2/agent': 2.0.0 - '@pm2/io': 5.0.0 - '@pm2/js-api': 0.6.7 - '@pm2/pm2-version-check': 1.0.4 - async: 3.2.1 - blessed: 0.1.81 - chalk: 3.0.0 - chokidar: 3.5.2 - cli-tableau: 2.0.1 - commander: 2.15.1 - cron: 1.8.2 - dayjs: 1.8.36 - debug: 4.3.2 - enquirer: 2.3.6 - eventemitter2: 5.0.1 - fclone: 1.0.11 - mkdirp: 1.0.4 - needle: 2.4.0 - pidusage: 2.0.21 - pm2-axon: 4.0.1 - pm2-axon-rpc: 0.7.1 - pm2-deploy: 1.0.2 - pm2-multimeter: 0.1.2 - promptly: 2.2.0 - semver: 7.3.5 - source-map-support: 0.5.19 - sprintf-js: 1.1.2 - vizion: 2.2.1 - yamljs: 0.3.0 - optionalDependencies: - pm2-sysmonit: 1.2.8 - transitivePeerDependencies: - - bufferutil - - supports-color - - utf-8-validate - dev: true - /prelude-ls/1.1.2: resolution: {integrity: sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=} engines: {node: '>= 0.8.0'} @@ -4924,12 +4356,6 @@ packages: engines: {node: '>=0.4.0'} dev: true - /promptly/2.2.0: - resolution: {integrity: sha1-KhP6BjaIoqWYOxYf/wEIoH0m/HQ=} - dependencies: - read: 1.0.7 - dev: true - /prompts/2.4.1: resolution: {integrity: sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==} engines: {node: '>= 6'} @@ -4946,26 +4372,6 @@ packages: react-is: 16.13.1 dev: true - /proxy-agent/4.0.1: - resolution: {integrity: sha512-ODnQnW2jc/FUVwHHuaZEfN5otg/fMbvMxz9nMSUQfJ9JU7q2SZvSULSsjLloVgJOiv9yhc8GlNMKc4GkFmcVEA==} - engines: {node: '>=6'} - dependencies: - agent-base: 6.0.2 - debug: 4.3.2 - http-proxy-agent: 4.0.1 - https-proxy-agent: 5.0.0 - lru-cache: 5.1.1 - pac-proxy-agent: 4.1.0 - proxy-from-env: 1.1.0 - socks-proxy-agent: 5.0.1 - transitivePeerDependencies: - - supports-color - dev: true - - /proxy-from-env/1.1.0: - resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: true - /psl/1.8.0: resolution: {integrity: sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==} dev: true @@ -4979,16 +4385,6 @@ packages: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true - /raw-body/2.4.1: - resolution: {integrity: sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==} - engines: {node: '>= 0.8'} - dependencies: - bytes: 3.1.0 - http-errors: 1.7.3 - iconv-lite: 0.4.24 - unpipe: 1.0.0 - dev: true - /react-is/16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} dev: true @@ -5014,29 +4410,6 @@ packages: path-type: 3.0.0 dev: true - /read/1.0.7: - resolution: {integrity: sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=} - engines: {node: '>=0.8'} - dependencies: - mute-stream: 0.0.8 - dev: true - - /readable-stream/1.1.14: - resolution: {integrity: sha1-fPTFTvZI44EwhMY23SB54WbAgdk=} - dependencies: - core-util-is: 1.0.2 - inherits: 2.0.4 - isarray: 0.0.1 - string_decoder: 0.10.31 - dev: true - - /readdirp/3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.0 - dev: true - /regenerate-unicode-properties/8.2.0: resolution: {integrity: sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==} engines: {node: '>=4'} @@ -5109,16 +4482,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /require-in-the-middle/5.1.0: - resolution: {integrity: sha512-M2rLKVupQfJ5lf9OvqFGIT+9iVLnTmjgbOmpil12hiSQNn5zJTKGPoIisETNjfK+09vP3rpm1zJajmErpr2sEQ==} - dependencies: - debug: 4.3.2 - module-details-from-path: 1.0.3 - resolve: 1.20.0 - transitivePeerDependencies: - - supports-color - dev: true - /requireindex/1.2.0: resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==} engines: {node: '>=0.10.5'} @@ -5173,26 +4536,14 @@ packages: queue-microtask: 1.2.3 dev: true - /run-series/1.1.9: - resolution: {integrity: sha512-Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g==} - dev: true - /safe-buffer/5.1.2: resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} dev: true - /safe-buffer/5.2.1: - resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} - dev: true - /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true - /sax/1.2.4: - resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} - dev: true - /saxes/5.0.1: resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==} engines: {node: '>=10'} @@ -5215,12 +4566,6 @@ packages: hasBin: true dev: true - /semver/7.2.3: - resolution: {integrity: sha512-utbW9Z7ZxVvwiIWkdOMLOR9G/NFXh2aRucghkVrEMJWuC++r3lCkBC3LwqBinyHzGMAJxY5tn6VakZGHObq5ig==} - engines: {node: '>=10'} - hasBin: true - dev: true - /semver/7.3.5: resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==} engines: {node: '>=10'} @@ -5229,10 +4574,6 @@ packages: lru-cache: 6.0.0 dev: true - /setprototypeof/1.1.1: - resolution: {integrity: sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==} - dev: true - /shebang-command/2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} @@ -5245,10 +4586,6 @@ packages: engines: {node: '>=8'} dev: true - /shimmer/1.2.1: - resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==} - dev: true - /side-channel/1.0.4: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: @@ -5279,30 +4616,6 @@ packages: is-fullwidth-code-point: 3.0.0 dev: true - /smart-buffer/4.2.0: - resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==} - engines: {node: '>= 6.0.0', npm: '>= 3.0.0'} - dev: true - - /socks-proxy-agent/5.0.1: - resolution: {integrity: sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==} - engines: {node: '>= 6'} - dependencies: - agent-base: 6.0.2 - debug: 4.3.2 - socks: 2.6.1 - transitivePeerDependencies: - - supports-color - dev: true - - /socks/2.6.1: - resolution: {integrity: sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==} - engines: {node: '>= 10.13.0', npm: '>= 3.0.0'} - dependencies: - ip: 1.1.5 - smart-buffer: 4.2.0 - dev: true - /source-map-support/0.5.19: resolution: {integrity: sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==} dependencies: @@ -5351,10 +4664,6 @@ packages: resolution: {integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=} dev: true - /sprintf-js/1.1.2: - resolution: {integrity: sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==} - dev: true - /stack-utils/2.0.3: resolution: {integrity: sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==} engines: {node: '>=10'} @@ -5362,11 +4671,6 @@ packages: escape-string-regexp: 2.0.0 dev: true - /statuses/1.5.0: - resolution: {integrity: sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=} - engines: {node: '>= 0.6'} - dev: true - /string-length/4.0.2: resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} engines: {node: '>=10'} @@ -5411,10 +4715,6 @@ packages: define-properties: 1.1.3 dev: true - /string_decoder/0.10.31: - resolution: {integrity: sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=} - dev: true - /strip-ansi/5.2.0: resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==} engines: {node: '>=6'} @@ -5482,14 +4782,6 @@ packages: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} dev: true - /systeminformation/5.8.6: - resolution: {integrity: sha512-R37NZR9f6OejKvERiatjh1vK49xkJ/MOgFpwpCw2h0NoD+1nKAgGzxkyjNX7bsf6ADaKzyAZ2SFK1mXddytIaA==} - engines: {node: '>=4.0.0'} - os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos] - hasBin: true - dev: true - optional: true - /table/6.7.1: resolution: {integrity: sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==} engines: {node: '>=10.0.0'} @@ -5543,11 +4835,6 @@ packages: is-number: 7.0.0 dev: true - /toidentifier/1.0.0: - resolution: {integrity: sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==} - engines: {node: '>=0.6'} - dev: true - /tough-cookie/4.0.0: resolution: {integrity: sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==} engines: {node: '>=6'} @@ -5577,14 +4864,6 @@ packages: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} dev: true - /tslib/1.9.3: - resolution: {integrity: sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==} - dev: true - - /tslib/2.3.1: - resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} - dev: true - /tsutils/3.21.0: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} @@ -5594,18 +4873,6 @@ packages: tslib: 1.14.1 dev: true - /tv4/1.3.0: - resolution: {integrity: sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM=} - engines: {node: '>= 0.8.0'} - dev: true - - /tx2/1.0.4: - resolution: {integrity: sha512-rU+y30nUY3PyIi+znvv74HzxlpULKwMPAyRK+YiCjvGkk3rY3fic3D6Z+avLpun3V5A6HFwPQ9JrBTMNEV/dxg==} - dependencies: - json-stringify-safe: 5.0.1 - dev: true - optional: true - /type-check/0.3.2: resolution: {integrity: sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=} engines: {node: '>= 0.8.0'} @@ -5683,23 +4950,12 @@ packages: engines: {node: '>= 4.0.0'} dev: true - /unpipe/1.0.0: - resolution: {integrity: sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=} - engines: {node: '>= 0.8'} - dev: true - /uri-js/4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: punycode: 2.1.1 dev: true - /uuid/3.4.0: - resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==} - deprecated: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. - hasBin: true - dev: true - /uuid/8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} hasBin: true @@ -5725,16 +4981,6 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vizion/2.2.1: - resolution: {integrity: sha512-sfAcO2yeSU0CSPFI/DmZp3FsFE9T+8913nv1xWBOyzODv13fwkn6Vl7HqxGpkr9F608M+8SuFId3s+BlZqfXww==} - engines: {node: '>=4.0'} - dependencies: - async: 2.6.3 - git-node-fs: 1.0.0 - ini: 1.3.8 - js-git: 0.7.8 - dev: true - /w3c-hr-time/1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} dependencies: @@ -5834,19 +5080,6 @@ packages: typedarray-to-buffer: 3.1.5 dev: true - /ws/7.4.6: - resolution: {integrity: sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==} - engines: {node: '>=8.3.0'} - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - dev: true - /ws/7.5.4: resolution: {integrity: sha512-zP9z6GXm6zC27YtspwH99T3qTG7bBFv2VIkeHstMLrLlDJuzA7tQ5ls3OJ1hOGGCzTQPniNJoHXIAOS0Jljohg==} engines: {node: '>=8.3.0'} @@ -5872,19 +5105,11 @@ packages: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} dev: true - /xregexp/2.0.0: - resolution: {integrity: sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=} - dev: true - /y18n/5.0.8: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} dev: true - /yallist/3.1.1: - resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - dev: true - /yallist/4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true @@ -5894,14 +5119,6 @@ packages: engines: {node: '>= 6'} dev: true - /yamljs/0.3.0: - resolution: {integrity: sha512-C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ==} - hasBin: true - dependencies: - argparse: 1.0.10 - glob: 7.1.7 - dev: true - /yargs-parser/20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} diff --git a/projects/plugins/debug-helper/changelog/update-idc_simulator_disable_sync b/projects/plugins/debug-helper/changelog/update-idc_simulator_disable_sync new file mode 100644 index 0000000000000..434f503481978 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/update-idc_simulator_disable_sync @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +IDC Simulator: add setting to enable and disable Sync diff --git a/projects/plugins/debug-helper/changelog/update-idc_simulator_display_options b/projects/plugins/debug-helper/changelog/update-idc_simulator_display_options new file mode 100644 index 0000000000000..71f21c84d00f1 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/update-idc_simulator_display_options @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +Display the IDC option values (sync_error_idc, migrate_for_idc, and safe_mode_confirmed) diff --git a/projects/plugins/debug-helper/changelog/update-idc_simulator_display_requests b/projects/plugins/debug-helper/changelog/update-idc_simulator_display_requests new file mode 100644 index 0000000000000..0a3a6de53d2a9 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/update-idc_simulator_display_requests @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +IDC Simulator: display the last five remote requests diff --git a/projects/plugins/debug-helper/changelog/update-idc_simulator_send_request b/projects/plugins/debug-helper/changelog/update-idc_simulator_send_request new file mode 100644 index 0000000000000..0d659df23ffe2 --- /dev/null +++ b/projects/plugins/debug-helper/changelog/update-idc_simulator_send_request @@ -0,0 +1,4 @@ +Significance: patch +Type: added + +IDC Simulator: Add a button that triggers an authenticated remote request diff --git a/projects/plugins/debug-helper/modules/class-idc-simulator.php b/projects/plugins/debug-helper/modules/class-idc-simulator.php index 431d49e48c121..665c38a2c14c4 100644 --- a/projects/plugins/debug-helper/modules/class-idc-simulator.php +++ b/projects/plugins/debug-helper/modules/class-idc-simulator.php @@ -18,13 +18,33 @@ class IDC_Simulator { * * @var mixed|string */ - public $notice_type = 'success'; + public $notice_type = ''; + + /** + * Stored success notice type. + */ + const STORED_SUCCESS_NOTICE_TYPE = 'stored_success'; + + /** + * Request success notice type. + */ + const REQUEST_SUCCESS_NOTICE_TYPE = 'request_success'; + + /** + * Error notice type. + */ + const UNKNOWN_ERROR_NOTICE_TYPE = 'unknown_error'; /** * Options. */ const STORED_OPTIONS_KEY = 'idc_simulator_stored_options'; + /** + * Request option key. + */ + const REQUESTS_OPTION_KEY = 'idc_simulator_requests_option'; + /** * IDC_Simulator constructor. */ @@ -36,8 +56,10 @@ public function __construct() { // Stored options. add_action( 'admin_post_store_current_options', array( $this, 'admin_post_store_current_options' ) ); + add_action( 'admin_post_idc_send_remote_request', array( $this, 'admin_post_idc_send_remote_request' ) ); + if ( isset( $_GET['idc_notice'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended - add_action( 'admin_notices', array( $this, 'admin_notice__success' ) ); + add_action( 'admin_notices', array( $this, 'display_notice' ) ); } } @@ -147,6 +169,16 @@ public function render_ui() { + + Sync + +
Control Whether Sync is Enabled +
+
+
+ + + @@ -155,16 +187,152 @@ public function render_ui() { +
+
+ + display_request_button(); ?> + +
-

Current IDC transient values

-

jetpack_idc_local

+ display_idc_transients_options(); ?> + +
+
+ + display_last_five_requests(); + } + + /** + * Display the IDC transient and option values. + */ + private function display_idc_transients_options() { + ?> +

Information about IDC

+

Current IDC transient values

+

jetpack_idc_local

+ +

Current IDC option values

+

jetpack_sync_error_idc

+
+

jetpack_migrate_for_idc

+
+

jetpack_safe_mode_confirmed

+
+ + +

Send an authenticated remote request to WPCOM

+ +

Sends an authenticated remote request to the wpcom/v2/sites/{blog id}/jetpack-token-health/blog endpoint.

+ +
+ + + +
+ +

Last Five Authenticated Remote Requests (the most recent request is at the top)

+ + + + + + + + + + + + + + + + + + +
Request URLidc_detectedmigrated_for_idc
+
+

Note that only REST requests will return the idc_detected and migrated_for_idc values. Sync's xmlrpc requests return data in a different way.

$response['http_response']->get_response_object()->url, + 'idc_detected' => isset( $response_body['idc_detected'] ) ? $response_body['idc_detected'] : false, + 'migrated_for_idc' => isset( $response_body['migrated_for_idc'] ) ? $response_body['migrated_for_idc'] : false, + ); + + array_unshift( $request_option, $response ); + if ( count( $request_option ) > 5 ) { + array_pop( $request_option ); + } + + update_option( self::REQUESTS_OPTION_KEY, $request_option ); + } + /** * Store options. */ @@ -178,16 +346,53 @@ public function admin_post_store_current_options() { 'idc_simulation' => $_POST['idc_simulation'], 'idc_spoof_siteurl' => isset( $_POST['idc_spoof_siteurl'] ) ? true : false, 'idc_spoof_home' => isset( $_POST['idc_spoof_home'] ) ? true : false, + 'idc_sync_status' => $_POST['idc_sync_status'], ) ); + $this->notice_type = 'stored_success'; + $this->admin_post_redirect_referrer(); + } + + /** + * Send an authenticated remote request to WPCOM. + */ + public function admin_post_idc_send_remote_request() { + check_admin_referer( 'idc-send-remote-request' ); + $error = false; + + if ( ! class_exists( 'Automattic\Jetpack\Connection\Client' ) ) { + $this->notice_type = 'unknown_error'; + $error = true; + } + + $blog_id = Jetpack_Options::get_option( 'id' ); + if ( ! $blog_id ) { + $this->notice_type = 'unknown_error'; + $error = true; + } + + if ( ! $error ) { + $url = sprintf( + '%s/%s/v%s/%s', + Automattic\Jetpack\Constants::get_constant( 'JETPACK__WPCOM_JSON_API_BASE' ), + 'wpcom', + '2', + 'sites/' . $blog_id . '/jetpack-token-health/blog' + ); + $method = 'GET'; + Automattic\Jetpack\Connection\Client::remote_request( compact( 'url', 'method' ) ); + + $this->notice_type = 'request_success'; + } + $this->admin_post_redirect_referrer(); } /** * Shows a simple success notice. */ - public function admin_notice__success() { + public function admin_notice__stored_success() { ?>

IDC simulation settings have been saved!

@@ -195,6 +400,47 @@ public function admin_notice__success() { +
+

The remote request was successfully sent!

+
+ +
+

Something went wrong.

+
+ admin_notice__stored_success(); + + case self::REQUEST_SUCCESS_NOTICE_TYPE: + return $this->admin_notice__request_success(); + + case self::UNKNOWN_ERROR_NOTICE_TYPE: + return $this->admin_notice__unknown_error(); + + default: + return; + } + } + /** * Retrieves the stored IDC options. * @@ -208,6 +454,7 @@ public static function get_stored_settings() { 'idc_simulation' => false, 'idc_spoof_siteurl' => true, 'idc_spoof_home' => true, + 'idc_sync_status' => true, ) ); } @@ -218,6 +465,14 @@ public static function get_stored_settings() { public static function early_init() { add_filter( 'jetpack_sync_site_url', array( 'IDC_Simulator', 'spoof_url' ) ); add_filter( 'jetpack_sync_home_url', array( 'IDC_Simulator', 'spoof_url' ) ); + add_action( 'jetpack_received_remote_request_response', array( 'IDC_Simulator', 'intercept_request_response' ) ); + + $settings = self::get_stored_settings(); + + if ( ! $settings['idc_sync_status'] ) { + // Turn Sync off. + add_filter( 'option_jetpack_sync_settings_disable', '__return_true' ); + } } /** diff --git a/projects/plugins/jetpack/3rd-party/3rd-party.php b/projects/plugins/jetpack/3rd-party/3rd-party.php index b52b311c8d962..dc84bba3d41b3 100644 --- a/projects/plugins/jetpack/3rd-party/3rd-party.php +++ b/projects/plugins/jetpack/3rd-party/3rd-party.php @@ -8,6 +8,8 @@ namespace Automattic\Jetpack; +use Automattic\Jetpack\Status\Host; + /** * Loads the individual 3rd-party compat files. */ @@ -38,6 +40,31 @@ function load_3rd_party() { require_once JETPACK__PLUGIN_DIR . '/3rd-party/' . $file; } } + + add_filter( 'jetpack_development_version', __NAMESPACE__ . '\atomic_weekly_override' ); +} + +/** + * Handles suppressing development version notices on Atomic-hosted sites. + * + * @param bool $development_version Filterable value if this is a development version of Jetpack. + * + * @return bool + */ +function atomic_weekly_override( $development_version ) { + if ( ( new Host() )->is_atomic_platform() ) { + $haystack = Constants::get_constant( 'JETPACK__PLUGIN_DIR' ); + $needle = '/jetpack-dev/'; + if ( + ( function_exists( 'str_ends_with' ) && str_ends_with( $haystack, $needle ) ) || // phpcs:ignore PHPCompatibility.FunctionUse.NewFunctions.str_ends_withFound + 0 === substr_compare( $haystack, $needle, -13 ) + ) { + return $development_version; // Returns the default response if the active Jetpack version is from the beta plugin. + } + + $development_version = false; // Returns false for regular installs on Atomic. + } + return $development_version; // Return default if not on Atomic. } load_3rd_party(); diff --git a/projects/plugins/jetpack/CHANGELOG.md b/projects/plugins/jetpack/CHANGELOG.md index cc0b7110a12fe..4fc388ad4f4da 100644 --- a/projects/plugins/jetpack/CHANGELOG.md +++ b/projects/plugins/jetpack/CHANGELOG.md @@ -2,6 +2,48 @@ ### This is a list detailing changes for all Jetpack releases. +## 10.3-beta - 2021-10-26 +### Enhancements +- Dashboard: add a new screen to provide more information about the VideoPress feature. +- Dashboard: optimize the size of all product images displayed in the dashboard, to improve overall performance. +- Instagram Widget: improve the connection flow when the widget has not been connected to WordPress.com yet. +- Map Block: Add address attribute to the block. +- Stats: add information about the VideoPress feature at the bottom of the page. +- Social Icons Widget: Added Strava icon to Social Icons Widget. +- VideoPress: add tooltips to video block settings in the block editor. +- VideoPress: remove X-18 rating from the block settings. + +### Improved compatibility +- Contact Info & Map widget: allow transforming this widget into a block in Block-based widget editor. +- General: ensure that no notices are output when Jetpack is used alongside plugins that modify the output of core comments. +- VideoPress: improve handling of Video files when using a third-party video player. + +### Bug fixes +- Dashboard: ensure feature cards display the right information when the site uses Jetpack's Offline mode. +- Markdown: add title attributes to footnotes to improve accessibility. +- Stats: remove extra request to WordPress.com that occurs when the stats feature is first activated. + +### Other changes +- Add Tracks events when clicking or viewing upgrade buttons on the At a Glance page +- Adjust test which relies on the "remoteRegister" XMLRPC method now being registered by the Connection package +- Changed the class variable to a const +- Deprecate `jetpack_is_atomic` for the new Automattic\Jetpack\Status\Host->is_woa_site() function. +- Displays realtime backups in AAG for tiered backup products (Not yet user facing) +- E2E tests: renamed test +- Make the Backups only settings card show for tiered backup products (not yet user facing) +- Moves Add New (plugin) submenu to the top (valid only for Atomic sites). +- PHPUnit tests will now catch `exit` calls, instead of exiting PHPUnit. +- Publicize: add useSharePost() hook +- Publicize: clean and tidy code +- Publicize: do not disable message text control when RePublicize is enabled +- Publicize: Handle properly error handling when publizicing +- Removed filters from Jetpack that were used to test the Inbox menu prior to its official release. +- RePublicize: add Share Post button +- RePublicize: enable/disable feature according to the site plan +- Update "Appearance > Widgets" and "Appearance > Menus" links back to classic wp-admin destination for Atomic and Simple sites. +- Updated package dependencies +- Updates the display of Jetpack Backup storage amounts. (Not yet user facing.) + ## 10.3-a.3 - 2021-10-19 ### Enhancements - Dashboard: add a new view that shortly summarizes available Jetpack products and facilitates the purchase process. diff --git a/projects/plugins/jetpack/_inc/client/components/footer/index.jsx b/projects/plugins/jetpack/_inc/client/components/footer/index.jsx index b814530eb03a4..b5bdcaf31d210 100644 --- a/projects/plugins/jetpack/_inc/client/components/footer/index.jsx +++ b/projects/plugins/jetpack/_inc/client/components/footer/index.jsx @@ -14,11 +14,11 @@ import analytics from 'lib/analytics'; import { canDisplayDevCard, enableDevCard, resetOptions } from 'state/dev-version'; import DevCard from 'components/dev-card'; import { - isAtomicSite, isDevVersion as _isDevVersion, getCurrentVersion, userCanManageOptions, getSiteAdminUrl, + isAtomicPlatform, } from 'state/initial-state'; import { isInIdentityCrisis, getSiteConnectionStatus } from 'state/connection'; import onKeyDownCallback from 'utils/onkeydown-callback'; @@ -178,7 +178,7 @@ export class Footer extends React.Component { }; const maybeShowVersionNumber = () => { - if ( ! this.props.isAtomicSite ) { + if ( ! this.props.isAtomicPlatform ) { return (
  • { return { currentVersion: getCurrentVersion( state ), - isAtomicSite: isAtomicSite( state ), + isAtomicPlatform: isAtomicPlatform( state ), jetpackStateNoticesErrorCode: getJetpackStateNoticesErrorCode( state ), jetpackStateNoticesMessageCode: getJetpackStateNoticesMessageCode( state ), jetpackStateNoticesErrorDescription: getJetpackStateNoticesErrorDescription( state ), diff --git a/projects/plugins/jetpack/_inc/client/state/initial-state/reducer.js b/projects/plugins/jetpack/_inc/client/state/initial-state/reducer.js index 05f9d39753fef..9b82112b4b8e1 100644 --- a/projects/plugins/jetpack/_inc/client/state/initial-state/reducer.js +++ b/projects/plugins/jetpack/_inc/client/state/initial-state/reducer.js @@ -298,14 +298,35 @@ export function arePromotionsActive( state ) { /** * Check if the site is an Automated Transfer site. * - * @param {Object} state Global state tree. + * @todo Deprecated soon for isWoASite(); + * @param {object} state - Global state tree. * - * @return {boolean} True if this is an Atomic site, false otherwise. + * @returns {boolean} True if this is an WoA site, false otherwise. */ export function isAtomicSite( state ) { return get( state.jetpack.initialState.siteData, 'isAtomicSite', false ); } +/** + * Check if the site is a WordPress.com-on-Atomic site. + * + * @param {object} state - Global state tree. + * @returns {boolean} True if this is an WoA site, false otherwise. + */ +export function isWoASite( state ) { + return get( state.jetpack.initialState.siteData, 'isWoASite', false ); +} + +/** + * Check if the site is an Atomic-hosted site. + * + * @param {object} state - Global state tree. + * @returns {boolean} True if this is an Atomic-hosted site, false otherwise. + */ +export function isAtomicPlatform( state ) { + return get( state.jetpack.initialState.siteData, 'isAtomicPlatform', false ); +} + /** * Check that theme supports a certain feature * diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php index 122019ef1d9a0..6012f98dd2f1b 100644 --- a/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php +++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class-jetpack-redux-state-helper.php @@ -14,6 +14,7 @@ use Automattic\Jetpack\Licensing; use Automattic\Jetpack\Partner; use Automattic\Jetpack\Status; +use Automattic\Jetpack\Status\Host; /** * Responsible for populating the initial Redux state. @@ -93,6 +94,8 @@ public static function get_initial_state() { $connection_status = array_merge( REST_Connector::connection_status( false ), $connection_status ); + $host = new Host(); + return array( 'WP_API_root' => esc_url_raw( rest_url() ), 'WP_API_nonce' => wp_create_nonce( 'wp_rest' ), @@ -140,7 +143,9 @@ public static function get_initial_state() { * @param bool $are_promotions_active Status of promotions visibility. True by default. */ 'showPromotions' => apply_filters( 'jetpack_show_promotions', true ), - 'isAtomicSite' => jetpack_is_atomic_site(), + 'isAtomicSite' => $host->is_woa_site(), + 'isWoASite' => $host->is_woa_site(), + 'isAtomicPlatform' => $host->is_atomic_platform(), 'plan' => Jetpack_Plan::get(), 'showBackups' => Jetpack::show_backups_ui(), 'showRecommendations' => Jetpack_Recommendations::is_enabled(), diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-mapbox-helper.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-mapbox-helper.php index be4c4e2888763..2252648e81004 100644 --- a/projects/plugins/jetpack/_inc/lib/class-jetpack-mapbox-helper.php +++ b/projects/plugins/jetpack/_inc/lib/class-jetpack-mapbox-helper.php @@ -5,6 +5,8 @@ * @package automattic/jetpack */ +use Automattic\Jetpack\Status\Host; + /** * Class Jetpack_Mapbox_Helper */ @@ -46,7 +48,7 @@ public static function get_access_token() { } // If not on WordPress.com or Atomic, return an empty access token. - if ( ! $site_id || ( ! self::is_wpcom() && ! jetpack_is_atomic_site() ) ) { + if ( ! $site_id || ( ! self::is_wpcom() && ! ( new Host() )->is_woa_site() ) ) { return self::format_access_token(); } diff --git a/projects/plugins/jetpack/_inc/lib/class-jetpack-recommendations.php b/projects/plugins/jetpack/_inc/lib/class-jetpack-recommendations.php index afabb4f277133..ffbbddf3ce775 100644 --- a/projects/plugins/jetpack/_inc/lib/class-jetpack-recommendations.php +++ b/projects/plugins/jetpack/_inc/lib/class-jetpack-recommendations.php @@ -8,6 +8,7 @@ use Automattic\Jetpack\Connection\Client; use Automattic\Jetpack\Connection\Manager as Connection_Manager; use Automattic\Jetpack\Status; +use Automattic\Jetpack\Status\Host; /** * Contains utilities related to the Jetpack Recommendations. @@ -33,7 +34,7 @@ public static function is_enabled() { } // No recommendations for Atomic sites, they already get onboarded in Calypso. - if ( jetpack_is_atomic_site() ) { + if ( ( new Host() )->is_woa_site() ) { return false; } diff --git a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php index 0256297741b96..2ae2b005189a0 100644 --- a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php +++ b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php @@ -6,6 +6,7 @@ use Automattic\Jetpack\Connection\REST_Connector; use Automattic\Jetpack\Jetpack_CRM_Data; use Automattic\Jetpack\Licensing; +use Automattic\Jetpack\Status\Host; /** * Register WP REST API endpoints for Jetpack. @@ -1578,7 +1579,7 @@ public static function get_scan_state() { $scan_state = self::scan_state(); if ( ! is_wp_error( $scan_state ) ) { - if ( jetpack_is_atomic_site() && ! empty( $scan_state->threats ) ) { + if ( ( new Host() )->is_woa_site() && ! empty( $scan_state->threats ) ) { $scan_state->threats = array(); } return rest_ensure_response( diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-videopress.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-videopress.php index ab5c1682685db..5cde40aace2a7 100644 --- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-videopress.php +++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-videopress.php @@ -52,7 +52,7 @@ public function register_routes() { 'sanitize_callback' => 'sanitize_text_field', ), 'rating' => array( - 'description' => __( 'The video content rating. One of G, PG-13, R-17 or X-18', 'jetpack' ), + 'description' => __( 'The video content rating. One of G, PG-13 or R-17', 'jetpack' ), 'type' => 'string', 'required' => false, 'sanitize_callback' => 'sanitize_text_field', diff --git a/projects/plugins/jetpack/changelog/2021-10-22-17-59-57-035129 b/projects/plugins/jetpack/changelog/2021-10-22-17-59-57-035129 deleted file mode 100644 index 86fc79d0247a0..0000000000000 --- a/projects/plugins/jetpack/changelog/2021-10-22-17-59-57-035129 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Instagram widget: link directly to user connection if user is not connected diff --git a/projects/plugins/jetpack/changelog/20211023_social_icons_widget b/projects/plugins/jetpack/changelog/20211023_social_icons_widget deleted file mode 100644 index 288bb49a9b6b3..0000000000000 --- a/projects/plugins/jetpack/changelog/20211023_social_icons_widget +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Social Icons Widget: Added Strava icon to Social Icons Widget diff --git a/projects/plugins/jetpack/changelog/add-map-block-address-attribute b/projects/plugins/jetpack/changelog/add-map-block-address-attribute deleted file mode 100644 index 6782b34246330..0000000000000 --- a/projects/plugins/jetpack/changelog/add-map-block-address-attribute +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: enhancement - -Map block: Add `address` attribute to the block diff --git a/projects/plugins/jetpack/changelog/add-rna-idc-start-fresh b/projects/plugins/jetpack/changelog/add-rna-idc-start-fresh deleted file mode 100644 index 6dde54fc0ff8c..0000000000000 --- a/projects/plugins/jetpack/changelog/add-rna-idc-start-fresh +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Package version bump. diff --git a/projects/plugins/jetpack/changelog/add-stats-page-videopress-nudge b/projects/plugins/jetpack/changelog/add-stats-page-videopress-nudge deleted file mode 100644 index b995c729743ec..0000000000000 --- a/projects/plugins/jetpack/changelog/add-stats-page-videopress-nudge +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: enhancement - -Adds an upgrade nudge to the Stats page if the user doesn't have VideoPress. diff --git a/projects/plugins/jetpack/changelog/add-test-with-php-8.1 b/projects/plugins/jetpack/changelog/add-test-with-php-8.1 new file mode 100644 index 0000000000000..35efbda75b18c --- /dev/null +++ b/projects/plugins/jetpack/changelog/add-test-with-php-8.1 @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Set `convertDeprecationsToExceptions` true in PHPUnit config. diff --git a/projects/plugins/jetpack/changelog/add-videopress-upgrade-page b/projects/plugins/jetpack/changelog/add-videopress-upgrade-page deleted file mode 100644 index eb127bc63ef66..0000000000000 --- a/projects/plugins/jetpack/changelog/add-videopress-upgrade-page +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: enhancement - -Add an upgrade page for Jetpack VideoPress. This page appears when pressing an upgrade button, before going to the ckeckout. diff --git a/projects/plugins/jetpack/changelog/add-videopress-video-settings-tooltips b/projects/plugins/jetpack/changelog/add-videopress-video-settings-tooltips deleted file mode 100644 index 51e59ed0a64df..0000000000000 --- a/projects/plugins/jetpack/changelog/add-videopress-video-settings-tooltips +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Add tooltips to VideoPress block settings in Gutenberg diff --git a/projects/plugins/jetpack/changelog/cfinke-get-comment b/projects/plugins/jetpack/changelog/cfinke-get-comment deleted file mode 100644 index af095e089f3f7..0000000000000 --- a/projects/plugins/jetpack/changelog/cfinke-get-comment +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: bugfix - -General: ensure that no notices are output when Jetpack is used alongside plugins that modify the output of core comments. diff --git a/projects/plugins/jetpack/changelog/e2e-rename-connection-test b/projects/plugins/jetpack/changelog/e2e-rename-connection-test deleted file mode 100644 index cae092b8e2779..0000000000000 --- a/projects/plugins/jetpack/changelog/e2e-rename-connection-test +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: other - -E2E tests: renamed test diff --git a/projects/plugins/jetpack/changelog/e2e-simplify-tunnel-cmd b/projects/plugins/jetpack/changelog/e2e-simplify-tunnel-cmd new file mode 100644 index 0000000000000..fdfbdccc39811 --- /dev/null +++ b/projects/plugins/jetpack/changelog/e2e-simplify-tunnel-cmd @@ -0,0 +1,4 @@ +Significance: minor +Type: enhancement + +E2E tests: update pnpm commands to use new tunnel wrapper script diff --git a/projects/plugins/jetpack/changelog/fix-jetpack-products-illustration-optimization b/projects/plugins/jetpack/changelog/fix-jetpack-products-illustration-optimization deleted file mode 100644 index 35d306909cbcd..0000000000000 --- a/projects/plugins/jetpack/changelog/fix-jetpack-products-illustration-optimization +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: enhancement - -Optimizes product images that are displayed on the Upgrade page. This reduces their file size and will improve the performance when downloading them diff --git a/projects/plugins/jetpack/changelog/fix-jetpack-tests-catch-exit b/projects/plugins/jetpack/changelog/fix-jetpack-tests-catch-exit deleted file mode 100644 index 4883d01b1bc10..0000000000000 --- a/projects/plugins/jetpack/changelog/fix-jetpack-tests-catch-exit +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -PHPUnit tests will now catch `exit` calls, instead of exiting PHPUnit. diff --git a/projects/plugins/jetpack/changelog/fix-phpunit-configs b/projects/plugins/jetpack/changelog/fix-phpunit-configs new file mode 100644 index 0000000000000..2f7891be3bc1f --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-phpunit-configs @@ -0,0 +1,4 @@ +Significance: patch +Type: other + +Fix `@covers` directives in various tests. diff --git a/projects/plugins/jetpack/changelog/fix-share-enabled-meta b/projects/plugins/jetpack/changelog/fix-share-enabled-meta deleted file mode 100644 index 70a64d6520477..0000000000000 --- a/projects/plugins/jetpack/changelog/fix-share-enabled-meta +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Changed the class variable to a const diff --git a/projects/plugins/jetpack/changelog/feature-sync-error-capture b/projects/plugins/jetpack/changelog/js-redirects-add-docs-and-tests similarity index 100% rename from projects/plugins/jetpack/changelog/feature-sync-error-capture rename to projects/plugins/jetpack/changelog/js-redirects-add-docs-and-tests diff --git a/projects/plugins/jetpack/changelog/patch-2 b/projects/plugins/jetpack/changelog/patch-2 deleted file mode 100644 index af0dc7b2f033b..0000000000000 --- a/projects/plugins/jetpack/changelog/patch-2 +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: bugfix - -Markdown: add title attributes to footnotes to improve accessibility. diff --git a/projects/plugins/jetpack/changelog/remove-inbox-filter-added-while-developing-inbox-menu b/projects/plugins/jetpack/changelog/remove-inbox-filter-added-while-developing-inbox-menu deleted file mode 100644 index 5bb1ad1e34cba..0000000000000 --- a/projects/plugins/jetpack/changelog/remove-inbox-filter-added-while-developing-inbox-menu +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: enhancement - -Removed filters from Jetpack that were used to test the Inbox menu prior to its official release. diff --git a/projects/plugins/jetpack/changelog/renovate-mediawiki-mediawiki-codesniffer-38.x b/projects/plugins/jetpack/changelog/renovate-mediawiki-mediawiki-codesniffer-38.x deleted file mode 100644 index 1de9701fd5829..0000000000000 --- a/projects/plugins/jetpack/changelog/renovate-mediawiki-mediawiki-codesniffer-38.x +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: other -Comment: Fix some new phpcs sniffs in tests. - - diff --git a/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo b/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo deleted file mode 100644 index cbdc3703e1c9d..0000000000000 --- a/projects/plugins/jetpack/changelog/renovate-wordpress-monorepo +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Updated package dependencies diff --git a/projects/plugins/jetpack/changelog/start-104-cycle b/projects/plugins/jetpack/changelog/start-104-cycle new file mode 100644 index 0000000000000..b9830bb78f7a3 --- /dev/null +++ b/projects/plugins/jetpack/changelog/start-104-cycle @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: General: start 10.4 release cycle + + diff --git a/projects/plugins/jetpack/changelog/update-aag-offline-akismet-videopress b/projects/plugins/jetpack/changelog/update-aag-offline-akismet-videopress deleted file mode 100644 index 702fbccd81621..0000000000000 --- a/projects/plugins/jetpack/changelog/update-aag-offline-akismet-videopress +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: bugfix - -Dashboard: ensure feature cards display the right information when the site uses Jetpack's Offline mode. diff --git a/projects/plugins/jetpack/changelog/update-aag-realtime-backups b/projects/plugins/jetpack/changelog/update-aag-realtime-backups deleted file mode 100644 index d6c5603f19a22..0000000000000 --- a/projects/plugins/jetpack/changelog/update-aag-realtime-backups +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Displays realtime backups in AAG for tiered backup products (Not yet user facing) diff --git a/projects/plugins/jetpack/changelog/update-aag-upgrade-buttons-tracks-events b/projects/plugins/jetpack/changelog/update-aag-upgrade-buttons-tracks-events deleted file mode 100644 index 957dc3991cc0c..0000000000000 --- a/projects/plugins/jetpack/changelog/update-aag-upgrade-buttons-tracks-events +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: other - -Add Tracks events when clicking or viewing upgrade buttons on the At a Glance page diff --git a/projects/plugins/jetpack/changelog/update-add_new_plugin_menu_item_order b/projects/plugins/jetpack/changelog/update-add_new_plugin_menu_item_order deleted file mode 100644 index 2e315e641ef88..0000000000000 --- a/projects/plugins/jetpack/changelog/update-add_new_plugin_menu_item_order +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Moves Add New (plugin) submenu to the top (valid only for Atomic sites). diff --git a/projects/plugins/jetpack/changelog/update-alpha-10-3-a-4 b/projects/plugins/jetpack/changelog/update-alpha-10-3-a-4 deleted file mode 100644 index acfede72a4f3d..0000000000000 --- a/projects/plugins/jetpack/changelog/update-alpha-10-3-a-4 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: other -Comment: Janitorial: start 10.3-a.4 cycle - - diff --git a/projects/plugins/jetpack/changelog/update-changelogs-1021 b/projects/plugins/jetpack/changelog/update-changelogs-1021 deleted file mode 100644 index 8f00252d4db67..0000000000000 --- a/projects/plugins/jetpack/changelog/update-changelogs-1021 +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: other -Comment: Janitorial: update changelog with 10.2.1 release details. - - diff --git a/projects/plugins/jetpack/changelog/update-contact-info-and-map-widget-block-compatibility b/projects/plugins/jetpack/changelog/update-contact-info-and-map-widget-block-compatibility deleted file mode 100644 index 0820994f7fbe1..0000000000000 --- a/projects/plugins/jetpack/changelog/update-contact-info-and-map-widget-block-compatibility +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: compat - -Contact Info & Map widget: Add legacy widget - block transform diff --git a/projects/plugins/jetpack/changelog/update-publicize-add-use-share-post-hook b/projects/plugins/jetpack/changelog/update-publicize-add-use-share-post-hook deleted file mode 100644 index 3f4b81cb7daaf..0000000000000 --- a/projects/plugins/jetpack/changelog/update-publicize-add-use-share-post-hook +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Publicize: add useSharePost() hook diff --git a/projects/plugins/jetpack/changelog/update-publicize-clean-code b/projects/plugins/jetpack/changelog/update-publicize-clean-code deleted file mode 100644 index ecdb77c029921..0000000000000 --- a/projects/plugins/jetpack/changelog/update-publicize-clean-code +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Publicize: clean and tidy code diff --git a/projects/plugins/jetpack/changelog/update-publicize-fix-cleaning-request-errors b/projects/plugins/jetpack/changelog/update-publicize-fix-cleaning-request-errors deleted file mode 100644 index a2731cfd8cc05..0000000000000 --- a/projects/plugins/jetpack/changelog/update-publicize-fix-cleaning-request-errors +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Publicize: Handle properly error handling when publizicing diff --git a/projects/plugins/jetpack/changelog/update-publicize-fix-panel-issue b/projects/plugins/jetpack/changelog/update-publicize-fix-panel-issue new file mode 100644 index 0000000000000..fe4fc31cdb1ce --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-publicize-fix-panel-issue @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +Publicize: fix visual issue when the panel shows in the pre publish step of the post diff --git a/projects/plugins/jetpack/changelog/update-realtime-backup-storage-amounts b/projects/plugins/jetpack/changelog/update-realtime-backup-storage-amounts deleted file mode 100644 index 97020de8e37d8..0000000000000 --- a/projects/plugins/jetpack/changelog/update-realtime-backup-storage-amounts +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Updates the display of Jetpack Backup storage amounts. (Not yet user facing.) diff --git a/projects/plugins/jetpack/changelog/update-remote-register-error-when-connected b/projects/plugins/jetpack/changelog/update-remote-register-error-when-connected deleted file mode 100644 index 1d8d314bde22d..0000000000000 --- a/projects/plugins/jetpack/changelog/update-remote-register-error-when-connected +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Adjust test which relies on the "remoteRegister" XMLRPC method now being registered by the Connection package diff --git a/projects/plugins/jetpack/changelog/update-remote_request_query_args b/projects/plugins/jetpack/changelog/update-remote_request_query_args new file mode 100644 index 0000000000000..2d5f4b48a2ba4 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-remote_request_query_args @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Update failing unit tests + + diff --git a/projects/plugins/jetpack/changelog/update-republicize-add-share-post-button b/projects/plugins/jetpack/changelog/update-republicize-add-share-post-button deleted file mode 100644 index 35f5b32d40825..0000000000000 --- a/projects/plugins/jetpack/changelog/update-republicize-add-share-post-button +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -RePublicize: add Share Post button diff --git a/projects/plugins/jetpack/changelog/update-republicize-enable-message-text-control b/projects/plugins/jetpack/changelog/update-republicize-enable-message-text-control deleted file mode 100644 index 35896ae0d9def..0000000000000 --- a/projects/plugins/jetpack/changelog/update-republicize-enable-message-text-control +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: enhancement - -Publicize: do not disable message text control when RePublicize is enabled diff --git a/projects/plugins/jetpack/changelog/update-republicize-flag-filter-doc b/projects/plugins/jetpack/changelog/update-republicize-flag-filter-doc deleted file mode 100644 index 5596ab9835fd6..0000000000000 --- a/projects/plugins/jetpack/changelog/update-republicize-flag-filter-doc +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: other -Comment: Publicize: add docblock for new filter. - - diff --git a/projects/plugins/jetpack/changelog/update-republicize-handle-main-toggle-control b/projects/plugins/jetpack/changelog/update-republicize-handle-main-toggle-control new file mode 100644 index 0000000000000..aa8f88d50b524 --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-republicize-handle-main-toggle-control @@ -0,0 +1,4 @@ +Significance: patch +Type: enhancement + +Publicize: show/hide main toggle control depending on post state (published) diff --git a/projects/plugins/jetpack/changelog/update-show-jetpack-backup-settings-for-tiered-products b/projects/plugins/jetpack/changelog/update-show-jetpack-backup-settings-for-tiered-products deleted file mode 100644 index f562b6fbcfb1c..0000000000000 --- a/projects/plugins/jetpack/changelog/update-show-jetpack-backup-settings-for-tiered-products +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Make the Backups only settings card show for tiered backup products (not yet user facing) diff --git a/projects/plugins/jetpack/changelog/update-stats_update_blog_details b/projects/plugins/jetpack/changelog/update-stats_update_blog_details deleted file mode 100644 index 5d52cb739b99c..0000000000000 --- a/projects/plugins/jetpack/changelog/update-stats_update_blog_details +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: bugfix - -Stats: remove the wpcom blog details update that occurs when the stats module is first activated diff --git a/projects/plugins/jetpack/changelog/update-tiered-backups-contain-realtime b/projects/plugins/jetpack/changelog/update-tiered-backups-contain-realtime deleted file mode 100644 index b9e124c45c9e1..0000000000000 --- a/projects/plugins/jetpack/changelog/update-tiered-backups-contain-realtime +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: other -Comment: Doesn't affect anything user-facing yet. - - diff --git a/projects/plugins/jetpack/changelog/update-videopress-attachment-url-for-other-blocks b/projects/plugins/jetpack/changelog/update-videopress-attachment-url-for-other-blocks deleted file mode 100644 index d7f6010e5a7e9..0000000000000 --- a/projects/plugins/jetpack/changelog/update-videopress-attachment-url-for-other-blocks +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: compat - -For videos uploaded to VideoPress, the originally uploaded video file will be played in all non-VideoPress players. The File URL field in the Media Library will be a link to the originally uploaded video file. diff --git a/projects/plugins/jetpack/changelog/update-widget-nav-menus-link b/projects/plugins/jetpack/changelog/update-widget-nav-menus-link deleted file mode 100644 index e2cbdf16406b4..0000000000000 --- a/projects/plugins/jetpack/changelog/update-widget-nav-menus-link +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: other - -Update "Appearance > Widgets" and "Appearance > Menus" links back to classic wp-admin destination for Atomic and Simple sites. diff --git a/projects/plugins/jetpack/class.jetpack-gutenberg.php b/projects/plugins/jetpack/class.jetpack-gutenberg.php index c4004fdd0ef90..05359b1876bb9 100644 --- a/projects/plugins/jetpack/class.jetpack-gutenberg.php +++ b/projects/plugins/jetpack/class.jetpack-gutenberg.php @@ -10,6 +10,7 @@ use Automattic\Jetpack\Connection\Manager as Connection_Manager; use Automattic\Jetpack\Constants; use Automattic\Jetpack\Status; +use Automattic\Jetpack\Status\Host; /** * Wrapper function to safely register a gutenberg block type @@ -1023,7 +1024,7 @@ public static function set_availability_for_plan( $slug ) { $slug = self::remove_extension_prefix( $slug ); $features_data = array(); $is_simple_site = defined( 'IS_WPCOM' ) && IS_WPCOM; - $is_atomic_site = jetpack_is_atomic_site(); + $is_atomic_site = ( new Host() )->is_woa_site(); // Check feature availability for Simple and Atomic sites. if ( $is_simple_site || $is_atomic_site ) { @@ -1108,6 +1109,6 @@ public static function get_render_callback_with_availability_check( $slug, $rend * * More doc: https://github.com/Automattic/jetpack/tree/master/projects/plugins/jetpack/extensions#upgrades-for-blocks */ -if ( jetpack_is_atomic_site() ) { +if ( ( new Host() )->is_woa_site() ) { add_filter( 'jetpack_block_editor_enable_upgrade_nudge', '__return_true' ); } diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json index e84e2f4b29d94..de1979a34fd31 100644 --- a/projects/plugins/jetpack/composer.json +++ b/projects/plugins/jetpack/composer.json @@ -34,7 +34,7 @@ "automattic/jetpack-partner": "1.5.x-dev", "automattic/jetpack-redirect": "1.7.x-dev", "automattic/jetpack-roles": "1.4.x-dev", - "automattic/jetpack-status": "1.8.x-dev", + "automattic/jetpack-status": "1.9.x-dev", "automattic/jetpack-sync": "1.27.x-dev", "automattic/jetpack-terms-of-service": "1.9.x-dev", "automattic/jetpack-tracking": "1.13.x-dev", @@ -101,7 +101,7 @@ "platform": { "ext-intl": "0.0.0" }, - "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ10_3_a_4" + "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ10_4_a_0" }, "extra": { "mirror-repo": "Automattic/jetpack-production", diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index aa65cf9bad040..f8748924e387a 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8b1a351c2fa09fd41ff0cc6c21951bd1", + "content-hash": "cd9459521dc7f2513619ba6a812490b3", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -426,7 +426,7 @@ "dist": { "type": "path", "url": "../../packages/connection", - "reference": "047e6bc32be905fb4f282e38e1f560efdd347cdc" + "reference": "5ab0c2586815f558f97fb563395545dfa3dc0a70" }, "require": { "automattic/jetpack-a8c-mc-stats": "^1.4", @@ -435,7 +435,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-redirect": "^1.7", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9", "automattic/jetpack-tracking": "^1.13" }, @@ -738,14 +738,14 @@ "dist": { "type": "path", "url": "../../packages/identity-crisis", - "reference": "a9cabeec4cf44cc53b5dda1e726b55444f1b0d2e" + "reference": "973a4a14a59a209c16d7007a32b8d1653c84013f" }, "require": { "automattic/jetpack-connection": "^1.30", "automattic/jetpack-constants": "^1.6", "automattic/jetpack-logo": "^1.5", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-tracking": "^1.13" }, "require-dev": { @@ -811,7 +811,7 @@ "dist": { "type": "path", "url": "../../packages/jitm", - "reference": "eec733d313f8462a937b7212c1c8b8d1dbf7c7fe" + "reference": "73ca1269c3a0af8af8c7810947c7f51c9ffc45f4" }, "require": { "automattic/jetpack-a8c-mc-stats": "^1.4", @@ -822,7 +822,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-partner": "^1.5", "automattic/jetpack-redirect": "^1.7", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-tracking": "^1.13" }, "require-dev": { @@ -1204,10 +1204,10 @@ "dist": { "type": "path", "url": "../../packages/redirect", - "reference": "5b0dc4ca597044b0a2f211544b39fd509586a361" + "reference": "7c4c39cc68439aa3dfd732ee337ed546e3102cbf" }, "require": { - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -1309,7 +1309,10 @@ "dist": { "type": "path", "url": "../../packages/status", - "reference": "e1ee707b99db540ad6ff853d053784e70d99bfd7" + "reference": "571e2e935ec72d87ebc020942221b932c1c8de7b" + }, + "require": { + "automattic/jetpack-constants": "^1.6" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -1324,7 +1327,7 @@ "link-template": "https://github.com/Automattic/jetpack-status/compare/v${old}...v${new}" }, "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.9.x-dev" } }, "autoload": { @@ -1360,7 +1363,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "ed861caa2a15b673f0e48b4ce75a7835541abf3f" + "reference": "c4857020268c97d26c0a9c63ce1da1f4b801eafd" }, "require": { "automattic/jetpack-connection": "^1.30", @@ -1370,7 +1373,7 @@ "automattic/jetpack-options": "^1.13", "automattic/jetpack-password-checker": "^0.1", "automattic/jetpack-roles": "^1.4", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -1427,11 +1430,11 @@ "dist": { "type": "path", "url": "../../packages/terms-of-service", - "reference": "3594a0ceb044973ed4a8198cca4b420c39d4e67b" + "reference": "b076ade5374c5fd5301e9fbab8f7e6783d6ac957" }, "require": { "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8" + "automattic/jetpack-status": "^1.9" }, "require-dev": { "automattic/jetpack-changelogger": "^3.0", @@ -1482,12 +1485,12 @@ "dist": { "type": "path", "url": "../../packages/tracking", - "reference": "0c8562d1f209ef123b72e607f79d76140e67f5a4" + "reference": "a9ed9bde1de5ab89483369ef2e76d06376efc695" }, "require": { "automattic/jetpack-assets": "^1.11", "automattic/jetpack-options": "^1.13", - "automattic/jetpack-status": "^1.8", + "automattic/jetpack-status": "^1.9", "automattic/jetpack-terms-of-service": "^1.9" }, "require-dev": { @@ -2124,16 +2127,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.2.2", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556" + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556", - "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", + "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", "shasum": "" }, "require": { @@ -2144,7 +2147,8 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2" + "mockery/mockery": "~1.3.2", + "psalm/phar": "^4.8" }, "type": "library", "extra": { @@ -2174,9 +2178,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" }, - "time": "2020-09-03T19:13:55+00:00" + "time": "2021-10-19T17:43:47+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3617,7 +3621,6 @@ "type": "github" } ], - "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { diff --git a/projects/plugins/jetpack/extensions/blocks/map/map.php b/projects/plugins/jetpack/extensions/blocks/map/map.php index 0d5feefb2e719..3925b487ee241 100644 --- a/projects/plugins/jetpack/extensions/blocks/map/map.php +++ b/projects/plugins/jetpack/extensions/blocks/map/map.php @@ -10,6 +10,7 @@ namespace Automattic\Jetpack\Extensions\Map; use Automattic\Jetpack\Blocks; +use Automattic\Jetpack\Status\Host; use Automattic\Jetpack\Tracking; use Jetpack; use Jetpack_Gutenberg; @@ -51,7 +52,7 @@ function wpcom_load_event( $access_token_source ) { if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { jetpack_require_lib( 'tracks/client' ); tracks_record_event( wp_get_current_user(), $event_name ); - } elseif ( jetpack_is_atomic_site() && Jetpack::is_connection_ready() ) { + } elseif ( ( new Host() )->is_woa_site() && Jetpack::is_connection_ready() ) { $tracking = new Tracking(); $tracking->record_user_event( $event_name ); } diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/buttons/buttons.php b/projects/plugins/jetpack/extensions/blocks/premium-content/buttons/buttons.php index f07055b222dab..4cb602ff436d4 100644 --- a/projects/plugins/jetpack/extensions/blocks/premium-content/buttons/buttons.php +++ b/projects/plugins/jetpack/extensions/blocks/premium-content/buttons/buttons.php @@ -8,6 +8,7 @@ namespace Automattic\Jetpack\Extensions\Premium_Content; use Automattic\Jetpack\Blocks; +use Automattic\Jetpack\Status\Host; use Jetpack_Gutenberg; const BUTTONS_NAME = 'premium-content/buttons'; @@ -19,7 +20,7 @@ */ function register_buttons_block() { // Only load this block on WordPress.com. - if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || jetpack_is_atomic_site() ) { + if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() ) { Blocks::jetpack_register_block( BUTTONS_NAME, array( diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/logged-out-view.php b/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/logged-out-view.php index 1eecdf781530f..80a68dabe4e45 100644 --- a/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/logged-out-view.php +++ b/projects/plugins/jetpack/extensions/blocks/premium-content/logged-out-view/logged-out-view.php @@ -8,6 +8,7 @@ namespace Automattic\Jetpack\Extensions\Premium_Content; use Automattic\Jetpack\Blocks; +use Automattic\Jetpack\Status\Host; use Jetpack_Gutenberg; const LOGGEDOUT_VIEW_NAME = 'premium-content/logged-out-view'; @@ -21,7 +22,7 @@ */ function register_loggedout_view_block() { // Only load this block on WordPress.com. - if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || jetpack_is_atomic_site() ) { + if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() ) { // Determine required `context` key based on Gutenberg version. $deprecated = function_exists( 'gutenberg_get_post_from_context' ); $uses = $deprecated ? 'context' : 'uses_context'; diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/login-button.php b/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/login-button.php index f03fa290bbe8d..3238d8a9000df 100644 --- a/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/login-button.php +++ b/projects/plugins/jetpack/extensions/blocks/premium-content/login-button/login-button.php @@ -8,6 +8,7 @@ namespace Automattic\Jetpack\Extensions\Premium_Content; use Automattic\Jetpack\Blocks; +use Automattic\Jetpack\Status\Host; use Jetpack_Gutenberg; require_once dirname( __DIR__ ) . '/_inc/subscription-service/include.php'; @@ -21,7 +22,7 @@ */ function register_login_button_block() { // Only load this block on WordPress.com. - if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || jetpack_is_atomic_site() ) { + if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() ) { Blocks::jetpack_register_block( LOGIN_BUTTON_NAME, array( diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/premium-content.php b/projects/plugins/jetpack/extensions/blocks/premium-content/premium-content.php index 3867560eaf0e3..4191597893a26 100644 --- a/projects/plugins/jetpack/extensions/blocks/premium-content/premium-content.php +++ b/projects/plugins/jetpack/extensions/blocks/premium-content/premium-content.php @@ -8,6 +8,7 @@ namespace Automattic\Jetpack\Extensions\Premium_Content; use Automattic\Jetpack\Blocks; +use Automattic\Jetpack\Status\Host; use Jetpack_Gutenberg; require_once __DIR__ . '/_inc/access-check.php'; @@ -25,7 +26,7 @@ */ function register_block() { // Only load this block on WordPress.com. - if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || jetpack_is_atomic_site() ) { + if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() ) { // Determine required `context` key based on Gutenberg version. $deprecated = function_exists( 'gutenberg_get_post_from_context' ); $provides = $deprecated ? 'providesContext' : 'provides_context'; @@ -94,8 +95,8 @@ function render_stripe_nudge() { __( 'Connect to Stripe to use this block on your site.', 'jetpack' ), __( 'Connect', 'jetpack' ) ); - } elseif ( jetpack_is_atomic_site() ) { - // On Atomic sites, the Stripe connection url is not easily available + } elseif ( ( new Host() )->is_woa_site() ) { + // On WoA sites, the Stripe connection url is not easily available // server-side, so we redirect them to the post in the editor in order // to connect. return stripe_nudge( diff --git a/projects/plugins/jetpack/extensions/blocks/premium-content/subscriber-view/subscriber-view.php b/projects/plugins/jetpack/extensions/blocks/premium-content/subscriber-view/subscriber-view.php index d723d8c355593..28b13255a0a59 100644 --- a/projects/plugins/jetpack/extensions/blocks/premium-content/subscriber-view/subscriber-view.php +++ b/projects/plugins/jetpack/extensions/blocks/premium-content/subscriber-view/subscriber-view.php @@ -8,6 +8,7 @@ namespace Automattic\Jetpack\Extensions\Premium_Content; use Automattic\Jetpack\Blocks; +use Automattic\Jetpack\Status\Host; use Jetpack_Gutenberg; const SUBSCRIBER_VIEW_NAME = 'premium-content/subscriber-view'; @@ -21,7 +22,7 @@ */ function register_subscriber_view_block() { // Only load this block on WordPress.com. - if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || jetpack_is_atomic_site() ) { + if ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() ) { // Determine required `context` key based on Gutenberg version. $deprecated = function_exists( 'gutenberg_get_post_from_context' ); $uses = $deprecated ? 'context' : 'uses_context'; diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/edit.js b/projects/plugins/jetpack/extensions/blocks/videopress/edit.js index e72f0992389c0..260d0d228af0c 100644 --- a/projects/plugins/jetpack/extensions/blocks/videopress/edit.js +++ b/projects/plugins/jetpack/extensions/blocks/videopress/edit.js @@ -88,9 +88,13 @@ const VideoPressEdit = CoreVideoEdit => setRating = async () => { const id = get( this.props, 'attributes.id' ); const media = await this.requestMedia( id ); - const rating = get( media, 'jetpack_videopress.rating' ); + let rating = get( media, 'jetpack_videopress.rating' ); if ( rating ) { + // X-18 was previously supported but is now removed to better comply with our TOS. + if ( 'X-18' === rating ) { + rating = 'R-17'; + } this.setState( { rating } ); } }; @@ -247,7 +251,12 @@ const VideoPressEdit = CoreVideoEdit => return; } - if ( -1 === indexOf( [ 'G', 'PG-13', 'R-17', 'X-18' ], rating ) ) { + // X-18 was previously supported but is now removed to better comply with our TOS. + if ( 'X-18' === rating ) { + rating = 'R-17'; + } + + if ( -1 === indexOf( [ 'G', 'PG-13', 'R-17' ], rating ) ) { return; } @@ -430,10 +439,6 @@ const VideoPressEdit = CoreVideoEdit => ), value: 'R-17', }, - { - label: _x( 'X', 'Video rating for "Explicit" content.', 'jetpack' ), - value: 'X-18', - }, ] } onChange={ this.onChangeRating } /> diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/components/form/index.js b/projects/plugins/jetpack/extensions/plugins/publicize/components/form/index.js index ef1e0d3330466..f469890c438c6 100644 --- a/projects/plugins/jetpack/extensions/plugins/publicize/components/form/index.js +++ b/projects/plugins/jetpack/extensions/plugins/publicize/components/form/index.js @@ -9,7 +9,7 @@ /** * WordPress dependencies */ -import { PanelRow } from '@wordpress/components'; +import { PanelRow, Disabled } from '@wordpress/components'; import { Fragment } from '@wordpress/element'; /** @@ -21,7 +21,11 @@ import MessageBoxControl from '../message-box-control'; import useSocialMediaConnections from '../../hooks/use-social-media-connections'; import useSocialMediaMessage from '../../hooks/use-social-media-message'; -export default function PublicizeForm( { isPublicizeEnabled, isRePublicizeFeatureEnabled } ) { +export default function PublicizeForm( { + isPublicizeEnabled, + isRePublicizeFeatureEnabled, + isPublicizeDisabledBySitePlan, +} ) { const { connections, toggleById, hasConnections } = useSocialMediaConnections(); const { message, updateMessage, maxLength } = useSocialMediaMessage(); @@ -34,15 +38,17 @@ export default function PublicizeForm( { isPublicizeEnabled, isRePublicizeFeatur return connections.every( connection => ! connection.toggleable ); } + const Wrapper = isPublicizeDisabledBySitePlan ? Disabled : Fragment; + return ( - + { hasConnections && (
      { connections.map( ( { display_name, enabled, id, service_name, toggleable } ) => ( ) } - + { ! isPublicizeDisabledBySitePlan && ( + + - { connections.some( connection => connection.enabled ) && ( - + { connections.some( connection => connection.enabled ) && ( + + ) } + ) } - + ); } diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/components/panel/index.js b/projects/plugins/jetpack/extensions/plugins/publicize/components/panel/index.js index e795e9b571e4a..213a405482adc 100644 --- a/projects/plugins/jetpack/extensions/plugins/publicize/components/panel/index.js +++ b/projects/plugins/jetpack/extensions/plugins/publicize/components/panel/index.js @@ -10,9 +10,10 @@ * WordPress dependencies */ import { __ } from '@wordpress/i18n'; -import { PanelBody, PanelRow, ToggleControl } from '@wordpress/components'; +import { PanelBody, PanelRow, ToggleControl, Disabled } from '@wordpress/components'; import { store as editorStore } from '@wordpress/editor'; import { useSelect } from '@wordpress/data'; +import { Fragment } from '@wordpress/element'; /** * Internal dependencies @@ -23,7 +24,9 @@ import PublicizeTwitterOptions from '../twitter/options'; import useSelectSocialMediaConnections from '../../hooks/use-social-media-connections'; import { usePostJustPublished } from '../../hooks/use-saving-post'; import usePublicizeConfig from '../../hooks/use-publicize-config'; + import { SharePostRow } from '../../components/share-post'; +import UpsellNotice from '../upsell'; function getPanelDescription( isPostPublished, @@ -73,7 +76,6 @@ function getPanelDescription( const PublicizePanel = ( { prePublish } ) => { const { refresh, hasConnections, hasEnabledConnections } = useSelectSocialMediaConnections(); - const isPostPublished = useSelect( select => select( editorStore ).isCurrentPostPublished(), [] ); /* @@ -81,11 +83,21 @@ const PublicizePanel = ( { prePublish } ) => { * it can be defined via the `jetpack_block_editor_republicize_feature` backend filter. */ const { - isRePublicizeFeatureEnabled, - isPublicizeEnabled, + isRePublicizeFeatureEnabled, // <- defined by the server-side feature flag check + isPublicizeEnabled: isPublicizeEnabledFromConfig, // <- usually handled by the UI + isRePublicizeFeatureUpgradable, // <- defined by the `republicize` feature availability check togglePublicizeFeature, } = usePublicizeConfig(); + /* + * Publicize is enabled by toggling the control, + * but also disabled when the post is already published, + * and the feature is upgradable. + */ + const isPublicizeDisabledBySitePlan = + isPostPublished && isRePublicizeFeatureUpgradable && isRePublicizeFeatureEnabled; + const isPublicizeEnabled = isPublicizeEnabledFromConfig && ! isPublicizeDisabledBySitePlan; + // Refresh connections when the post is just published. usePostJustPublished( function () { @@ -98,8 +110,20 @@ const PublicizePanel = ( { prePublish } ) => { [ hasEnabledConnections, refresh ] ); + // Disable the panel when no proper site plan is available. + const PanelRowWithDisabled = isPublicizeDisabledBySitePlan ? Disabled : PanelRow; + + // Panel wrapper. + const PanelWrapper = prePublish ? Fragment : PanelBody; + const wrapperProps = prePublish + ? {} + : { + title: __( 'Share this post', 'jetpack' ), + className: isPublicizeDisabledBySitePlan ? 'jetpack-publicize-disabled' : '', + }; + return ( - +
      { getPanelDescription( isPostPublished, @@ -110,30 +134,34 @@ const PublicizePanel = ( { prePublish } ) => { ) }
      - { isRePublicizeFeatureEnabled && ( - + { isPostPublished && } + + { isRePublicizeFeatureEnabled && ! isPostPublished && ( + - + ) } - + { ! isPublicizeDisabledBySitePlan && } - -       + + ); }; diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/components/share-post/index.js b/projects/plugins/jetpack/extensions/plugins/publicize/components/share-post/index.js index 544da10150a39..44389297ce28c 100644 --- a/projects/plugins/jetpack/extensions/plugins/publicize/components/share-post/index.js +++ b/projects/plugins/jetpack/extensions/plugins/publicize/components/share-post/index.js @@ -34,11 +34,11 @@ function showSuccessNotice() { } ); } -export function SharePostButton( { isPublicizeEnabled } ) { +export function SharePostButton() { const { hasEnabledConnections } = useSocialMediaConnections(); - const isPostPublished = useSelect( select => select( editorStore ).isCurrentPostPublished(), [] ); - + const { isPublicizeEnabled } = usePublicizeConfig(); const { isFetching, isError, isSuccess, doPublicize } = useSharePost(); + const isPostPublished = useSelect( select => select( editorStore ).isCurrentPostPublished(), [] ); useEffect( () => { if ( isFetching ) { @@ -87,16 +87,31 @@ export function SharePostButton( { isPublicizeEnabled } ) { ); } -export function SharePostRow( { isPublicizeEnabled } ) { - const { isRePublicizeFeatureEnabled } = usePublicizeConfig(); +export function SharePostRow() { + const { isRePublicizeFeatureEnabled, isRePublicizeFeatureUpgradable } = usePublicizeConfig(); + const isPostPublished = useSelect( select => select( editorStore ).isCurrentPostPublished(), [] ); + // Do not render when RePublicize feature is not enabled. if ( ! isRePublicizeFeatureEnabled ) { return null; } + // Do not render the button when the post is not published. + if ( ! isPostPublished ) { + return null; + } + + /* + * Do not render when the feature is upgradable. + * We show the upsale notice instead. + */ + if ( isRePublicizeFeatureUpgradable ) { + return null; + } + return ( - + ); } diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/components/upsell/index.js b/projects/plugins/jetpack/extensions/plugins/publicize/components/upsell/index.js new file mode 100644 index 0000000000000..acafe0d524b4c --- /dev/null +++ b/projects/plugins/jetpack/extensions/plugins/publicize/components/upsell/index.js @@ -0,0 +1,64 @@ +/** + * External dependencies + */ +import classNames from 'classnames'; + +/** + * WordPress dependencies + */ +import { __, sprintf } from '@wordpress/i18n'; +import { Button } from '@wordpress/components'; +import { external } from '@wordpress/icons'; + +/** + * Internal dependencies + */ +import { getRequiredPlan } from '../../../../shared/plan-utils'; +import useUpgradeFlow from '../../../../shared/use-upgrade-flow'; +import usePublicizeConfig from '../../hooks/use-publicize-config'; + +export default function UpsellNotice() { + const { isRePublicizeFeatureEnabled, isRePublicizeFeatureUpgradable } = usePublicizeConfig(); + + const requiredPlan = getRequiredPlan( 'republicize' ); + const [ checkoutUrl, goToCheckoutPage, isRedirecting, planData ] = useUpgradeFlow( requiredPlan ); + + /* + * Do not render either when the feature is not enabled, + * or when the feature is enabled and not upgradable. + */ + if ( ! isRePublicizeFeatureEnabled || ! isRePublicizeFeatureUpgradable ) { + return null; + } + + return ( +
      +
      + { sprintf( + /* translators: placeholder is the product name of the plan. */ + __( 'To re publicize a post, you need to upgrade to the %s plan', 'jetpack' ), + planData?.product_name + ) } +
      + + +
      + ); +} diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/editor.scss b/projects/plugins/jetpack/extensions/plugins/publicize/editor.scss index 391c52ce11cef..1e3af16c0c2a4 100644 --- a/projects/plugins/jetpack/extensions/plugins/publicize/editor.scss +++ b/projects/plugins/jetpack/extensions/plugins/publicize/editor.scss @@ -1,4 +1,5 @@ @import '../../shared/styles/gutenberg-base-styles.scss'; +@import "~@automattic/color-studio/dist/color-variables"; .jetpack-publicize__connections-list { list-style-type: none; @@ -58,3 +59,37 @@ .jetpack-publicize-add-connection-wrapper { margin: 15px 0; } + +.jetpack-publicize__upsell { + margin: 10px 0; + padding: 5px 0; +} + +.jetpack-publicize__upsell-description { + margin-bottom: 10px; + font-weight: 600; +} + +.jetpack-publicize__upsell-button { + &.is-primary { + background: $studio-pink-40; + color: $studio-white; + padding-right: 10px; + + &:hover { + background: $studio-pink-30; + } + &.is-busy { + background-size: 100px 100%; + background-image: linear-gradient(-45deg, $studio-pink-40 28%, $studio-pink-60 28%, $studio-pink-60 72%, $studio-pink-40 72%); + } + } +} + +// Disable styles +.jetpack-publicize-disabled { + .jetpack-publicize-toggle, + .jetpack-publicize__connections-list { + opacity: 0.5; + } +} diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/Readme.md b/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/Readme.md index b29f1a38ea6f1..7e55a2c2598bc 100644 --- a/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/Readme.md +++ b/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/Readme.md @@ -1,5 +1,5 @@ # usePublicizeConfig() hook -Simple hook to get config data about the Publicize feature. +Hook to get config data about the Publicize feature. ```es6 import usePublicizeConfig from '../../hooks/use-publicize-config'; @@ -17,8 +17,6 @@ function SavingPostLabel() { } ``` -The hook returns an object with the following props - ## isRePublicizeFeatureEnabled Feature flag, used to hide the new features behind it. @@ -27,4 +25,11 @@ Boolean state used to define whether the feature is enabled, or not. This state is tied to the main Sharing toggle control. ## togglePublicizeFeature() -Action to enable/disable the sharing feature state. Usually, used together with isPublicizeEnabled state. \ No newline at end of file +Action to enable/disable the sharing feature state. Usually, used together with isPublicizeEnabled state. + +## Disclaimer + +The data consumed by this hook doesn't change their state, at least so far. And considering the idea behind using a hook is to deal with when the data change externally to the component, we might consider that using a hook isn't the best option here. + +However, we decided to keep using the hook for the reason we consider, and also being optimistic in this sense, that the Jetpack plans data should be handled by a store. In that case, the hook will fit properly. +Finally, we don't see any big problem handing the data via the hook either. diff --git a/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/index.js b/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/index.js index 97b7d88eec09f..0c33071781e34 100644 --- a/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/index.js +++ b/projects/plugins/jetpack/extensions/plugins/publicize/hooks/use-publicize-config/index.js @@ -3,9 +3,18 @@ */ import { useSelect, useDispatch } from '@wordpress/data'; +/* + * Internal dependencies + */ +import getJetpackExtensionAvailability from '../../../../shared/get-jetpack-extension-availability'; +import { isUpgradable, isUpgradeNudgeEnabled } from '../../../../shared/plan-utils'; + +const republicizeFeatureName = 'republicize'; + export default function usePublicizeConfig() { // Actions. const { togglePublicizeFeature } = useDispatch( 'jetpack/publicize' ); + const { available } = getJetpackExtensionAvailability( republicizeFeatureName ); // Data. const isPublicizeEnabled = useSelect( @@ -17,7 +26,9 @@ export default function usePublicizeConfig() { isRePublicizeFeatureEnabled: !! window?.Jetpack_Editor_Initial_State.jetpack ?.republicize_enabled, isPublicizeEnabled, - togglePublicizeFeature, + isRePublicizeFeatureAvailable: available, + isRePublicizeFeatureUpgradable: + isUpgradable( republicizeFeatureName ) && isUpgradeNudgeEnabled(), }; } diff --git a/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/README.md b/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/README.md index 49e9ab7939502..bc4471fe8ec66 100644 --- a/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/README.md +++ b/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/README.md @@ -45,3 +45,40 @@ post/page/etc has changes to save. If so, it saves them before to redirect. - `isRedirecting` (`bool`): If the component is in the process of redirecting the user. It may be waiting for a save to complete before redirecting. Use this to set a button as busy or in a loading state. + +- `planData` (`object`) An object with full data about the plan. + +This data is provided by the `wordpress-com/plan` store registered by the [upgrade-nudge](../upgrade-nudge/store.js) shared component, which is populated by the response of the `https://public-api.wordpress.com/rest/v1.5/plans` request. +The following is a quite accurate shape of the personal plan: + +```js +{ + product_id: 2005, + product_name: "Jetpack Personal", + meta: null, + bd_slug: "jetpack-personal", + bd_variation_slug: "jetpack-personal-yearly", + sale_coupon_applied: false, + sale_coupon: null, + multi: 0, + cost: 39, + blog_id: null, + product_slug: "jetpack_personal", + description: "", + bill_period: 365, + product_type: "bundle", + available: "yes", + outer_slug: null, + extra: null, + capability: "manage_options", + product_name_short: "Personal", + icon: "https://s0.wordpress.com/i/store/plan-business.png", + icon_active: "https://s0.wordpress.com/i/store/plan-business-active.png", + bill_period_label: "per year", + price: "$39", + formatted_price: "$39", + raw_price: 39, + tagline: null, + currency_code: "USD" +} +``` \ No newline at end of file diff --git a/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/index.js b/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/index.js index f18c27f96b1a1..da2f7b9d68ac2 100644 --- a/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/index.js +++ b/projects/plugins/jetpack/extensions/shared/use-upgrade-flow/index.js @@ -56,5 +56,5 @@ export default function useUpgradeFlow( planSlug, onRedirect = noop ) { autosaveAndRedirect( event ); }; - return [ checkoutUrl, goToCheckoutPage, isRedirecting ]; + return [ checkoutUrl, goToCheckoutPage, isRedirecting, planData ]; } diff --git a/projects/plugins/jetpack/functions.global.php b/projects/plugins/jetpack/functions.global.php index 948eaeaf415b3..fd403dda311a0 100644 --- a/projects/plugins/jetpack/functions.global.php +++ b/projects/plugins/jetpack/functions.global.php @@ -3,7 +3,7 @@ * This file is meant to be the home for any generic & reusable functions * that can be accessed anywhere within Jetpack. * - * This file is loaded whether or not Jetpack is active. + * This file is loaded whether Jetpack is active. * * Please namespace with jetpack_ * @@ -13,6 +13,7 @@ use Automattic\Jetpack\Connection\Client; use Automattic\Jetpack\Device_Detection; use Automattic\Jetpack\Redirect; +use Automattic\Jetpack\Status\Host; use Automattic\Jetpack\Sync\Functions; /** @@ -143,16 +144,17 @@ function jetpack_get_future_removed_version( $version ) { } /** - * Determine if this site is an Atomic site or not looking first at the 'at_options' option. + * Determine if this site is an WoA site or not looking first at the 'at_options' option. * As a fallback, check for presence of wpcomsh plugin to determine if a current site has undergone AT. * * @since 4.8.1 + * @deprecated $$next_version$$ * * @return bool */ function jetpack_is_atomic_site() { - $at_options = get_option( 'at_options', array() ); - return ! empty( $at_options ) || defined( 'WPCOMSH__PLUGIN_FILE' ); + jetpack_deprecated_function( __FUNCTION__, 'Automattic/Jetpack/Status/Host::is_woa_site', '$$next_version$$' ); + return ( new Host() )->is_woa_site(); } /** diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php index ccb0ee13ca63e..cc41da4adf2be 100644 --- a/projects/plugins/jetpack/jetpack.php +++ b/projects/plugins/jetpack/jetpack.php @@ -4,7 +4,7 @@ * Plugin URI: https://jetpack.com * Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things. * Author: Automattic - * Version: 10.3-a.4 + * Version: 10.4-a.0 * Author URI: https://jetpack.com * License: GPL2+ * Text Domain: jetpack @@ -32,7 +32,7 @@ define( 'JETPACK__MINIMUM_WP_VERSION', '5.7' ); define( 'JETPACK__MINIMUM_PHP_VERSION', '5.6' ); -define( 'JETPACK__VERSION', '10.3-a.4' ); +define( 'JETPACK__VERSION', '10.4-a.0' ); /** * Constant used to fetch the connection owner token diff --git a/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php b/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php index c72c1eccd0fb8..63b2a81481d48 100644 --- a/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php +++ b/projects/plugins/jetpack/modules/cloudflare-analytics/cloudflare-analytics.php @@ -8,6 +8,8 @@ namespace Automattic\Jetpack\Cloudflare_Analytics; +use Automattic\Jetpack\Status\Host; + /** * Add Cloudflare Analytics tracking code to the head. * This is currently only available to Atomic and WordPress.com Simple sites. @@ -21,7 +23,7 @@ function insert_tracking_id() { ! empty( $option['code'] ) && ! is_admin() && ( class_exists( 'Jetpack_AMP_Support' ) && ! \Jetpack_AMP_Support::is_amp_request() ) - && ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || \jetpack_is_atomic_site() ) + && ( ( defined( 'IS_WPCOM' ) && IS_WPCOM ) || ( new Host() )->is_woa_site() ) ) { printf( " diff --git a/projects/plugins/jetpack/modules/masterbar.php b/projects/plugins/jetpack/modules/masterbar.php index 03165f27bfbb8..aacde02a961fb 100644 --- a/projects/plugins/jetpack/modules/masterbar.php +++ b/projects/plugins/jetpack/modules/masterbar.php @@ -16,6 +16,8 @@ namespace Automattic\Jetpack\Dashboard_Customizations; +use Automattic\Jetpack\Status\Host; + require __DIR__ . '/masterbar/masterbar/class-masterbar.php'; require __DIR__ . '/masterbar/admin-color-schemes/class-admin-color-schemes.php'; require __DIR__ . '/masterbar/inline-help/class-inline-help.php'; @@ -23,7 +25,7 @@ new Masterbar(); new Admin_Color_Schemes(); -if ( jetpack_is_atomic_site() ) { +if ( ( new Host() )->is_woa_site() ) { new Inline_Help(); require_once __DIR__ . '/masterbar/wp-posts-list/bootstrap.php'; require_once __DIR__ . '/masterbar/profile-edit/bootstrap.php'; diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-dashboard-switcher-tracking.php b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-dashboard-switcher-tracking.php index 9842b230d0df2..b3fe7cd83913b 100644 --- a/projects/plugins/jetpack/modules/masterbar/admin-menu/class-dashboard-switcher-tracking.php +++ b/projects/plugins/jetpack/modules/masterbar/admin-menu/class-dashboard-switcher-tracking.php @@ -7,6 +7,7 @@ namespace Automattic\Jetpack\Dashboard_Customizations; +use Automattic\Jetpack\Status\Host; use Automattic\Jetpack\Terms_Of_Service; use Automattic\Jetpack\Tracking; use Jetpack_Plan; @@ -123,13 +124,14 @@ public static function get_plan() { * @param array $event_properties The event properties. */ private function record_jetpack_event( $event_properties ) { - if ( \jetpack_is_atomic_site() ) { + $woa = ( new Host() )->is_woa_site(); + if ( $woa ) { add_filter( 'jetpack_options', array( __CLASS__, 'mark_jetpack_tos_as_read' ), 10, 2 ); } $this->tracking->record_user_event( self::JETPACK_EVENT_NAME, $event_properties ); - if ( \jetpack_is_atomic_site() ) { + if ( $woa ) { \remove_filter( 'jetpack_options', array( __CLASS__, 'mark_jetpack_tos_as_read' ) ); } } @@ -152,7 +154,7 @@ public static function wpcom_tracks_record_event( $event_props ) { * @return string */ public static function get_jetpack_tracking_product() { - return \jetpack_is_atomic_site() ? 'atomic' : 'jetpack'; + return ( new Host() )->is_woa_site() ? 'atomic' : 'jetpack'; } /** diff --git a/projects/plugins/jetpack/modules/masterbar/admin-menu/load.php b/projects/plugins/jetpack/modules/masterbar/admin-menu/load.php index 5429c108b501f..97b8811efa9fe 100644 --- a/projects/plugins/jetpack/modules/masterbar/admin-menu/load.php +++ b/projects/plugins/jetpack/modules/masterbar/admin-menu/load.php @@ -7,6 +7,7 @@ namespace Automattic\Jetpack\Dashboard_Customizations; +use Automattic\Jetpack\Status\Host; use Automattic\Jetpack\Tracking; /** @@ -44,7 +45,7 @@ function should_customize_nav( $admin_menu_class ) { */ function get_admin_menu_class() { // WordPress.com Atomic sites. - if ( jetpack_is_atomic_site() ) { + if ( ( new Host() )->is_woa_site() ) { require_once __DIR__ . '/class-atomic-admin-menu.php'; return Atomic_Admin_Menu::class; } diff --git a/projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php b/projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php index e79a54ac6e37c..18451ab612c98 100644 --- a/projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php +++ b/projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php @@ -13,6 +13,7 @@ use Automattic\Jetpack\Redirect; use Automattic\Jetpack\Scan\Admin_Bar_Notice; use Automattic\Jetpack\Status; +use Automattic\Jetpack\Status\Host; use GP_Locale; use GP_Locales; use Jetpack; @@ -94,6 +95,12 @@ class Masterbar { * @var int */ private $user_site_count; + /** + * If the site is hosted on WordPress.com on Atomic + * + * @var bool + */ + private $site_woa; /** * Constructor @@ -113,6 +120,7 @@ public function __construct() { $this->user_site_count = $this->user_data['site_count']; $this->is_rtl = 'rtl' === $this->user_data['text_direction']; $this->user_locale = $this->user_data['user_locale']; + $this->site_woa = ( new Host() )->is_woa_site(); // Store part of the connected user data as user options so it can be used // by other files of the masterbar module without making another XMLRPC @@ -123,7 +131,7 @@ public function __construct() { update_user_option( $this->user_id, 'jetpack_admin_menu_link_destination', $this->user_data['use_wp_admin_links'] ? '1' : '0' ); } // If Atomic, store and install user locale. - if ( jetpack_is_atomic_site() ) { + if ( $this->site_woa ) { $this->user_locale = $this->get_jetpack_locale( $this->user_locale ); $this->install_locale( $this->user_locale ); update_user_option( $this->user_id, 'locale', $this->user_locale, true ); @@ -170,8 +178,8 @@ class_exists( 'Jetpack_AMP_Support' ) 'dns-prefetch' ); - // Atomic only. - if ( jetpack_is_atomic_site() ) { + // WordPress.com on Atomic only. + if ( $this->site_woa ) { /* * override user setting that hides masterbar from site's front. * https://github.com/Automattic/jetpack/issues/7667 @@ -200,8 +208,8 @@ class_exists( 'Jetpack_AMP_Support' ) add_action( 'a8c_wpcom_masterbar_enqueue_rtl_notification_styles', '__return_true' ); } - // Hides and replaces the language dropdown for the current user, on Atomic. - if ( jetpack_is_atomic_site() && + // Hides and replaces the language dropdown for the current user, on WoA. + if ( $this->site_woa && defined( 'IS_PROFILE_PAGE' ) && IS_PROFILE_PAGE ) { add_action( 'user_edit_form_tag', array( $this, 'hide_language_dropdown' ) ); add_action( 'personal_options', array( $this, 'replace_language_dropdown' ), 9 ); @@ -844,7 +852,7 @@ public function add_me_submenu( $wp_admin_bar ) { $help_link = Redirect::get_url( 'jetpack-support' ); - if ( jetpack_is_atomic_site() ) { + if ( $this->site_woa ) { $help_link = Redirect::get_url( 'calypso-help' ); } @@ -1381,7 +1389,7 @@ public function add_my_sites_submenu( $wp_admin_bar ) { ) ); - if ( jetpack_is_atomic_site() ) { + if ( $this->site_woa ) { $domain_title = $this->create_menu_item_pair( array( 'url' => Redirect::get_url( 'calypso-domains' ), @@ -1460,7 +1468,7 @@ public function add_my_sites_submenu( $wp_admin_bar ) { * @return void */ private function add_my_home_submenu_item( &$wp_admin_bar ) { - if ( ! current_user_can( 'manage_options' ) || ! jetpack_is_atomic_site() ) { + if ( ! current_user_can( 'manage_options' ) || ! $this->site_woa ) { return; } diff --git a/projects/plugins/jetpack/modules/masterbar/nudges/bootstrap.php b/projects/plugins/jetpack/modules/masterbar/nudges/bootstrap.php index 74b32745f5c0e..1e4d17f46b4e4 100644 --- a/projects/plugins/jetpack/modules/masterbar/nudges/bootstrap.php +++ b/projects/plugins/jetpack/modules/masterbar/nudges/bootstrap.php @@ -7,7 +7,8 @@ namespace Automattic\Jetpack\Dashboard_Customizations; -use \Automattic\Jetpack\Status; +use Automattic\Jetpack\Status; +use Automattic\Jetpack\Status\Host; /** * The WP_Customize_Control core class is loaded only on customize_register. @@ -23,7 +24,7 @@ function register_css_nudge_control( \WP_Customize_Manager $customize_manager ) if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { require_once __DIR__ . '/additional-css/class-wpcom-additional-css-manager.php'; $manager = new WPCOM_Additional_CSS_Manager( $domain ); - } elseif ( jetpack_is_atomic_site() ) { + } elseif ( ( new Host() )->is_woa_site() ) { require_once __DIR__ . '/additional-css/class-atomic-additional-css-manager.php'; $manager = new Atomic_Additional_CSS_Manager( $domain ); } diff --git a/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php b/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php index 51885be111f52..3102c646ee2ae 100644 --- a/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php +++ b/projects/plugins/jetpack/modules/videopress/class.videopress-edit-attachment.php @@ -284,13 +284,18 @@ protected function display_rating( $info ) { 'G' => 'G', 'PG-13' => 'PG-13', 'R-17' => 'R', - 'X-18' => 'X', ); + $displayed_rating = $info->rating; + // X-18 was previously supported but is now removed to better comply with our TOS. + if ( 'X-18' === $displayed_rating ) { + $displayed_rating = 'R-17'; + } + foreach ( $ratings as $r => $label ) { $id = "attachments-{$info->post_id}-rating-$r"; $out .= "