From f71c087091310885c4b23a15e24b6e34dce088ed Mon Sep 17 00:00:00 2001 From: "A. Alani" <38976631+aalani95@users.noreply.github.com> Date: Thu, 1 Sep 2022 14:06:36 -0700 Subject: [PATCH 1/6] Update marketplace styles (#10) * horizontal tabpanel filter bar. * 3 card wide layout. * other style improvements. --- src/app/pages/marketplace/stylesheet.scss | 215 +++++++++++++++++----- 1 file changed, 165 insertions(+), 50 deletions(-) diff --git a/src/app/pages/marketplace/stylesheet.scss b/src/app/pages/marketplace/stylesheet.scss index 628200d..0ec560b 100644 --- a/src/app/pages/marketplace/stylesheet.scss +++ b/src/app/pages/marketplace/stylesheet.scss @@ -1,69 +1,184 @@ .newfold-marketplace-wrapper { + .grid { + display: grid; + gap: clamp(0.5rem, calc(1rem + 1vw), 2rem); + padding: 0; + + &.col2 { + @media screen and (min-width: 600px) { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + + @media screen and (min-width: 1100px) { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } + } + } + + .newfold-marketplace-tabs { + display: flex; + flex-direction: column; + + .components-tab-panel__tabs { + display: flex; + /* <= WP 5.4 */ + flex-direction: row; + /* <= WP 5.6 */ + gap: 1.5rem; + max-width: max-content; + height: fit-content; + margin-bottom: 1.5rem; + padding: 0rem .8rem 0 .8rem; + background-color: var(--mdc-theme-primary--light4); + box-shadow: 2px 2px 0 4px var(--mdc-theme-primary--light3); + + @media screen and (max-width: 600px) { + min-width: initial; + overflow-y: scroll; + } + } + } + + .components-tab-panel__tabs-item { + font-size: 14px; + color: var(--mdc-theme-primary--dark1); + padding: 16px 3px 16px 3px; + height: auto; + transition: all .15s ease-in-out; + + &:hover { + color: var(--mdc-theme-primary--light1); + } + + &:last-child { + padding-right: 3px; + } + + &.current-tab { + border-bottom: 2.5px solid; + border-color: var(--mdc-theme-primary--dark1); + cursor: default; + + &:hover { + color: var(--mdc-theme-primary--dark1); + } + } + + &.components-button:focus:not(:disabled) { + box-shadow: none; + } + } +} + +.marketplace-item { + border-top: 2px; + border-left: 2px; + border-bottom: 4px; + border-right: 4px; + border-style: solid; + border-color: var(--dc-theme-black); + overflow: hidden; + + &.components-card { + box-shadow: unset; + } + + div:first-child { + display: flex; + flex-direction: column; + } + .components-card__media { position: relative; - left: 2px; - top: 2px; - max-width: calc(100% - 8px); - border-radius: 0 !important; + background-color: rgba(160, 170, 192, .35); + + &::after { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + transform: translateX(-100%); + background-image: linear-gradient(90deg, + rgba(#fff, 0) 0, + rgba(#fff, 0.2) 20%, + rgba(#fff, 0.5) 60%, + rgba(#fff, 0)); + animation: marketplace-skeleton 2s infinite; + content: ''; + } + + @keyframes marketplace-skeleton { + 100% { + transform: translateX(100%); + } + } + + img { + aspect-ratio: 16 / 9; + z-index: 2; + } } + .components-card__header { position: relative; - + border-bottom: none; + flex-wrap: wrap; + gap: .7rem; + + h2, + h3 { + font-size: .95rem; + min-width: min-content; + margin: 0; + } + .price { - background-color: var(--dc-theme-success--light); - border-radius: 0.5rem; - color: var(--dc-theme-success--dark); - font-size: 1rem; + background-color: rgb(9, 141, 92, .15); + box-shadow: 1px 1px 0 2.5px rgb(9, 141, 92, .3); + border-radius: 0; + color: var(--mdc-theme-secondary--dark1); + font-size: .95rem; font-weight: 800; - min-width: 3rem; + min-width: max-content; + margin-left: 0; padding: 0.25rem 0.75rem; - position: absolute; - right: 1rem; - text-align: center; - top: -2.5rem; } } -} -.newfold-marketplace-tabs { - display: flex; - border-width: 1px 0 0 0; - border-style: solid; - border-color: var(--mdc-theme-secondary--dark1); - - .components-tab-panel__tabs { - display: flex; /* <= WP 5.4 */ - flex-direction: column; /* <= WP 5.6 */ - min-width: 10rem; - margin-right: 2rem; - margin-top: -1px; + .components-card__body { + flex-grow: 1; + padding-top: 4px; + padding-bottom: 22px; } - - .components-tab-panel__tabs-item { - background-color: var(--dc-theme-white); - border-width: 0 1px 0 0; - border-style: solid; - border-color: var(--mdc-theme-secondary--dark1); - font-size: 15px; - transition: none; - - &:focus:not(:disabled) { - box-shadow: none !important; - } - &:hover { - color: var(--dc-theme-grey); - } + .components-card__footer { + justify-content: space-between; - &.current-tab { - background-color: transparent; - color: var(--dc-theme-black); - border-width: 1px 0; - cursor: default; + .is-secondary svg { + display: none; } - } - .components-tab-panel__tab-content { - padding-top: 1rem; + .is-secondary[target=_blank] { + box-shadow: unset; + outline: unset; + margin-right: -10px; + + &:hover, + &:active, + &:focus { + box-shadow: unset; + outline: unset; + background-color: transparent; + } + + svg { + display: inline; + width: 14px; + height: auto; + margin-top: 2px; + margin-left: 4px; + } + } } } \ No newline at end of file From 6c1d3bd204c32c7214936e9325e5c846da46eafe Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Fri, 2 Sep 2022 13:07:09 -0400 Subject: [PATCH 2/6] Feature/marketplace update (#9) * fix typo * update marketplace module and component * Update workflows to support Git Flow + WP branch naming conventions * explicitly update marketplace in composer * fix tests to reflect module updates * update marketplace module again and fix nav styles for marketplace page * npm audit fix * update node and php used in runner for builds * composer update to get latest marketplace module * update versions in i18n workflow too --- .github/workflows/cypress-tests.yml | 13 +- .github/workflows/lint-php.yml | 2 +- .github/workflows/upload-artifact-on-push.yml | 29 +- .github/workflows/upload-asset-on-release.yml | 19 +- .github/workflows/wp-i18n.yml | 4 +- composer.json | 2 +- composer.lock | 424 +++++------------- package-lock.json | 325 +++++++------- src/app/components/header/stylesheet.scss | 10 +- src/app/pages/marketplace/index.js | 7 +- tests/cypress/integration/marketplace.spec.js | 15 +- wp-plugin-web.php | 2 +- 12 files changed, 348 insertions(+), 504 deletions(-) diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml index e64a75f..814d7e3 100644 --- a/.github/workflows/cypress-tests.yml +++ b/.github/workflows/cypress-tests.yml @@ -3,6 +3,13 @@ on: push: branches: - main + - develop + - release/* + - feature/* + - add/* + - update/* + - fix/* + - try/* paths-ignore: - '.github/**' - '.gitignore' @@ -32,7 +39,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' coverage: none tools: composer @@ -51,7 +58,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16.x - name: Cache node modules uses: actions/cache@v2 @@ -79,7 +86,7 @@ jobs: run: composer install --no-progress --no-dev --optimize-autoloader - name: Run NPM Install - run: npm install + run: npm install --legacy-peer-deps - name: Build JavaScript run: npm run build diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index de108a0..7e2dcf0 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -4,7 +4,7 @@ on: paths: - '**.php' pull_request: - types: [ opened, edited, synchronize, reopened, ready_for_review ] + types: [ opened, edited, reopened, ready_for_review ] paths: - '**.php' concurrency: diff --git a/.github/workflows/upload-artifact-on-push.yml b/.github/workflows/upload-artifact-on-push.yml index 4b7a0ac..2a2a526 100644 --- a/.github/workflows/upload-artifact-on-push.yml +++ b/.github/workflows/upload-artifact-on-push.yml @@ -4,10 +4,16 @@ on: push: branches: - main - + - develop + - release/* + - feature/* + - add/* + - update/* + - fix/* + - try/* jobs: build: - name: On Push to Main + name: On Push runs-on: ubuntu-latest steps: @@ -17,7 +23,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' coverage: none tools: composer, cs2pr @@ -33,16 +39,17 @@ jobs: - name: PHP version run: php --version - - name: Set Node.js 14.x + - name: Set Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x - - - name: Node version - run: node --version + node-version: 16.x - - name: NPM version - run: npm --version + - name: Show versions + run: | + php --version + composer --version + node --version + npm --version - name: Get npm cache directory id: npm-cache @@ -56,7 +63,7 @@ jobs: restore-keys: | ${{ runner.os }}-node- - name: npm install - run: npm install + run: npm install --legacy-peer-deps - name: Validate composer.json and composer.lock run: composer validate diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml index 9f6e547..30971ec 100644 --- a/.github/workflows/upload-asset-on-release.yml +++ b/.github/workflows/upload-asset-on-release.yml @@ -32,7 +32,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' coverage: none tools: composer, cs2pr @@ -48,16 +48,17 @@ jobs: - name: PHP version run: php --version - - name: Set Node.js 14.x + - name: Set Node.js 16.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 16.x - - name: Node version - run: node --version - - - name: NPM version - run: npm --version + - name: Show versions + run: | + php --version + composer --version + node --version + npm --version - name: Get npm cache directory id: npm-cache @@ -71,7 +72,7 @@ jobs: restore-keys: | ${{ runner.os }}-node- - name: npm install - run: npm install + run: npm install --legacy-peer-deps - name: Validate composer.json and composer.lock run: composer validate diff --git a/.github/workflows/wp-i18n.yml b/.github/workflows/wp-i18n.yml index 6673904..e2259e8 100644 --- a/.github/workflows/wp-i18n.yml +++ b/.github/workflows/wp-i18n.yml @@ -30,7 +30,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' coverage: none tools: composer @@ -49,7 +49,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 16 - name: Log debug information run: | diff --git a/composer.json b/composer.json index 3d4ed2b..3b85e9c 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "newfold-labs/wp-module-coming-soon": "^1.0.7", "newfold-labs/wp-module-data": "^2.0.0", "newfold-labs/wp-module-loader": "^1.0", - "newfold-labs/wp-module-marketplace": "^1.2", + "newfold-labs/wp-module-marketplace": "^1.3.3", "newfold-labs/wp-module-notifications": "^1.0", "newfold-labs/wp-module-performance": "^1.0", "wp-forge/wp-update-handler": "^1.0" diff --git a/composer.lock b/composer.lock index ea1c322..f4c623b 100644 --- a/composer.lock +++ b/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": "6332f9854b29c996668079ed3938a7c9", + "content-hash": "e7e6f8d38c9960d6d249128074c73aeb", "packages": [ { "name": "doctrine/inflector", @@ -102,6 +102,44 @@ ], "time": "2021-04-16T17:34:40+00:00" }, + { + "name": "newfold-labs/container", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/newfold-labs/container.git", + "reference": "19bb75bb4a64a282f7d142fff9f3418177022851" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/newfold-labs/container/zipball/19bb75bb4a64a282f7d142fff9f3418177022851", + "reference": "19bb75bb4a64a282f7d142fff9f3418177022851", + "shasum": "" + }, + "require": { + "php": ">=7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "NewfoldLabs\\Container\\": "includes" + } + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Micah Wood", + "email": "micah@wpscholar.com" + } + ], + "description": "A lightweight, PHP 7.0+ compatible, PSR-11 dependency injection container.", + "support": { + "source": "https://github.com/newfold-labs/container/tree/1.2.2" + }, + "time": "2022-08-26T17:23:54+00:00" + }, { "name": "newfold-labs/wp-module-coming-soon", "version": "1.0.7", @@ -155,16 +193,16 @@ }, { "name": "newfold-labs/wp-module-data", - "version": "2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-data.git", - "reference": "953117ede1f742b2e89c779566cee5afff6e13f0" + "reference": "f4f8bf4f1f08c664aa17bc26ba5ba34bded267b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/953117ede1f742b2e89c779566cee5afff6e13f0", - "reference": "953117ede1f742b2e89c779566cee5afff6e13f0", + "url": "https://api.github.com/repos/newfold-labs/wp-module-data/zipball/f4f8bf4f1f08c664aa17bc26ba5ba34bded267b0", + "reference": "f4f8bf4f1f08c664aa17bc26ba5ba34bded267b0", "shasum": "" }, "require": { @@ -195,27 +233,27 @@ ], "description": "Newfold Data Module", "support": { - "source": "https://github.com/newfold-labs/wp-module-data/tree/2.1", + "source": "https://github.com/newfold-labs/wp-module-data/tree/2.2.2", "issues": "https://github.com/newfold-labs/wp-module-data/issues" }, - "time": "2022-06-21T17:38:17+00:00" + "time": "2022-08-25T16:50:45+00:00" }, { "name": "newfold-labs/wp-module-loader", - "version": "1.0.4", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-loader.git", - "reference": "0a4f6014040f06bc3e7c4c593d5c87bbc0b6544f" + "reference": "eea4e9755d3f82b8b7ba3974217d80fe5e945e2b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-loader/zipball/0a4f6014040f06bc3e7c4c593d5c87bbc0b6544f", - "reference": "0a4f6014040f06bc3e7c4c593d5c87bbc0b6544f", + "url": "https://api.github.com/repos/newfold-labs/wp-module-loader/zipball/eea4e9755d3f82b8b7ba3974217d80fe5e945e2b", + "reference": "eea4e9755d3f82b8b7ba3974217d80fe5e945e2b", "shasum": "" }, "require": { - "wp-forge/container": "^1.0", + "newfold-labs/container": "^1.2", "wp-forge/fluent": "^1.0", "wp-forge/wp-options": "^1.0", "wpscholar/collection": "^1.0" @@ -241,23 +279,23 @@ ], "description": "A module that handles registration and management of Newfold modules used within our WordPress plugins.", "support": { - "source": "https://github.com/newfold-labs/wp-module-loader/tree/1.0.4", + "source": "https://github.com/newfold-labs/wp-module-loader/tree/1.0.8", "issues": "https://github.com/newfold-labs/wp-module-loader/issues" }, - "time": "2022-05-02T20:45:29+00:00" + "time": "2022-08-10T15:08:33+00:00" }, { "name": "newfold-labs/wp-module-marketplace", - "version": "1.2.3", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-marketplace.git", - "reference": "7668d2e1d674fd5f5387e2f99d3bd1da511dc772" + "reference": "2a6c35d523b08fe2584a11d7959079b16e58441f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-marketplace/zipball/7668d2e1d674fd5f5387e2f99d3bd1da511dc772", - "reference": "7668d2e1d674fd5f5387e2f99d3bd1da511dc772", + "url": "https://api.github.com/repos/newfold-labs/wp-module-marketplace/zipball/2a6c35d523b08fe2584a11d7959079b16e58441f", + "reference": "2a6c35d523b08fe2584a11d7959079b16e58441f", "shasum": "" }, "require": { @@ -287,10 +325,10 @@ ], "description": "A module for rendering product data and interacting with the Hiive marketplace API.", "support": { - "source": "https://github.com/newfold-labs/wp-module-marketplace/tree/1.2.3", + "source": "https://github.com/newfold-labs/wp-module-marketplace/tree/1.3.3", "issues": "https://github.com/newfold-labs/wp-module-marketplace/issues" }, - "time": "2022-07-25T18:54:20+00:00" + "time": "2022-09-02T16:22:35+00:00" }, { "name": "newfold-labs/wp-module-notifications", @@ -381,106 +419,18 @@ }, "time": "2022-04-01T20:11:45+00:00" }, - { - "name": "psr/container", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", - "shasum": "" - }, - "require": { - "php": ">=7.4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" - }, - "time": "2021-11-05T16:50:12+00:00" - }, - { - "name": "wp-forge/container", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/wp-forge/container.git", - "reference": "e76a208d048b163dcb23068b149e16bdcfabc901" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wp-forge/container/zipball/e76a208d048b163dcb23068b149e16bdcfabc901", - "reference": "e76a208d048b163dcb23068b149e16bdcfabc901", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "WP_Forge\\Container\\": "includes" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Micah Wood", - "email": "micah@wpscholar.com" - } - ], - "description": "A lightweight, PHP 5.4+ compatible, PSR-11 dependency injection container.", - "support": { - "issues": "https://github.com/wp-forge/container/issues", - "source": "https://github.com/wp-forge/container/tree/1.0" - }, - "time": "2020-03-22T22:42:37+00:00" - }, { "name": "wp-forge/fluent", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/wp-forge/fluent.git", - "reference": "ecc5f31981ddfacf4de5d64eea1c9ef567cb4e97" + "reference": "b7d6e54f86bd2bbc229faeefd2772f1f1354ad8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-forge/fluent/zipball/ecc5f31981ddfacf4de5d64eea1c9ef567cb4e97", - "reference": "ecc5f31981ddfacf4de5d64eea1c9ef567cb4e97", + "url": "https://api.github.com/repos/wp-forge/fluent/zipball/b7d6e54f86bd2bbc229faeefd2772f1f1354ad8c", + "reference": "b7d6e54f86bd2bbc229faeefd2772f1f1354ad8c", "shasum": "" }, "type": "library", @@ -502,9 +452,9 @@ "description": "An instance of the Laravel Fluent class for use with WordPress.", "support": { "issues": "https://github.com/wp-forge/fluent/issues", - "source": "https://github.com/wp-forge/fluent/tree/1.0" + "source": "https://github.com/wp-forge/fluent/tree/1.0.1" }, - "time": "2022-03-03T21:50:32+00:00" + "time": "2022-08-26T17:38:37+00:00" }, { "name": "wp-forge/helpers", @@ -629,16 +579,16 @@ }, { "name": "wp-forge/wp-update-handler", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/wp-forge/wp-update-handler.git", - "reference": "6564ffdf31bc805d24671a11c05b1bc13a23af36" + "reference": "deb2beae787381158dc8c60b1cdcd241333a8784" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-forge/wp-update-handler/zipball/6564ffdf31bc805d24671a11c05b1bc13a23af36", - "reference": "6564ffdf31bc805d24671a11c05b1bc13a23af36", + "url": "https://api.github.com/repos/wp-forge/wp-update-handler/zipball/deb2beae787381158dc8c60b1cdcd241333a8784", + "reference": "deb2beae787381158dc8c60b1cdcd241333a8784", "shasum": "" }, "require": { @@ -666,9 +616,9 @@ "description": "A WordPress package for updating custom plugins and themes based on an API response from a custom update server.", "support": { "issues": "https://github.com/wp-forge/wp-update-handler/issues", - "source": "https://github.com/wp-forge/wp-update-handler/tree/1.0" + "source": "https://github.com/wp-forge/wp-update-handler/tree/1.0.1" }, - "time": "2021-09-29T19:29:40+00:00" + "time": "2022-08-26T17:36:12+00:00" }, { "name": "wpscholar/collection", @@ -919,16 +869,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.6", + "version": "v4.8.7", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe" + "reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/bbeb8f4d3077663739aecb4551b22e720c0e9efe", - "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/3f7bc5ef23302a9059e64934f3d59e454516bec0", + "reference": "3f7bc5ef23302a9059e64934f3d59e454516bec0", "shasum": "" }, "require": { @@ -980,7 +930,7 @@ "support": { "email": "oom@oscarotero.com", "issues": "https://github.com/oscarotero/Gettext/issues", - "source": "https://github.com/php-gettext/Gettext/tree/v4.8.6" + "source": "https://github.com/php-gettext/Gettext/tree/v4.8.7" }, "funding": [ { @@ -996,7 +946,7 @@ "type": "patreon" } ], - "time": "2021-10-19T10:44:53+00:00" + "time": "2022-08-02T09:42:10+00:00" }, { "name": "gettext/languages", @@ -1124,16 +1074,16 @@ }, { "name": "mustache/mustache", - "version": "v2.14.1", + "version": "v2.14.2", "source": { "type": "git", "url": "https://github.com/bobthecow/mustache.php.git", - "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e" + "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/579ffa5c96e1d292c060b3dd62811ff01ad8c24e", - "reference": "579ffa5c96e1d292c060b3dd62811ff01ad8c24e", + "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e62b7c3849d22ec55f3ec425507bf7968193a6cb", + "reference": "e62b7c3849d22ec55f3ec425507bf7968193a6cb", "shasum": "" }, "require": { @@ -1168,9 +1118,9 @@ ], "support": { "issues": "https://github.com/bobthecow/mustache.php/issues", - "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.1" + "source": "https://github.com/bobthecow/mustache.php/tree/v2.14.2" }, - "time": "2022-01-21T06:08:36+00:00" + "time": "2022-08-23T13:07:01+00:00" }, { "name": "phpcompatibility/php-compatibility", @@ -1460,91 +1410,25 @@ }, "time": "2022-06-18T07:21:10+00:00" }, - { - "name": "symfony/deprecation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" - }, { "name": "symfony/finder", - "version": "v5.4.8", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9" + "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9", - "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9", + "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709", + "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0" }, "type": "library", "autoload": { @@ -1572,90 +1456,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.8" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-04-15T08:07:45+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/finder/tree/v6.1.3" }, "funding": [ { @@ -1671,20 +1472,20 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-07-29T07:42:06+00:00" }, { "name": "wp-cli/i18n-command", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/wp-cli/i18n-command.git", - "reference": "bcb1a8159679cafdf1da884dbe5830122bae2c4d" + "reference": "45bc2b47a4ed103b871cd2ec5b483ab55ad12d99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/bcb1a8159679cafdf1da884dbe5830122bae2c4d", - "reference": "bcb1a8159679cafdf1da884dbe5830122bae2c4d", + "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/45bc2b47a4ed103b871cd2ec5b483ab55ad12d99", + "reference": "45bc2b47a4ed103b871cd2ec5b483ab55ad12d99", "shasum": "" }, "require": { @@ -1698,6 +1499,7 @@ "wp-cli/wp-cli-tests": "^3.1" }, "suggest": { + "ext-json": "Used for reading and generating JSON translation files", "ext-mbstring": "Used for calculating include/exclude matches in code extraction" }, "type": "wp-cli-package", @@ -1709,7 +1511,9 @@ "commands": [ "i18n", "i18n make-pot", - "i18n make-json" + "i18n make-json", + "i18n make-mo", + "i18n update-po" ] }, "autoload": { @@ -1734,9 +1538,9 @@ "homepage": "https://github.com/wp-cli/i18n-command", "support": { "issues": "https://github.com/wp-cli/i18n-command/issues", - "source": "https://github.com/wp-cli/i18n-command/tree/v2.3.0" + "source": "https://github.com/wp-cli/i18n-command/tree/v2.4.0" }, - "time": "2022-04-06T15:32:48+00:00" + "time": "2022-07-04T21:43:20+00:00" }, { "name": "wp-cli/mustangostang-spyc", @@ -1791,16 +1595,16 @@ }, { "name": "wp-cli/php-cli-tools", - "version": "v0.11.13", + "version": "v0.11.15", "source": { "type": "git", "url": "https://github.com/wp-cli/php-cli-tools.git", - "reference": "a2866855ac1abc53005c102e901553ad5772dc04" + "reference": "b6edd35988892ea1451392eb7a26d9dbe98c836d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/a2866855ac1abc53005c102e901553ad5772dc04", - "reference": "a2866855ac1abc53005c102e901553ad5772dc04", + "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/b6edd35988892ea1451392eb7a26d9dbe98c836d", + "reference": "b6edd35988892ea1451392eb7a26d9dbe98c836d", "shasum": "" }, "require": { @@ -1839,9 +1643,9 @@ ], "support": { "issues": "https://github.com/wp-cli/php-cli-tools/issues", - "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.13" + "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.15" }, - "time": "2021-07-01T15:08:16+00:00" + "time": "2022-08-15T10:15:55+00:00" }, { "name": "wp-cli/wp-cli", @@ -1967,16 +1771,16 @@ }, { "name": "wp-phpunit/wp-phpunit", - "version": "5.9.3", + "version": "5.9.4", "source": { "type": "git", "url": "https://github.com/wp-phpunit/wp-phpunit.git", - "reference": "ceece1ed4f2d0732c4a4f2603f4376d85547a50f" + "reference": "f9b5b3a44d3677c7d4803074d81ad3cd12b0eeea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-phpunit/wp-phpunit/zipball/ceece1ed4f2d0732c4a4f2603f4376d85547a50f", - "reference": "ceece1ed4f2d0732c4a4f2603f4376d85547a50f", + "url": "https://api.github.com/repos/wp-phpunit/wp-phpunit/zipball/f9b5b3a44d3677c7d4803074d81ad3cd12b0eeea", + "reference": "f9b5b3a44d3677c7d4803074d81ad3cd12b0eeea", "shasum": "" }, "type": "library", @@ -2011,7 +1815,7 @@ "issues": "https://github.com/wp-phpunit/issues", "source": "https://github.com/wp-phpunit/wp-phpunit" }, - "time": "2022-02-22T20:53:17+00:00" + "time": "2022-08-30T21:14:52+00:00" } ], "aliases": [], @@ -2021,5 +1825,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.3.0" } diff --git a/package-lock.json b/package-lock.json index 1e1c8ce..f8d2e37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "wp-plugin-web", "version": "1.2.0", "license": "GPL-2.0-or-later", "dependencies": { @@ -2566,6 +2567,20 @@ "node": ">= 10.14.2" } }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", @@ -2575,6 +2590,25 @@ "node": ">=6.0.0" } }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.11", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", @@ -2582,9 +2616,9 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", + "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", @@ -2601,9 +2635,9 @@ } }, "node_modules/@kwsites/file-exists/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -4235,9 +4269,9 @@ } }, "node_modules/@wordpress/env": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-4.2.1.tgz", - "integrity": "sha512-zDZ+++Dgn94Dp+PUtB1l0I8SYlyaDxojFPUdKhk4fqHUOtiQ4+rEYoaiUrKWXIgPox19E5kCff4SMSgQDER8XQ==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-4.9.0.tgz", + "integrity": "sha512-C2g5aOYxl1Bd9lypvEMjXZ1s1Gx/JHpFWuPlCAI8gAzwzB9jCIZkqpU85GsGScpZLAANS/N7wF3LMY68UkN9fQ==", "dev": true, "dependencies": { "chalk": "^4.0.0", @@ -4249,7 +4283,7 @@ "js-yaml": "^3.13.1", "ora": "^4.0.2", "rimraf": "^3.0.2", - "simple-git": "^2.35.0", + "simple-git": "^3.5.0", "terminal-link": "^2.0.0", "yargs": "^17.3.0" }, @@ -4320,13 +4354,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@wordpress/eslint-plugin/node_modules/prettier": { - "name": "wp-prettier", - "version": "2.2.1-beta-1", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", - "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", - "dev": true - }, "node_modules/@wordpress/eslint-plugin/node_modules/type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -5128,9 +5155,9 @@ } }, "node_modules/async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "dependencies": { "lodash": "^4.17.14" @@ -5838,14 +5865,20 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001312", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", - "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==", + "version": "1.0.30001388", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz", + "integrity": "sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ==", "dev": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - } + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + } + ] }, "node_modules/capture-exit": { "version": "2.0.0", @@ -13959,9 +13992,9 @@ } }, "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/minimist-options": { @@ -17697,24 +17730,24 @@ "dev": true }, "node_modules/simple-git": { - "version": "2.48.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz", - "integrity": "sha512-z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.13.0.tgz", + "integrity": "sha512-VYrs3joeHvWGcN3K135RpGpPjm4AHYeOrclwew6LlfHgq6ozQYIW2yMnmjf4PCgVOuSYCbXkdUjyiFawuJz8MA==", "dev": true, "dependencies": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1", - "debug": "^4.3.2" + "debug": "^4.3.4" }, "funding": { "type": "github", - "url": "https://github.com/sponsors/steveukx/" + "url": "https://github.com/steveukx/git-js?sponsor=1" } }, "node_modules/simple-git/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -19136,13 +19169,14 @@ } }, "node_modules/terser": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", - "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "dependencies": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "bin": { @@ -19150,14 +19184,6 @@ }, "engines": { "node": ">=10" - }, - "peerDependencies": { - "acorn": "^8.5.0" - }, - "peerDependenciesMeta": { - "acorn": { - "optional": true - } } }, "node_modules/terser-webpack-plugin": { @@ -19250,13 +19276,16 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/terser/node_modules/source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "node_modules/terser/node_modules/acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true, + "bin": { + "acorn": "bin/acorn" + }, "engines": { - "node": ">= 8" + "node": ">=0.4.0" } }, "node_modules/test-exclude": { @@ -22732,12 +22761,39 @@ "chalk": "^4.0.0" } }, + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/resolve-uri": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==", "dev": true }, + "@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@jridgewell/sourcemap-codec": { "version": "1.4.11", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", @@ -22745,9 +22801,9 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", + "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.0.3", @@ -22764,9 +22820,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -23751,8 +23807,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", - "dev": true, - "requires": {} + "dev": true }, "@webpack-cli/info": { "version": "1.4.1", @@ -23767,8 +23822,7 @@ "version": "1.6.1", "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", - "dev": true, - "requires": {} + "dev": true }, "@wojtekmaj/enzyme-adapter-react-17": { "version": "0.6.6", @@ -23818,8 +23872,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/@wordpress/babel-plugin-import-jsx-pragma/-/babel-plugin-import-jsx-pragma-3.1.1.tgz", "integrity": "sha512-0gopMgFMVBtJiYTwsxq4ERhbeHV2iI11fHt52fguBr8eS7h61ufp3uZy0aapdh8vQh80S2v1rgdYJwAWb73r1w==", - "dev": true, - "requires": {} + "dev": true }, "@wordpress/babel-preset-default": { "version": "6.5.1", @@ -24076,9 +24129,9 @@ } }, "@wordpress/env": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-4.2.1.tgz", - "integrity": "sha512-zDZ+++Dgn94Dp+PUtB1l0I8SYlyaDxojFPUdKhk4fqHUOtiQ4+rEYoaiUrKWXIgPox19E5kCff4SMSgQDER8XQ==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@wordpress/env/-/env-4.9.0.tgz", + "integrity": "sha512-C2g5aOYxl1Bd9lypvEMjXZ1s1Gx/JHpFWuPlCAI8gAzwzB9jCIZkqpU85GsGScpZLAANS/N7wF3LMY68UkN9fQ==", "dev": true, "requires": { "chalk": "^4.0.0", @@ -24090,7 +24143,7 @@ "js-yaml": "^3.13.1", "ora": "^4.0.2", "rimraf": "^3.0.2", - "simple-git": "^2.35.0", + "simple-git": "^3.5.0", "terminal-link": "^2.0.0", "yargs": "^17.3.0" } @@ -24136,12 +24189,6 @@ "type-fest": "^0.8.1" } }, - "prettier": { - "version": "npm:wp-prettier@2.2.1-beta-1", - "resolved": "https://registry.npmjs.org/wp-prettier/-/wp-prettier-2.2.1-beta-1.tgz", - "integrity": "sha512-+JHkqs9LC/JPp51yy1hzs3lQ7qeuWCwOcSzpQNeeY/G7oSpnF61vxt7hRh87zNRTr6ob2ndy0W8rVzhgrcA+Gw==", - "dev": true - }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -24253,8 +24300,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/@wordpress/npm-package-json-lint-config/-/npm-package-json-lint-config-4.1.1.tgz", "integrity": "sha512-Kuyge30wO3qceDTg3PRrF/lPP4h4f7gwJMTkFFv68Ouvv6HBPubjfAVHtrtFOaFkxMnt91oqOXLAL1y7j95L4w==", - "dev": true, - "requires": {} + "dev": true }, "@wordpress/postcss-plugins-preset": { "version": "3.3.1", @@ -24434,15 +24480,13 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true, - "requires": {} + "dev": true }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} + "dev": true }, "acorn-walk": { "version": "7.2.0", @@ -24502,8 +24546,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true, - "requires": {} + "dev": true }, "ajv-formats": { "version": "2.1.1", @@ -24538,8 +24581,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "ansi-colors": { "version": "4.1.1", @@ -24746,9 +24788,9 @@ "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", + "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "dev": true, "requires": { "lodash": "^4.17.14" @@ -25288,9 +25330,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001312", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz", - "integrity": "sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==", + "version": "1.0.30001388", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz", + "integrity": "sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ==", "dev": true }, "capture-exit": { @@ -26198,8 +26240,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.2.tgz", "integrity": "sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ==", - "dev": true, - "requires": {} + "dev": true }, "csso": { "version": "4.2.0", @@ -26480,8 +26521,7 @@ "version": "0.12.2", "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-0.12.2.tgz", "integrity": "sha512-gn+rVJ2JnvUWhBshbZ/8dkJdANaEB96zgtAEClJ7vNvDgmqAYb+HhQpW0GM04EqtIiPhenqUeKNQDoqrquY5+w==", - "dev": true, - "requires": {} + "dev": true }, "damerau-levenshtein": { "version": "1.0.8", @@ -27322,8 +27362,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz", "integrity": "sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==", - "dev": true, - "requires": {} + "dev": true }, "eslint-import-resolver-node": { "version": "0.3.6", @@ -27542,8 +27581,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz", "integrity": "sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA==", - "dev": true, - "requires": {} + "dev": true }, "eslint-scope": { "version": "5.1.1", @@ -28871,8 +28909,7 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "requires": {} + "dev": true }, "ieee754": { "version": "1.2.1", @@ -29993,8 +30030,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", - "dev": true, - "requires": {} + "dev": true }, "jest-regex-util": { "version": "26.0.0", @@ -31495,9 +31531,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "minimist-options": { @@ -32489,29 +32525,25 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz", "integrity": "sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q==", - "dev": true, - "requires": {} + "dev": true }, "postcss-discard-duplicates": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz", "integrity": "sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-discard-empty": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz", "integrity": "sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA==", - "dev": true, - "requires": {} + "dev": true }, "postcss-discard-overridden": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz", "integrity": "sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg==", - "dev": true, - "requires": {} + "dev": true }, "postcss-html": { "version": "0.36.0", @@ -32685,8 +32717,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true, - "requires": {} + "dev": true }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -32721,8 +32752,7 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz", "integrity": "sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA==", - "dev": true, - "requires": {} + "dev": true }, "postcss-normalize-display-values": { "version": "5.0.3", @@ -33018,8 +33048,7 @@ "version": "0.36.2", "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz", "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==", - "dev": true, - "requires": {} + "dev": true }, "postcss-unique-selectors": { "version": "5.0.4", @@ -33230,8 +33259,7 @@ "version": "7.4.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -33370,8 +33398,7 @@ "react-resize-aware": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/react-resize-aware/-/react-resize-aware-3.1.1.tgz", - "integrity": "sha512-M8IyVLBN8D6tEUss+bxQlWte3ZYtNEGhg7rBxtCVG8yEBjUlZwUo5EFLq6tnvTZXcgAbCLjsQn+NCoTJKumRYg==", - "requires": {} + "integrity": "sha512-M8IyVLBN8D6tEUss+bxQlWte3ZYtNEGhg7rBxtCVG8yEBjUlZwUo5EFLq6tnvTZXcgAbCLjsQn+NCoTJKumRYg==" }, "react-router": { "version": "6.2.1", @@ -33423,8 +33450,7 @@ "react-universal-interface": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz", - "integrity": "sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==", - "requires": {} + "integrity": "sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==" }, "react-use": { "version": "17.3.2", @@ -34271,20 +34297,20 @@ "dev": true }, "simple-git": { - "version": "2.48.0", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz", - "integrity": "sha512-z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A==", + "version": "3.13.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.13.0.tgz", + "integrity": "sha512-VYrs3joeHvWGcN3K135RpGpPjm4AHYeOrclwew6LlfHgq6ozQYIW2yMnmjf4PCgVOuSYCbXkdUjyiFawuJz8MA==", "dev": true, "requires": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1", - "debug": "^4.3.2" + "debug": "^4.3.4" }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" @@ -35129,8 +35155,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz", "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==", - "dev": true, - "requires": {} + "dev": true }, "stylelint-config-recommended-scss": { "version": "4.3.0", @@ -35145,8 +35170,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz", "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==", - "dev": true, - "requires": {} + "dev": true } } }, @@ -35401,20 +35425,21 @@ } }, "terser": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.10.0.tgz", - "integrity": "sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.7.2", "source-map-support": "~0.5.20" }, "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true } } @@ -36006,8 +36031,7 @@ "use-memo-one": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.2.tgz", - "integrity": "sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ==", - "requires": {} + "integrity": "sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ==" }, "util-deprecate": { "version": "1.0.2", @@ -36631,8 +36655,7 @@ "version": "7.5.7", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==", - "dev": true, - "requires": {} + "dev": true }, "xml-name-validator": { "version": "3.0.0", diff --git a/src/app/components/header/stylesheet.scss b/src/app/components/header/stylesheet.scss index 2edc5ec..2cf6322 100644 --- a/src/app/components/header/stylesheet.scss +++ b/src/app/components/header/stylesheet.scss @@ -98,10 +98,8 @@ .wppw-page { - // home and default blue applied in .wppw-nav - &-marketplace-plugins, - &-marketplace-themes, - &-marketplace-services { + // marketplace and default blue applied in .wppw-nav + &-home { .wppw-nav { background-color: var(--mdc-theme-secondary); } @@ -122,9 +120,7 @@ } } /* Black Links */ - &-marketplace-plugins, - &-marketplace-themes, - &-marketplace-services, + &-home, &-performance { .wppw-nav-large { .wppw-nav-large__link { diff --git a/src/app/pages/marketplace/index.js b/src/app/pages/marketplace/index.js index fd25f36..a3b9606 100644 --- a/src/app/pages/marketplace/index.js +++ b/src/app/pages/marketplace/index.js @@ -4,7 +4,7 @@ import './stylesheet.scss'; import apiFetch from '@wordpress/api-fetch'; import classnames from 'classnames'; import { useState } from '@wordpress/element'; -// import { useLocation } from 'react-router-dom'; +import { useLocation, useNavigate } from 'react-router-dom'; import { useEffect } from 'react'; import { Button, @@ -39,9 +39,8 @@ const MarketplacePage = () => { classnames, useState, useEffect, - // module doesn't yet support these - // useNavigate, - // useLocation + useNavigate, + useLocation }; // constants to pass to module const moduleConstants = { diff --git a/tests/cypress/integration/marketplace.spec.js b/tests/cypress/integration/marketplace.spec.js index c0d5f6d..b4bbf6b 100644 --- a/tests/cypress/integration/marketplace.spec.js +++ b/tests/cypress/integration/marketplace.spec.js @@ -42,7 +42,7 @@ describe('Marketplace Page', function () { .contains('Web Design Services') .should('be.visible'); cy.get('.components-card__media').should('be.visible'); - cy.get('.components-card__header em.price').should('not.exist'); + cy.get('.components-card__header .price').should('not.exist'); }); }); @@ -61,7 +61,7 @@ describe('Marketplace Page', function () { .contains('Highend') .should('be.visible'); cy.get('.components-card__media').should('be.visible'); - cy.get('.components-card__header em.price') + cy.get('.components-card__header .price') .contains('$59.00') .should('be.visible'); }); @@ -97,19 +97,26 @@ describe('Marketplace Page', function () { cy.findByRole('tab', { name: 'Services' } ).click(); cy.get('.marketplace-item').should('have.length', 5); - cy.get('#marketplace-item-1fc92f8a-bb9f-47c8-9808-aab9c82d6bf2 h3') + cy.get('#marketplace-item-1fc92f8a-bb9f-47c8-9808-aab9c82d6bf2 h2') .scrollIntoView() .should('be.visible') .should('have.text', 'Web Design Services'); cy.findByRole('tab', { name: 'SEO' } ).click(); cy.get('.marketplace-item').should('have.length', 3); - cy.get('#marketplace-item-7beee5ae-2e91-4282-9930-15ada43fc738 h3') + cy.get('#marketplace-item-7beee5ae-2e91-4282-9930-15ada43fc738 h2') .scrollIntoView() .should('be.visible') .should('have.text', 'Yoast Premium'); }); + it('Category tabs update path', () => { + cy.findByRole('tab', {name: 'Services'}).click(); + cy.location().should((loc) => { + expect(loc.hash).to.eq('#/marketplace/services') + }); + }); + // CTB Not supported yet it.skip('Product CTB cards render correctly', () => { cy.get('.marketplace-item-ec14a614-8672-4094-8310-cb0b1eb0f176').as('card'); diff --git a/wp-plugin-web.php b/wp-plugin-web.php index d412cf1..effde68 100644 --- a/wp-plugin-web.php +++ b/wp-plugin-web.php @@ -55,7 +55,7 @@ $plugin_check->check_plugin_requirements(); } -// Check NFD plugin incompaatibilities +// Check NFD plugin incompatibilities require_once WEB_PLUGIN_DIR . '/inc/plugin-nfd-compat-check.php'; $nfd_plugins_check = new NFD_Plugin_Compat_Check( WEB_PLUGIN_FILE ); $nfd_plugins_check->legacy_plugins = array( From eaf656ee2f1ac4be53b128eba06cd2fc86e04277 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Fri, 2 Sep 2022 13:09:29 -0400 Subject: [PATCH 3/6] version bump to 1.2.1 --- package.json | 2 +- wp-plugin-web.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0593763..48b7c93 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "wp-plugin-web", "description": "WordPress plugin that integrates your WordPress site with the Web.com control panel, including performance, security, and update features.", "license": "GPL-2.0-or-later", - "version": "1.2.0", + "version": "1.2.1", "private": true, "author": { "name": "Evan Mullins", diff --git a/wp-plugin-web.php b/wp-plugin-web.php index effde68..a758de0 100644 --- a/wp-plugin-web.php +++ b/wp-plugin-web.php @@ -11,7 +11,7 @@ * Plugin Name: Web.com * Plugin URI: https://web.com * Description: WordPress plugin that integrates a WordPress site with the Web.com control panel, including performance, security, and update features. - * Version: 1.2.0 + * Version: 1.2.1 * Requires at least: 4.7 * Requires PHP: 5.6 * Tested up to: 5.9 @@ -31,7 +31,7 @@ } // Define constants -define( 'WEB_PLUGIN_VERSION', '1.2.0' ); +define( 'WEB_PLUGIN_VERSION', '1.2.1' ); define( 'WEB_PLUGIN_FILE', __FILE__ ); define( 'WEB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'WEB_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); From c690d73eca3ec2946aa26c338da39c47ca297ac3 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 6 Sep 2022 17:38:22 -0400 Subject: [PATCH 4/6] set composer config to php7 --- composer.json | 4 ++ composer.lock | 115 +++++++++++++++++++------------------------------- 2 files changed, 48 insertions(+), 71 deletions(-) diff --git a/composer.json b/composer.json index 3b85e9c..7578a4b 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,9 @@ "config": { "optimize-autoloader": true, "sort-packages": true, + "platform": { + "php": "7.0.0" + }, "platform-check": false, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true @@ -55,6 +58,7 @@ "i18n": "Generate a .pot file for translation." }, "require": { + "doctrine/inflector": "1.2.0 as 1.3.1", "newfold-labs/wp-module-coming-soon": "^1.0.7", "newfold-labs/wp-module-data": "^2.0.0", "newfold-labs/wp-module-loader": "^1.0", diff --git a/composer.lock b/composer.lock index f4c623b..235e014 100644 --- a/composer.lock +++ b/composer.lock @@ -4,41 +4,36 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e7e6f8d38c9960d6d249128074c73aeb", + "content-hash": "05c663b9a0193d44ec19eefb3a57054d", "packages": [ { "name": "doctrine/inflector", - "version": "1.4.4", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9" + "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", - "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", + "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Inflector\\": "lib/Doctrine/Inflector", "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, @@ -47,10 +42,6 @@ "MIT" ], "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -59,6 +50,10 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -68,39 +63,18 @@ "email": "schmittjoh@gmail.com" } ], - "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", - "homepage": "https://www.doctrine-project.org/projects/inflector.html", + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", "keywords": [ "inflection", - "inflector", - "lowercase", - "manipulation", - "php", - "plural", - "singular", - "strings", - "uppercase", - "words" + "pluralize", + "singularize", + "string" ], "support": { - "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/1.4.4" + "source": "https://github.com/doctrine/inflector/tree/master" }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" - } - ], - "time": "2021-04-16T17:34:40+00:00" + "time": "2017-07-22T12:18:28+00:00" }, { "name": "newfold-labs/container", @@ -655,6 +629,7 @@ "issues": "https://github.com/wpscholar/collection/issues", "source": "https://github.com/wpscholar/collection/tree/1.0.1" }, + "abandoned": true, "time": "2022-03-22T10:54:37+00:00" }, { @@ -1412,25 +1387,27 @@ }, { "name": "symfony/finder", - "version": "v6.1.3", + "version": "v3.3.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709" + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709", - "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709", + "url": "https://api.github.com/repos/symfony/finder/zipball/baea7f66d30854ad32988c11a09d7ffd485810c4", + "reference": "baea7f66d30854ad32988c11a09d7ffd485810c4", "shasum": "" }, "require": { - "php": ">=8.1" - }, - "require-dev": { - "symfony/filesystem": "^6.0" + "php": ">=5.5.9" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.3-dev" + } + }, "autoload": { "psr-4": { "Symfony\\Component\\Finder\\": "" @@ -1453,26 +1430,12 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Finds files and directories via an intuitive fluent interface", + "description": "Symfony Finder Component", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.1.3" + "source": "https://github.com/symfony/finder/tree/3.3" }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-07-29T07:42:06+00:00" + "time": "2017-06-01T21:01:25+00:00" }, { "name": "wp-cli/i18n-command", @@ -1818,12 +1781,22 @@ "time": "2022-08-30T21:14:52+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "doctrine/inflector", + "version": "1.2.0.0", + "alias": "1.3.1", + "alias_normalized": "1.3.1.0" + } + ], "minimum-stability": "stable", "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], "platform-dev": [], + "platform-overrides": { + "php": "7.0.0" + }, "plugin-api-version": "2.3.0" } From 9bc58d8ed5138c8005bdf2d41f6fd3ad92fefcba Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 6 Sep 2022 19:46:28 -0400 Subject: [PATCH 5/6] sync workflows from latest bhp changes --- .../{cypress-tests.yml => cypress.yml} | 98 ++++++++----------- .github/workflows/lint-php.yml | 53 +++++++--- .github/workflows/satis-webhook.yml | 2 +- .github/workflows/upload-asset-on-release.yml | 37 ++++--- 4 files changed, 104 insertions(+), 86 deletions(-) rename .github/workflows/{cypress-tests.yml => cypress.yml} (62%) diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress.yml similarity index 62% rename from .github/workflows/cypress-tests.yml rename to .github/workflows/cypress.yml index 814d7e3..18e3b44 100644 --- a/.github/workflows/cypress-tests.yml +++ b/.github/workflows/cypress.yml @@ -1,8 +1,11 @@ name: Cypress Tests + on: push: branches: - main + - master + - trunk - develop - release/* - feature/* @@ -10,22 +13,30 @@ on: - update/* - fix/* - try/* - paths-ignore: - - '.github/**' - - '.gitignore' - - '**.md' pull_request: - types: [ opened, edited, synchronize, reopened, ready_for_review ] + types: [opened, edited, reopened, ready_for_review] + workflow_dispatch: + concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} cancel-in-progress: true + jobs: - tests: + test: + name: Run Cypress Tests runs-on: ubuntu-latest steps: - - name: Checkout repository + + - name: Checkout uses: actions/checkout@v2 + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.1' + coverage: none + tools: composer, cs2pr + - name: Setup workflow context id: workflow working-directory: ${{ runner.temp }} @@ -36,12 +47,23 @@ jobs: echo ::set-output name=DIST::${PWD}/dist echo ::set-output name=PACKAGE::${REPO##*/} - - name: Setup PHP - uses: shivammathur/setup-php@v2 + - name: Use Node.js 16.x + uses: actions/setup-node@v1 with: - php-version: '8.1' - coverage: none - tools: composer + node-version: 16.x + + - name: Get npm cache directory + id: npm-cache + run: echo "::set-output name=dir::$(npm config get cache)" + + - name: Cache node modules + uses: actions/cache@v2 + with: + path: ${{ steps.npm-cache.outputs.dir }} + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + - name: Get Composer cache directory id: composer-cache @@ -53,39 +75,22 @@ jobs: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | - ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + ${{ runner.os }}-composer- - - name: Setup Node - uses: actions/setup-node@v2 - with: - node-version: 16.x - - - name: Cache node modules - uses: actions/cache@v2 - env: - cache-name: cache-node-modules - with: - path: ~/.npm - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Log debug information + - name: Show versions run: | php --version composer --version node --version npm --version - - name: Validate composer.json and composer.lock files + - name: Validate composer.json and composer.lock run: composer validate - name: Install PHP Dependencies - run: composer install --no-progress --no-dev --optimize-autoloader + run: composer install --no-progress --no-dev --optimize-autoloader --prefer-dist - - name: Run NPM Install + - name: NPM Install run: npm install --legacy-peer-deps - name: Build JavaScript @@ -114,24 +119,7 @@ jobs: name: screenshots path: ./tests/cypress/screenshots - - name: Check if a debug.log file exists - id: hasErrors - run: npx wp-env run wordpress test ! -f /var/www/html/wp-content/debug.log - - - name: Copy debug.log file - if: ${{ steps.hasErrors.outputs.failure }} - run: cat /var/www/html/wp-content/debug.log 1>./debug.log 2>/dev/null - - - name: Store debug.log file - if: ${{ steps.hasErrors.outputs.failure }} - uses: actions/upload-artifact@v2 - with: - name: logs - path: ./debug.log - -# - name: Store a copy of the plugin on success -# if: ${{ success() }} -# uses: actions/upload-artifact@v1 -# with: -# name: ${{ steps.workflow.outputs.PACKAGE }} -# path: ${{ steps.workflow.outputs.DIST }} + - name: Output debug.log file contents + if: ${{ always() }} + continue-on-error: true + run: npx wp-env run wordpress "cat /var/www/html/wp-content/debug.log" diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 7e2dcf0..872ca9f 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -1,40 +1,63 @@ name: Lint PHP on: push: + branches: + - '**' paths: - '**.php' - pull_request: - types: [ opened, edited, reopened, ready_for_review ] - paths: - - '**.php' + pull_request: + types: [opened, edited, reopened, ready_for_review] + paths: + - '**.php' + workflow_dispatch: + concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} cancel-in-progress: true + jobs: - lint-php: + phpcs: + name: Run PHP Code Sniffer runs-on: ubuntu-latest steps: - - name: Checkout repository + + - name: Checkout uses: actions/checkout@v2 + # User PHP 7.4 here for compatibility with the WordPress codesniffer rules. - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: '7.4' coverage: none - tools: composer, phpcs + tools: composer, cs2pr - - name: Validate composer.json and composer.lock - run: composer validate + - uses: technote-space/get-diff-action@v6 + with: + SUFFIX_FILTER: .php - - name: Install PHP Dependencies - run: composer install --no-progress + - name: Get Composer cache directory + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" + if: "!! env.GIT_DIFF" - - name: Get changed files - uses: technote-space/get-diff-action@v3 + - name: Cache Composer vendor directory + uses: actions/cache@v2 with: - SUFFIX_FILTER: .php + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + if: "!! env.GIT_DIFF" + + - name: Validate composer.json and composer.lock + run: composer validate + if: "!! env.GIT_DIFF" + + - name: Install dependencies + run: composer install --no-progress --optimize-autoloader --prefer-dist + if: "!! env.GIT_DIFF" - name: Detecting PHP Code Standards Violations - run: vendor/bin/phpcs --colors -s ${{ env.GIT_DIFF }} + run: vendor/bin/phpcs --standard=phpcs.xml -s ${{ env.GIT_DIFF }} if: "!! env.GIT_DIFF" diff --git a/.github/workflows/satis-webhook.yml b/.github/workflows/satis-webhook.yml index eb36715..2d10d7b 100644 --- a/.github/workflows/satis-webhook.yml +++ b/.github/workflows/satis-webhook.yml @@ -26,7 +26,7 @@ jobs: with: token: ${{ secrets.WEBHOOK_TOKEN }} repository: newfold-labs/satis - event-type: 'satis-build' + event-type: 'Trigger Satis Build' client-payload: >- { "vendor": "${{ github.repository_owner }}", diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml index 30971ec..b00abc5 100644 --- a/.github/workflows/upload-asset-on-release.yml +++ b/.github/workflows/upload-asset-on-release.yml @@ -6,6 +6,13 @@ on: - created - updated +env: + VERSION: ${GITHUB_REF#refs/tags/*} + +concurrency: + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} + cancel-in-progress: true + jobs: build: name: On Release @@ -45,21 +52,12 @@ jobs: mkdir dist echo ::set-output name=DIST::${PWD}/dist echo ::set-output name=PACKAGE::${REPO##*/} - - name: PHP version - run: php --version - + - name: Set Node.js 16.x uses: actions/setup-node@v1 with: node-version: 16.x - - name: Show versions - run: | - php --version - composer --version - node --version - npm --version - - name: Get npm cache directory id: npm-cache run: echo "::set-output name=dir::$(npm config get cache)" @@ -71,11 +69,6 @@ jobs: key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-node- - - name: npm install - run: npm install --legacy-peer-deps - - - name: Validate composer.json and composer.lock - run: composer validate - name: Get Composer Cache Directory id: composer-cache @@ -88,9 +81,23 @@ jobs: key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | ${{ runner.os }}-composer- + + - name: Show versions + run: | + php --version + composer --version + node --version + npm --version + + - name: Validate composer.json and composer.lock + run: composer validate + - name: Install PHP Dependencies run: composer install --no-progress --no-dev --optimize-autoloader --prefer-dist + - name: npm install + run: npm install --legacy-peer-deps + - name: Build JavaScript run: npm run build From 61f63d904c0fc8597daf7a7fd93881214bbeeca7 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 6 Sep 2022 19:48:24 -0400 Subject: [PATCH 6/6] sync workflows from latest bhp changes --- .github/workflows/lint-php.yml | 2 +- .github/workflows/upload-artifact-on-push.yml | 41 +++++++++++-------- .github/workflows/upload-asset-on-release.yml | 2 +- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 872ca9f..f840a66 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -14,7 +14,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} cancel-in-progress: true - + jobs: phpcs: name: Run PHP Code Sniffer diff --git a/.github/workflows/upload-artifact-on-push.yml b/.github/workflows/upload-artifact-on-push.yml index 2a2a526..025abcf 100644 --- a/.github/workflows/upload-artifact-on-push.yml +++ b/.github/workflows/upload-artifact-on-push.yml @@ -1,9 +1,9 @@ name: Build Plugin - on: push: branches: - main + - master - develop - release/* - feature/* @@ -11,6 +11,11 @@ on: - update/* - fix/* - try/* + workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }} + cancel-in-progress: true + jobs: build: name: On Push @@ -27,7 +32,7 @@ jobs: coverage: none tools: composer, cs2pr - - name: Setup Workflow Context + - name: Setup workflow context id: workflow working-directory: ${{ runner.temp }} env: @@ -36,21 +41,12 @@ jobs: mkdir dist echo ::set-output name=DIST::${PWD}/dist echo ::set-output name=PACKAGE::${REPO##*/} - - name: PHP version - run: php --version - - name: Set Node.js 16.x + - name: Use Node.js 16.x uses: actions/setup-node@v1 with: node-version: 16.x - - name: Show versions - run: | - php --version - composer --version - node --version - npm --version - - name: Get npm cache directory id: npm-cache run: echo "::set-output name=dir::$(npm config get cache)" @@ -62,13 +58,8 @@ jobs: key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-node- - - name: npm install - run: npm install --legacy-peer-deps - - - name: Validate composer.json and composer.lock - run: composer validate - - name: Get Composer Cache Directory + - name: Get Composer cache directory id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" @@ -79,9 +70,23 @@ jobs: key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: | ${{ runner.os }}-composer- + + - name: Show versions + run: | + php --version + composer --version + node --version + npm --version + + - name: Validate composer.json and composer.lock + run: composer validate + - name: Install PHP Dependencies run: composer install --no-progress --no-dev --optimize-autoloader --prefer-dist + - name: NPM Install + run: npm install --legacy-peer-deps + - name: Build JavaScript run: npm run build diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml index b00abc5..c5b62bb 100644 --- a/.github/workflows/upload-asset-on-release.yml +++ b/.github/workflows/upload-asset-on-release.yml @@ -52,7 +52,7 @@ jobs: mkdir dist echo ::set-output name=DIST::${PWD}/dist echo ::set-output name=PACKAGE::${REPO##*/} - + - name: Set Node.js 16.x uses: actions/setup-node@v1 with: