From e5c4c3e7289caf7ef06d2ad981bd059f4a5b565a Mon Sep 17 00:00:00 2001 From: Steel Wagstaff Date: Fri, 4 Mar 2022 11:49:23 -0800 Subject: [PATCH 01/16] Automatically update translations (#990) * Update update-translations.yml * Update update-pot.yml update git auto commit action version --- .github/workflows/update-pot.yml | 2 +- .github/workflows/update-translations.yml | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update-pot.yml b/.github/workflows/update-pot.yml index 9643921a1..0cdd430d0 100644 --- a/.github/workflows/update-pot.yml +++ b/.github/workflows/update-pot.yml @@ -29,7 +29,7 @@ jobs: - name: Update POT file run: wp pb make-pot . languages/pressbooks-book.pot --require=vendor/autoload.php --domain=pressbooks-book --slug=pressbooks-book --package-name="McLuhan" --headers="{\"Report-Msgid-Bugs-To\":\"https://github.com/pressbooks/pressbooks-book/issues\"}" - name: Commit updated POT file - uses: stefanzweifel/git-auto-commit-action@v4.1.1 + uses: stefanzweifel/git-auto-commit-action@v4.13.1 with: commit_message: 'chore(l10n): update languages/pressbooks-book.pot' file_pattern: '*.pot' diff --git a/.github/workflows/update-translations.yml b/.github/workflows/update-translations.yml index 8ea8a892c..7c4cd215e 100644 --- a/.github/workflows/update-translations.yml +++ b/.github/workflows/update-translations.yml @@ -7,6 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + token: ${{ secrets.PAT_FOR_GITHUB_ACTIONS }} - name: Install Transifex Client run: sudo pip install transifex-client - name: Pull translations from Transifex @@ -17,13 +19,8 @@ jobs: run: sudo apt-get install -y gettext - name: Generate MO files run: for file in languages/*.po ; do msgfmt $file -o `echo $file | sed 's/\(.*\.\)po/\1mo/'` ; done - # Remove the next four lines and uncomment the last six lines once the process has been confirmed to work as desired. - - uses: actions/upload-artifact@v2 + - name: Commit updated translation files + uses: stefanzweifel/git-auto-commit-action@v4.13.1 with: - name: pressbooks-book-languages - path: languages/ - # - name: Commit updated translation files - # uses: stefanzweifel/git-auto-commit-action@v4.1.1 - # with: - # commit_message: 'chore(l10n): update translations' - # file_pattern: *.mo *.po + commit_message: 'chore(l10n): update translations' + file_pattern: '*.mo *.po' From 7fd0372a8f4108eaea59ed5dd01b465530930af4 Mon Sep 17 00:00:00 2001 From: Ho Man Chan Date: Tue, 22 Mar 2022 11:31:55 -0400 Subject: [PATCH 02/16] Update version to next minor dev (#984) * Update version to next minor dev --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 2d60c015f..b1c0eebd4 100644 --- a/style.css +++ b/style.css @@ -6,7 +6,7 @@ Tags: Academic, Literary, Nonfiction, Textbook Author: Pressbooks (Book Oven Inc.) Author URI: https://pressbooks.com Copyright: 2011-2021 Pressbooks (Book Oven Inc.) -Version: 2.17.0 +Version: 2.18.0-dev Text Domain: pressbooks-book License: GPL v3.0 or later GitHub Theme URI: pressbooks/pressbooks-book From ebace38988aed4508d4dd87137457728523f4113 Mon Sep 17 00:00:00 2001 From: SteelWagstaff Date: Mon, 4 Apr 2022 17:00:47 -0700 Subject: [PATCH 03/16] Add support for Noto Sans Cherokee fonts and bold variants for Adlam and Canadian Aboriginal --- .../typography/styles/_NotoSansAdlamFont.scss | 7 +++++++ .../styles/_NotoSansCanadianAboriginalFont.scss | 7 +++++++ .../typography/styles/_NotoSansCherokeeFont.scss | 15 +++++++++++++++ assets/book/typography/styles/_fonts-chr.scss | 16 ++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 assets/book/typography/styles/_NotoSansCherokeeFont.scss create mode 100644 assets/book/typography/styles/_fonts-chr.scss diff --git a/assets/book/typography/styles/_NotoSansAdlamFont.scss b/assets/book/typography/styles/_NotoSansAdlamFont.scss index 504bb9ff1..7e2d4210d 100644 --- a/assets/book/typography/styles/_NotoSansAdlamFont.scss +++ b/assets/book/typography/styles/_NotoSansAdlamFont.scss @@ -6,3 +6,10 @@ font-weight: normal; src: url('uploads/assets/fonts/NotoSansAdlam-Regular.ttf') format('truetype'); } + +@font-face { + font-family: 'Noto Sans Adlam'; + font-style: normal; + font-weight: bold; + src: url('uploads/assets/fonts/NotoSansAdlam-Bold.ttf') format('truetype'); +} diff --git a/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss b/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss index 9e9213ec2..8b34db26a 100644 --- a/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss +++ b/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss @@ -11,3 +11,10 @@ font-weight: 400; src: url('uploads/assets/fonts/NotoSansCanadianAboriginal-Regular.ttf') format('truetype'); } + +@font-face { + font-family: 'Noto Sans Canadian Aboriginal'; + font-style: normal; + font-weight: bold; + src: url('uploads/assets/fonts/NotoSansCanadianAboriginal-Bold.ttf') format('truetype'); +} diff --git a/assets/book/typography/styles/_NotoSansCherokeeFont.scss b/assets/book/typography/styles/_NotoSansCherokeeFont.scss new file mode 100644 index 000000000..675bb9d5a --- /dev/null +++ b/assets/book/typography/styles/_NotoSansCherokeeFont.scss @@ -0,0 +1,15 @@ +// 'Noto Sans Cherokee', @import 'NotoSansCherokeeFont' + +@font-face { + font-family: 'Noto Sans Cherokee'; + font-style: normal; + font-weight: normal; + src: url('uploads/assets/fonts/NotoSansCherokee-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Noto Sans Cherokee'; + font-style: normal; + font-weight: bold; + src: url('uploads/assets/fonts/NotoSansCherokee-Bold.ttf') format('truetype'); +} diff --git a/assets/book/typography/styles/_fonts-chr.scss b/assets/book/typography/styles/_fonts-chr.scss new file mode 100644 index 000000000..73d8beaa7 --- /dev/null +++ b/assets/book/typography/styles/_fonts-chr.scss @@ -0,0 +1,16 @@ +// NOTO CHEROKEE +// CHEROKEE FONT SANS + +@import 'NotoSansCherokeeFont'; + +// Sans-serif stack name + +$sans-serif-epub-chr: 'Noto Sans Cherokee'; +$sans-serif-prince-chr: 'Noto Sans Cherokee'; +$sans-serif-web-chr: 'Noto Sans Cherokee'; + +// Serif stack name + +$serif-epub-chr: 'Noto Sans Cherokee'; +$serif-prince-chr: 'Noto Sans Cherokee'; +$serif-web-chr: 'Noto Sans Cherokee'; From 4a480ef14f0f1d1e57aab4eba1d00408e90f40a9 Mon Sep 17 00:00:00 2001 From: SteelWagstaff Date: Mon, 4 Apr 2022 17:30:39 -0700 Subject: [PATCH 04/16] Revert "Add support for Noto Sans Cherokee fonts and bold variants for Adlam and Canadian Aboriginal" This reverts commit ebace38988aed4508d4dd87137457728523f4113. --- .../typography/styles/_NotoSansAdlamFont.scss | 7 ------- .../styles/_NotoSansCanadianAboriginalFont.scss | 7 ------- .../typography/styles/_NotoSansCherokeeFont.scss | 15 --------------- assets/book/typography/styles/_fonts-chr.scss | 16 ---------------- 4 files changed, 45 deletions(-) delete mode 100644 assets/book/typography/styles/_NotoSansCherokeeFont.scss delete mode 100644 assets/book/typography/styles/_fonts-chr.scss diff --git a/assets/book/typography/styles/_NotoSansAdlamFont.scss b/assets/book/typography/styles/_NotoSansAdlamFont.scss index 7e2d4210d..504bb9ff1 100644 --- a/assets/book/typography/styles/_NotoSansAdlamFont.scss +++ b/assets/book/typography/styles/_NotoSansAdlamFont.scss @@ -6,10 +6,3 @@ font-weight: normal; src: url('uploads/assets/fonts/NotoSansAdlam-Regular.ttf') format('truetype'); } - -@font-face { - font-family: 'Noto Sans Adlam'; - font-style: normal; - font-weight: bold; - src: url('uploads/assets/fonts/NotoSansAdlam-Bold.ttf') format('truetype'); -} diff --git a/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss b/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss index 8b34db26a..9e9213ec2 100644 --- a/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss +++ b/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss @@ -11,10 +11,3 @@ font-weight: 400; src: url('uploads/assets/fonts/NotoSansCanadianAboriginal-Regular.ttf') format('truetype'); } - -@font-face { - font-family: 'Noto Sans Canadian Aboriginal'; - font-style: normal; - font-weight: bold; - src: url('uploads/assets/fonts/NotoSansCanadianAboriginal-Bold.ttf') format('truetype'); -} diff --git a/assets/book/typography/styles/_NotoSansCherokeeFont.scss b/assets/book/typography/styles/_NotoSansCherokeeFont.scss deleted file mode 100644 index 675bb9d5a..000000000 --- a/assets/book/typography/styles/_NotoSansCherokeeFont.scss +++ /dev/null @@ -1,15 +0,0 @@ -// 'Noto Sans Cherokee', @import 'NotoSansCherokeeFont' - -@font-face { - font-family: 'Noto Sans Cherokee'; - font-style: normal; - font-weight: normal; - src: url('uploads/assets/fonts/NotoSansCherokee-Regular.ttf') format('truetype'); -} - -@font-face { - font-family: 'Noto Sans Cherokee'; - font-style: normal; - font-weight: bold; - src: url('uploads/assets/fonts/NotoSansCherokee-Bold.ttf') format('truetype'); -} diff --git a/assets/book/typography/styles/_fonts-chr.scss b/assets/book/typography/styles/_fonts-chr.scss deleted file mode 100644 index 73d8beaa7..000000000 --- a/assets/book/typography/styles/_fonts-chr.scss +++ /dev/null @@ -1,16 +0,0 @@ -// NOTO CHEROKEE -// CHEROKEE FONT SANS - -@import 'NotoSansCherokeeFont'; - -// Sans-serif stack name - -$sans-serif-epub-chr: 'Noto Sans Cherokee'; -$sans-serif-prince-chr: 'Noto Sans Cherokee'; -$sans-serif-web-chr: 'Noto Sans Cherokee'; - -// Serif stack name - -$serif-epub-chr: 'Noto Sans Cherokee'; -$serif-prince-chr: 'Noto Sans Cherokee'; -$serif-web-chr: 'Noto Sans Cherokee'; From 7daeff8c258d67fdf36a4ecae7b31379817b2231 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:28:06 -0700 Subject: [PATCH 05/16] Bump puppeteer from 13.1.2 to 13.5.2 (#999) Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 13.1.2 to 13.5.2. - [Release notes](https://github.com/puppeteer/puppeteer/releases) - [Changelog](https://github.com/puppeteer/puppeteer/blob/main/CHANGELOG.md) - [Commits](https://github.com/puppeteer/puppeteer/compare/v13.1.2...v13.5.2) --- updated-dependencies: - dependency-name: puppeteer dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/buckram/package-lock.json | 59 +++++++++++++++++------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/packages/buckram/package-lock.json b/packages/buckram/package-lock.json index d216ba460..5354ff04c 100644 --- a/packages/buckram/package-lock.json +++ b/packages/buckram/package-lock.json @@ -4478,9 +4478,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" @@ -7127,6 +7127,15 @@ } } }, + "cross-fetch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", + "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", + "dev": true, + "requires": { + "node-fetch": "2.6.7" + } + }, "cross-spawn": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", @@ -7732,9 +7741,9 @@ "dev": true }, "devtools-protocol": { - "version": "0.0.948846", - "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.948846.tgz", - "integrity": "sha512-5fGyt9xmMqUl2VI7+rnUkKCiAQIpLns8sfQtTENy5L70ktbNw0Z3TFJ1JoFNYdx/jffz4YXU45VF75wKZD7sZQ==", + "version": "0.0.969999", + "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.969999.tgz", + "integrity": "sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==", "dev": true }, "diagnostics": { @@ -9260,9 +9269,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" @@ -10632,9 +10641,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" @@ -16550,29 +16559,29 @@ } }, "puppeteer": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.1.2.tgz", - "integrity": "sha512-ozVM8Tdg0patMtm/xAr3Uh7rQ28vBpbTHLP+ECmoAxG/s4PKrVLN764H/poLux7Ln77jHThOd8OBJj5mTuA6Iw==", + "version": "13.5.2", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-13.5.2.tgz", + "integrity": "sha512-DJAyXODBikZ3xPs8C35CtExEw78LZR9RyelGDAs0tX1dERv3OfW7qpQ9VPBgsfz+hG2HiMTO/Tyf7BuMVWsrxg==", "dev": true, "requires": { - "debug": "4.3.2", - "devtools-protocol": "0.0.948846", + "cross-fetch": "3.1.5", + "debug": "4.3.4", + "devtools-protocol": "0.0.969999", "extract-zip": "2.0.1", "https-proxy-agent": "5.0.0", - "node-fetch": "2.6.7", "pkg-dir": "4.2.0", "progress": "2.0.3", "proxy-from-env": "1.1.0", "rimraf": "3.0.2", "tar-fs": "2.1.1", "unbzip2-stream": "1.4.3", - "ws": "8.2.3" + "ws": "8.5.0" }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "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" @@ -22494,9 +22503,9 @@ } }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", + "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "dev": true }, "x-is-string": { From 59968b7645feb4437781c01a0ad4123a97956703 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:28:31 -0700 Subject: [PATCH 06/16] Bump mocha from 9.2.0 to 9.2.2 (#996) Bumps [mocha](https://github.com/mochajs/mocha) from 9.2.0 to 9.2.2. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v9.2.0...v9.2.2) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/buckram/package-lock.json | 36 +++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/packages/buckram/package-lock.json b/packages/buckram/package-lock.json index 5354ff04c..a7e9b20c3 100644 --- a/packages/buckram/package-lock.json +++ b/packages/buckram/package-lock.json @@ -13441,9 +13441,9 @@ "dev": true }, "mocha": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.0.tgz", - "integrity": "sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz", + "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==", "dev": true, "requires": { "@ungap/promise-all-settled": "1.1.2", @@ -13459,9 +13459,9 @@ "he": "1.2.0", "js-yaml": "4.1.0", "log-symbols": "4.1.0", - "minimatch": "3.0.4", + "minimatch": "4.2.1", "ms": "2.1.3", - "nanoid": "3.2.0", + "nanoid": "3.3.1", "serialize-javascript": "6.0.0", "strip-json-comments": "3.1.1", "supports-color": "8.1.1", @@ -13608,6 +13608,17 @@ "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } } }, "glob-parent": { @@ -13668,12 +13679,27 @@ "is-unicode-supported": "^0.1.0" } }, + "minimatch": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz", + "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, + "nanoid": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", + "dev": true + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", From 2e5cc534ce58ab5c8a2cc532683690db17d33acf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:49:27 -0700 Subject: [PATCH 07/16] Bump follow-redirects from 1.14.7 to 1.14.8 (#975) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- packages/aetna/package-lock.json | 6 +++--- packages/buckram/package-lock.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 226294884..6171ae34a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9001,9 +9001,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "dev": true }, "for-in": { diff --git a/packages/aetna/package-lock.json b/packages/aetna/package-lock.json index 3f68a1017..eee3bcc83 100644 --- a/packages/aetna/package-lock.json +++ b/packages/aetna/package-lock.json @@ -7018,9 +7018,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" }, "for-in": { "version": "1.0.2", diff --git a/packages/buckram/package-lock.json b/packages/buckram/package-lock.json index a7e9b20c3..0682799ea 100644 --- a/packages/buckram/package-lock.json +++ b/packages/buckram/package-lock.json @@ -9709,9 +9709,9 @@ } }, "follow-redirects": { - "version": "1.14.7", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", - "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", + "version": "1.14.8", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", + "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", "dev": true }, "for-in": { From cc99f8863e03001e079ff03a7d93bb2c485dfea7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:50:29 -0700 Subject: [PATCH 08/16] Bump ajv from 6.10.2 to 6.12.6 (#969) Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.10.2 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](https://github.com/ajv-validator/ajv/compare/v6.10.2...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 208 ++++++---------------------------------------- 1 file changed, 27 insertions(+), 181 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6171ae34a..6ad416d59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1161,18 +1161,6 @@ "strip-json-comments": "^3.1.1" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -1185,8 +1173,7 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "globals": { "version": "13.10.0", @@ -3820,15 +3807,23 @@ } }, "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" + }, + "dependencies": { + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + } } }, "ajv-keywords": { @@ -6510,23 +6505,10 @@ "semver": "^7.3.5" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "loader-utils": { "version": "2.0.0", @@ -8706,12 +8688,6 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, "fast-glob": { "version": "3.2.7", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", @@ -8789,23 +8765,10 @@ "schema-utils": "^3.0.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "loader-utils": { "version": "2.0.0", @@ -9629,23 +9592,10 @@ "har-schema": "^2.0.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" } } }, @@ -9831,23 +9781,10 @@ "schema-utils": "^3.0.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "loader-utils": { "version": "2.0.0", @@ -12700,23 +12637,10 @@ "webpack-sources": "^1.1.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "loader-utils": { "version": "2.0.0", @@ -17085,23 +17009,10 @@ "ajv-keywords": "^3.5.2" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" } } }, @@ -18113,23 +18024,10 @@ "schema-utils": "^3.0.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "loader-utils": { "version": "2.0.0", @@ -19201,9 +19099,9 @@ }, "dependencies": { "ajv": { - "version": "8.6.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.1.tgz", - "integrity": "sha512-42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz", + "integrity": "sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -19423,23 +19321,10 @@ "terser": "^5.7.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "p-limit": { "version": "3.1.0", @@ -20257,23 +20142,10 @@ "integrity": "sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==", "dev": true }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "glob-to-regexp": { "version": "0.4.1", @@ -20548,23 +20420,10 @@ "schema-utils": "^3.0.0" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "mime-db": { "version": "1.48.0", @@ -20629,18 +20488,6 @@ "ws": "^7.4.5" }, "dependencies": { - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", @@ -20650,8 +20497,7 @@ "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "graceful-fs": { "version": "4.2.6", From 40402dab36c148d15fc9d06d45695aa404751a20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:51:51 -0700 Subject: [PATCH 09/16] Bump @frctl/fractal from 1.5.12 to 1.5.13 (#958) Bumps [@frctl/fractal](https://github.com/frctl/fractal/tree/HEAD/packages/fractal) from 1.5.12 to 1.5.13. - [Release notes](https://github.com/frctl/fractal/releases) - [Changelog](https://github.com/frctl/fractal/blob/main/packages/fractal/CHANGELOG.md) - [Commits](https://github.com/frctl/fractal/commits/@frctl/fractal@1.5.13/packages/fractal) --- updated-dependencies: - dependency-name: "@frctl/fractal" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/aetna/package-lock.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/aetna/package-lock.json b/packages/aetna/package-lock.json index eee3bcc83..7064e95f6 100644 --- a/packages/aetna/package-lock.json +++ b/packages/aetna/package-lock.json @@ -1391,13 +1391,13 @@ } }, "@frctl/fractal": { - "version": "1.5.12", - "resolved": "https://registry.npmjs.org/@frctl/fractal/-/fractal-1.5.12.tgz", - "integrity": "sha512-26ZZVWmSIQgE6vJ0khHx9xt7bOhp2QCd7TYaWTfBb+5aAX5e6cn1rqf26FlgQeplJWED9UbfYWGx0OG/rmWnbQ==", + "version": "1.5.13", + "resolved": "https://registry.npmjs.org/@frctl/fractal/-/fractal-1.5.13.tgz", + "integrity": "sha512-l03zpqVgH//DS42pVLunXvmcmqGilc8gceUz0BE9hFtQV4uWK0eqaWd661y//Q8nKtYXOKCW0NyRQuKbJ8J2Ew==", "requires": { "@frctl/core": "^0.3.4", "@frctl/handlebars": "^1.2.14", - "@frctl/mandelbrot": "^1.10.0", + "@frctl/mandelbrot": "^1.10.1", "@frctl/web": "^0.1.11", "anymatch": "^3.1.2", "bluebird": "^3.7.2", @@ -1518,9 +1518,9 @@ } }, "@frctl/mandelbrot": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@frctl/mandelbrot/-/mandelbrot-1.10.0.tgz", - "integrity": "sha512-VJiqgJWcbKRAAt+daYoDtGSLuzFmlST2Az3lGvZW0cCCvMTtX0DEwCxVOtpq4y0XGQEqtccVVSoSKO42c9rMIg==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@frctl/mandelbrot/-/mandelbrot-1.10.1.tgz", + "integrity": "sha512-wyYvktvIw7fIW1fQkAbKmGbAHunAyR6xpjegM+DyzF/33M09ARnJRlCLNsMYLmJysAdcqdV/h0UzlDI0rTLPEg==", "requires": { "js-beautify": "^1.13.13", "lodash": "^4.17.21" From 14a7dd8ec9a4a9041ea28f186ee8b1b6e4c35fe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:52:13 -0700 Subject: [PATCH 10/16] Bump mout from 1.1.0 to 1.2.3 in /packages/buckram (#963) Bumps [mout](https://github.com/mout/mout) from 1.1.0 to 1.2.3. - [Release notes](https://github.com/mout/mout/releases) - [Changelog](https://github.com/mout/mout/blob/master/CHANGELOG.md) - [Commits](https://github.com/mout/mout/compare/v1.1.0...v1.2.3) --- updated-dependencies: - dependency-name: mout dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/buckram/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/buckram/package-lock.json b/packages/buckram/package-lock.json index 0682799ea..cb7e00b3d 100644 --- a/packages/buckram/package-lock.json +++ b/packages/buckram/package-lock.json @@ -13798,9 +13798,9 @@ } }, "mout": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mout/-/mout-1.1.0.tgz", - "integrity": "sha512-XsP0vf4As6BfqglxZqbqQ8SR6KQot2AgxvR0gG+WtUkf90vUXchMOZQtPf/Hml1rEffJupqL/tIrU6EYhsUQjw==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/mout/-/mout-1.2.3.tgz", + "integrity": "sha512-vtE+eZcSj/sBkIp6gxB87MznryWP+gHIp0XX9SKrzA5TAkvz6y7VTuNruBjYdJozd8NY5i9XVIsn8cn3SwNjzg==", "dev": true }, "ms": { From 96c2e8e134c1e9eef6d14ec01cf9aa8adbd3238a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Apr 2022 19:52:33 -0700 Subject: [PATCH 11/16] Bump urijs from 1.19.7 to 1.19.10 in /packages/buckram (#993) Bumps [urijs](https://github.com/medialize/URI.js) from 1.19.7 to 1.19.10. - [Release notes](https://github.com/medialize/URI.js/releases) - [Changelog](https://github.com/medialize/URI.js/blob/gh-pages/CHANGELOG.md) - [Commits](https://github.com/medialize/URI.js/compare/v1.19.7...v1.19.10) --- updated-dependencies: - dependency-name: urijs dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/buckram/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/buckram/package-lock.json b/packages/buckram/package-lock.json index cb7e00b3d..dfed04426 100644 --- a/packages/buckram/package-lock.json +++ b/packages/buckram/package-lock.json @@ -21016,9 +21016,9 @@ } }, "urijs": { - "version": "1.19.7", - "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.7.tgz", - "integrity": "sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==", + "version": "1.19.10", + "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.10.tgz", + "integrity": "sha512-EzauQlgKuJgsXOqoMrCiePBf4At5jVqRhXykF3Wfb8ZsOBMxPcfiVBcsHXug4Aepb/ICm2PIgqAUGMelgdrWEg==", "dev": true }, "url": { From 98c65bf67f3764af1b271731c4851c73dc7426cc Mon Sep 17 00:00:00 2001 From: Steel Wagstaff Date: Tue, 5 Apr 2022 11:30:06 -0700 Subject: [PATCH 12/16] Add support for Cherokee (#1001) * Add support for Noto Sans Cherokee and bold variants of Adlam and Canadian Aboriginal --- .github/workflows/.pipeline.yml | 6 +++--- .../typography/styles/_NotoSansAdlamFont.scss | 7 +++++++ .../styles/_NotoSansCanadianAboriginalFont.scss | 7 +++++++ .../typography/styles/_NotoSansCherokeeFont.scss | 15 +++++++++++++++ assets/book/typography/styles/_fonts-chr.scss | 16 ++++++++++++++++ 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 assets/book/typography/styles/_NotoSansCherokeeFont.scss create mode 100644 assets/book/typography/styles/_fonts-chr.scss diff --git a/.github/workflows/.pipeline.yml b/.github/workflows/.pipeline.yml index c67ed454b..652da23eb 100644 --- a/.github/workflows/.pipeline.yml +++ b/.github/workflows/.pipeline.yml @@ -13,9 +13,9 @@ jobs: strategy: fail-fast: false matrix: - php: [ 7.3, 7.4 ] + php: [ 7.4 ] os: [ ubuntu-20.04 ] - wordpress: [ 5.9 ] + wordpress: [ 5.9.2, latest ] experimental: [false] include: - php: 8.0 @@ -103,7 +103,7 @@ jobs: - name: Upload Coverage to Codecov run: bash <(curl -s https://codecov.io/bash) - if: matrix.experimental == false && matrix.php == 7.3 + if: matrix.experimental == false - name: Prepare Build if: startsWith(github.ref, 'refs/tags/') diff --git a/assets/book/typography/styles/_NotoSansAdlamFont.scss b/assets/book/typography/styles/_NotoSansAdlamFont.scss index 504bb9ff1..7e2d4210d 100644 --- a/assets/book/typography/styles/_NotoSansAdlamFont.scss +++ b/assets/book/typography/styles/_NotoSansAdlamFont.scss @@ -6,3 +6,10 @@ font-weight: normal; src: url('uploads/assets/fonts/NotoSansAdlam-Regular.ttf') format('truetype'); } + +@font-face { + font-family: 'Noto Sans Adlam'; + font-style: normal; + font-weight: bold; + src: url('uploads/assets/fonts/NotoSansAdlam-Bold.ttf') format('truetype'); +} diff --git a/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss b/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss index 9e9213ec2..8b34db26a 100644 --- a/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss +++ b/assets/book/typography/styles/_NotoSansCanadianAboriginalFont.scss @@ -11,3 +11,10 @@ font-weight: 400; src: url('uploads/assets/fonts/NotoSansCanadianAboriginal-Regular.ttf') format('truetype'); } + +@font-face { + font-family: 'Noto Sans Canadian Aboriginal'; + font-style: normal; + font-weight: bold; + src: url('uploads/assets/fonts/NotoSansCanadianAboriginal-Bold.ttf') format('truetype'); +} diff --git a/assets/book/typography/styles/_NotoSansCherokeeFont.scss b/assets/book/typography/styles/_NotoSansCherokeeFont.scss new file mode 100644 index 000000000..675bb9d5a --- /dev/null +++ b/assets/book/typography/styles/_NotoSansCherokeeFont.scss @@ -0,0 +1,15 @@ +// 'Noto Sans Cherokee', @import 'NotoSansCherokeeFont' + +@font-face { + font-family: 'Noto Sans Cherokee'; + font-style: normal; + font-weight: normal; + src: url('uploads/assets/fonts/NotoSansCherokee-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Noto Sans Cherokee'; + font-style: normal; + font-weight: bold; + src: url('uploads/assets/fonts/NotoSansCherokee-Bold.ttf') format('truetype'); +} diff --git a/assets/book/typography/styles/_fonts-chr.scss b/assets/book/typography/styles/_fonts-chr.scss new file mode 100644 index 000000000..73d8beaa7 --- /dev/null +++ b/assets/book/typography/styles/_fonts-chr.scss @@ -0,0 +1,16 @@ +// NOTO CHEROKEE +// CHEROKEE FONT SANS + +@import 'NotoSansCherokeeFont'; + +// Sans-serif stack name + +$sans-serif-epub-chr: 'Noto Sans Cherokee'; +$sans-serif-prince-chr: 'Noto Sans Cherokee'; +$sans-serif-web-chr: 'Noto Sans Cherokee'; + +// Serif stack name + +$serif-epub-chr: 'Noto Sans Cherokee'; +$serif-prince-chr: 'Noto Sans Cherokee'; +$serif-web-chr: 'Noto Sans Cherokee'; From f40f4e24b28b01350e8287cce0e8ad30c651dbdb Mon Sep 17 00:00:00 2001 From: Steel Wagstaff Date: Wed, 6 Apr 2022 06:58:09 -0700 Subject: [PATCH 13/16] Fix aria label for site logo (#1002) --- header.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/header.php b/header.php index 4cb3be291..9fdf19473 100644 --- a/header.php +++ b/header.php @@ -63,13 +63,13 @@