From 7ec26564956d31491553ff5b30d41aeda8c276ba Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Wed, 5 Apr 2023 09:22:41 +0200 Subject: [PATCH] Added yarn resolution for `@tryghost/errors` - we keep ending up with multiple versions of the depedency in our tree, and it's causing problems when comparing instances - the workaround I'm implementing for now is to bump the package everywhere and set a resolution so we only have 1 shared instance - hopefully we can come up with a better method down the line --- ghost/api-framework/package.json | 2 +- ghost/audience-feedback/package.json | 2 +- ghost/core/package.json | 7 +- .../package.json | 2 +- ghost/email-service/package.json | 2 +- ghost/job-manager/package.json | 2 +- ghost/link-tracking/package.json | 2 +- ghost/magic-link/package.json | 2 +- ghost/members-api/package.json | 2 +- ghost/members-events-service/package.json | 2 +- ghost/members-importer/package.json | 2 +- ghost/members-ssr/package.json | 2 +- ghost/milestones/package.json | 2 +- ghost/minifier/package.json | 2 +- ghost/mw-api-version-mismatch/package.json | 2 +- ghost/mw-error-handler/package.json | 2 +- ghost/mw-version-match/package.json | 2 +- ghost/oembed-service/package.json | 2 +- ghost/offers/package.json | 2 +- ghost/package-json/package.json | 2 +- ghost/payments/package.json | 2 +- ghost/posts-service/package.json | 2 +- ghost/settings-path-manager/package.json | 2 +- ghost/slack-notifications/package.json | 2 +- ghost/stripe/package.json | 2 +- ghost/tiers/package.json | 2 +- ghost/update-check-service/package.json | 2 +- ghost/verification-trigger/package.json | 2 +- ghost/webmentions/package.json | 2 +- package.json | 1 + yarn.lock | 266 ++++++++---------- 31 files changed, 145 insertions(+), 185 deletions(-) diff --git a/ghost/api-framework/package.json b/ghost/api-framework/package.json index c568b15e13..5c98d9d4f0 100644 --- a/ghost/api-framework/package.json +++ b/ghost/api-framework/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.22", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/promise": "0.3.2", "@tryghost/tpl": "0.1.22", "@tryghost/validator": "0.2.1", diff --git a/ghost/audience-feedback/package.json b/ghost/audience-feedback/package.json index 3538ab0e28..9b4a9423ac 100644 --- a/ghost/audience-feedback/package.json +++ b/ghost/audience-feedback/package.json @@ -24,7 +24,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "bson-objectid": "2.0.4" } diff --git a/ghost/core/package.json b/ghost/core/package.json index b181ad78d7..3f33ab9415 100644 --- a/ghost/core/package.json +++ b/ghost/core/package.json @@ -83,7 +83,7 @@ "@tryghost/email-mock-receiver": "0.1.1", "@tryghost/email-service": "0.0.0", "@tryghost/email-suppression-list": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/event-aware-cache-wrapper": "0.0.0", "@tryghost/express-dynamic-redirects": "0.0.0", "@tryghost/external-media-inliner": "0.0.0", @@ -179,7 +179,7 @@ "ghost-storage-base": "1.0.0", "glob": "8.1.0", "got": "11.8.6", - "gscan": "4.36.1", + "gscan": "4.36.2", "human-number": "2.0.1", "image-size": "1.0.2", "intl": "1.2.5", @@ -190,7 +190,7 @@ "juice": "8.1.0", "keypair": "1.0.4", "knex": "2.4.2", - "knex-migrator": "5.1.2", + "knex-migrator": "5.1.3", "lodash": "4.17.21", "luxon": "3.2.1", "moment": "2.24.0", @@ -243,6 +243,7 @@ }, "resolutions": { "@elastic/elasticsearch": "8.5.0", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "moment": "2.24.0", "moment-timezone": "0.5.23" diff --git a/ghost/custom-theme-settings-service/package.json b/ghost/custom-theme-settings-service/package.json index e184225c6f..59180c3f24 100644 --- a/ghost/custom-theme-settings-service/package.json +++ b/ghost/custom-theme-settings-service/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.22", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "lodash": "4.17.21" } diff --git a/ghost/email-service/package.json b/ghost/email-service/package.json index 8d53eb6b68..8e3e179862 100644 --- a/ghost/email-service/package.json +++ b/ghost/email-service/package.json @@ -27,7 +27,7 @@ "dependencies": { "@tryghost/color-utils": "0.1.23", "@tryghost/email-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/html-to-plaintext": "0.0.0", "@tryghost/kg-default-cards": "6.0.5", "@tryghost/logging": "2.4.1", diff --git a/ghost/job-manager/package.json b/ghost/job-manager/package.json index d2475db173..0a13b6e141 100644 --- a/ghost/job-manager/package.json +++ b/ghost/job-manager/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@breejs/later": "4.1.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "bree": "6.5.0", "cron-validate": "1.4.5", diff --git a/ghost/link-tracking/package.json b/ghost/link-tracking/package.json index 0ceaf6cf6e..a324aab1fc 100644 --- a/ghost/link-tracking/package.json +++ b/ghost/link-tracking/package.json @@ -24,7 +24,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/link-redirects": "0.0.0", "@tryghost/nql": "0.11.0", "@tryghost/tpl": "0.1.22", diff --git a/ghost/magic-link/package.json b/ghost/magic-link/package.json index c5521701f9..d9f2c7f83d 100644 --- a/ghost/magic-link/package.json +++ b/ghost/magic-link/package.json @@ -24,7 +24,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "@tryghost/validator": "0.2.1", "jsonwebtoken": "8.5.1" diff --git a/ghost/members-api/package.json b/ghost/members-api/package.json index 7152eee342..5ea0acc563 100644 --- a/ghost/members-api/package.json +++ b/ghost/members-api/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@tryghost/domain-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "@tryghost/magic-link": "0.0.0", "@tryghost/member-events": "0.0.0", diff --git a/ghost/members-events-service/package.json b/ghost/members-events-service/package.json index c0777b1574..29a5d9dcbf 100644 --- a/ghost/members-events-service/package.json +++ b/ghost/members-events-service/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@tryghost/domain-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "@tryghost/member-events": "0.0.0", "moment-timezone": "0.5.34" diff --git a/ghost/members-importer/package.json b/ghost/members-importer/package.json index af5c718329..5940d12915 100644 --- a/ghost/members-importer/package.json +++ b/ghost/members-importer/package.json @@ -23,7 +23,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "@tryghost/members-csv": "0.0.0", "@tryghost/tpl": "0.1.22", diff --git a/ghost/members-ssr/package.json b/ghost/members-ssr/package.json index 72c87b47b5..badc3b060a 100644 --- a/ghost/members-ssr/package.json +++ b/ghost/members-ssr/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.22", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "cookies": "0.8.0", "jsonwebtoken": "8.5.1" } diff --git a/ghost/milestones/package.json b/ghost/milestones/package.json index e5b6a2a0de..72457b2813 100644 --- a/ghost/milestones/package.json +++ b/ghost/milestones/package.json @@ -23,7 +23,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "bson-objectid": "2.0.4" } } diff --git a/ghost/minifier/package.json b/ghost/minifier/package.json index 57d82a5d7a..ca2fa5ee6c 100644 --- a/ghost/minifier/package.json +++ b/ghost/minifier/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.22", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "csso": "5.0.5", "terser": "5.16.6", diff --git a/ghost/mw-api-version-mismatch/package.json b/ghost/mw-api-version-mismatch/package.json index 3401898822..db4037257f 100644 --- a/ghost/mw-api-version-mismatch/package.json +++ b/ghost/mw-api-version-mismatch/package.json @@ -18,7 +18,7 @@ "lib" ], "devDependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "c8": "7.13.0", "mocha": "10.2.0", "sinon": "15.0.2" diff --git a/ghost/mw-error-handler/package.json b/ghost/mw-error-handler/package.json index 9afed492f0..3bc506c0cd 100644 --- a/ghost/mw-error-handler/package.json +++ b/ghost/mw-error-handler/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.22", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/http-cache-utils": "0.1.7", "@tryghost/tpl": "0.1.22", "lodash": "4.17.21", diff --git a/ghost/mw-version-match/package.json b/ghost/mw-version-match/package.json index 27121e19f6..dac0e486a1 100644 --- a/ghost/mw-version-match/package.json +++ b/ghost/mw-version-match/package.json @@ -23,7 +23,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "semver": "7.3.8" } diff --git a/ghost/oembed-service/package.json b/ghost/oembed-service/package.json index c6cba699f1..ea83208046 100644 --- a/ghost/oembed-service/package.json +++ b/ghost/oembed-service/package.json @@ -22,7 +22,7 @@ "mocha": "10.2.0" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "@tryghost/tpl": "0.1.22", "charset": "1.0.1", diff --git a/ghost/offers/package.json b/ghost/offers/package.json index c4f9743b61..fb217f7579 100644 --- a/ghost/offers/package.json +++ b/ghost/offers/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@tryghost/domain-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/mongo-utils": "0.5.0", "@tryghost/string": "0.2.3", "lodash": "4.17.21" diff --git a/ghost/package-json/package.json b/ghost/package-json/package.json index 8d53192062..48dae52de0 100644 --- a/ghost/package-json/package.json +++ b/ghost/package-json/package.json @@ -23,7 +23,7 @@ "tmp": "0.2.1" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "fs-extra": "11.1.1", "lodash": "4.17.21" diff --git a/ghost/payments/package.json b/ghost/payments/package.json index 794f0aa89d..1ab6ba890c 100644 --- a/ghost/payments/package.json +++ b/ghost/payments/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@tryghost/domain-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/members-offers": "0.0.0", "@tryghost/tiers": "0.0.0" } diff --git a/ghost/posts-service/package.json b/ghost/posts-service/package.json index 2be3578058..6d754a3572 100644 --- a/ghost/posts-service/package.json +++ b/ghost/posts-service/package.json @@ -23,7 +23,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/nql": "0.11.0", "@tryghost/tpl": "0.1.22" } diff --git a/ghost/settings-path-manager/package.json b/ghost/settings-path-manager/package.json index 2a9678127f..bca26d4ba5 100644 --- a/ghost/settings-path-manager/package.json +++ b/ghost/settings-path-manager/package.json @@ -22,7 +22,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/tpl": "0.1.22", "date-fns": "2.29.3" } diff --git a/ghost/slack-notifications/package.json b/ghost/slack-notifications/package.json index 5cfb2c38b5..e6df6e5142 100644 --- a/ghost/slack-notifications/package.json +++ b/ghost/slack-notifications/package.json @@ -23,7 +23,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/validator": "0.2.1", "@tryghost/version": "0.1.20", "got": "9.6.0" diff --git a/ghost/stripe/package.json b/ghost/stripe/package.json index ce084c2529..c8dd7fe646 100644 --- a/ghost/stripe/package.json +++ b/ghost/stripe/package.json @@ -25,7 +25,7 @@ "dependencies": { "@tryghost/debug": "0.1.22", "@tryghost/domain-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "@tryghost/member-events": "0.0.0", "leaky-bucket": "2.2.0", diff --git a/ghost/tiers/package.json b/ghost/tiers/package.json index 5450120a48..9d76c4efd7 100644 --- a/ghost/tiers/package.json +++ b/ghost/tiers/package.json @@ -22,7 +22,7 @@ "mocha": "10.2.0" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/string": "0.2.3", "@tryghost/tpl": "0.1.22", "bson-objectid": "2.0.4" diff --git a/ghost/update-check-service/package.json b/ghost/update-check-service/package.json index 32c4cb3c87..d4437be536 100644 --- a/ghost/update-check-service/package.json +++ b/ghost/update-check-service/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@tryghost/debug": "0.1.22", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "@tryghost/tpl": "0.1.22", "lodash": "4.17.21", diff --git a/ghost/verification-trigger/package.json b/ghost/verification-trigger/package.json index 5c35f339db..1d8f58ff00 100644 --- a/ghost/verification-trigger/package.json +++ b/ghost/verification-trigger/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@tryghost/domain-events": "0.0.0", - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/member-events": "0.0.0" } } diff --git a/ghost/webmentions/package.json b/ghost/webmentions/package.json index bc7b99c08d..143cd943e8 100644 --- a/ghost/webmentions/package.json +++ b/ghost/webmentions/package.json @@ -25,7 +25,7 @@ "sinon": "15.0.2" }, "dependencies": { - "@tryghost/errors": "1.2.21", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "cheerio": "0.22.0" } diff --git a/package.json b/package.json index c434d78842..13bf954482 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ }, "resolutions": { "@elastic/elasticsearch": "8.5.0", + "@tryghost/errors": "1.2.23", "@tryghost/logging": "2.4.1", "moment": "2.24.0", "moment-timezone": "0.5.23" diff --git a/yarn.lock b/yarn.lock index 7b43e300a1..011e6b7cd0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3947,6 +3947,16 @@ "@sentry/utils" "7.44.2" tslib "^1.9.3" +"@sentry-internal/tracing@7.46.0": + version "7.46.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.46.0.tgz#26febabe21a2c2cab45a3de75809d88753ec07eb" + integrity sha512-KYoppa7PPL8Er7bdPoxTNUfIY804JL7hhOEomQHYD22rLynwQ4AaLm3YEY75QWwcGb0B7ZDMV+tSumW7Rxuwuw== + dependencies: + "@sentry/core" "7.46.0" + "@sentry/types" "7.46.0" + "@sentry/utils" "7.46.0" + tslib "^1.9.3" + "@sentry/browser@7.44.2": version "7.44.2" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.44.2.tgz#455576e73ed439f1758f096fee4125482a46ee93" @@ -3969,15 +3979,6 @@ "@sentry/utils" "7.11.1" tslib "^1.9.3" -"@sentry/core@7.38.0": - version "7.38.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.38.0.tgz#52f1f1f2ba5e88ab7b33c3abb0ea9730c78d953d" - integrity sha512-+hXh/SO3Ie6WC2b+wi01xLhyVREdkRXS5QBmCiv3z2ks2HvYXp7PoKSXJvNKiwCP+pBD+enOnM1YEzM2yEy5yw== - dependencies: - "@sentry/types" "7.38.0" - "@sentry/utils" "7.38.0" - tslib "^1.9.3" - "@sentry/core@7.44.2": version "7.44.2" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.44.2.tgz#e33b2880e83cc4aaaa3d1b8a160588484d0e2624" @@ -3987,6 +3988,15 @@ "@sentry/utils" "7.44.2" tslib "^1.9.3" +"@sentry/core@7.46.0": + version "7.46.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.46.0.tgz#f377e556d8679f29bde1cce15b1682b6c689d6b7" + integrity sha512-BnNHGh/ZTztqQedFko7vb2u6yLs/kWesOQNivav32ZbsEpVCjcmG1gOJXh2YmGIvj3jXOC9a4xfIuh+lYFcA6A== + dependencies: + "@sentry/types" "7.46.0" + "@sentry/utils" "7.46.0" + tslib "^1.9.3" + "@sentry/ember@7.44.2": version "7.44.2" resolved "https://registry.yarnpkg.com/@sentry/ember/-/ember-7.44.2.tgz#2c03ae27b3c83f8cde0d77cb59fa91d992e36e40" @@ -4025,14 +4035,15 @@ lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/node@7.38.0": - version "7.38.0" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.38.0.tgz#957524fa4764dc19ef970ccdffb802d62e0db3ae" - integrity sha512-jNIN6NZvgzn/oms8RQzffjX8Z0LQDTN6N28nnhzqGCvnfmS1QtTt0FlU+pTuFXZNNSjfGy4XMXMYvLlbvhm2bg== +"@sentry/node@7.46.0": + version "7.46.0" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.46.0.tgz#f85ee74926372d19d6b6a23f68f19023d7a528a7" + integrity sha512-+GrgJMCye2WXGarRiU5IJHCK27xg7xbPc2XjGojBKbBoZfqxVAWbXEK4bnBQgRGP1pCmrU/M6ZhVgR3dP580xA== dependencies: - "@sentry/core" "7.38.0" - "@sentry/types" "7.38.0" - "@sentry/utils" "7.38.0" + "@sentry-internal/tracing" "7.46.0" + "@sentry/core" "7.46.0" + "@sentry/types" "7.46.0" + "@sentry/utils" "7.46.0" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" @@ -4070,16 +4081,16 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.11.1.tgz#06e2827f6ba37159c33644208a0453b86d25e232" integrity sha512-gIEhOPxC2cjrxQ0+K2SFJ1P6e/an5osSxVc9OOtekN28eHtVsXFCLB8XVWeNQnS7N2VkrVrkqORMBz1kvIcvVQ== -"@sentry/types@7.38.0": - version "7.38.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.38.0.tgz#6e2611544446271ed237440b12de782805aefe25" - integrity sha512-NKOALR6pNUMzUrsk2m+dkPrO8uGNvNh1LD0BCPswKNjC2qHo1h1mDGCgBmF9+EWyii8ZoACTIsxvsda+MBf97Q== - "@sentry/types@7.44.2": version "7.44.2" resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.44.2.tgz#c8acdd884f4daf03f3e813935e9e16da71473247" integrity sha512-vdGb2BAelXRitgKWRBF1cCAoisLsbugUaJzrGCQoIoS3lYpZ8d8r2zELE7cNoVObVoQbUHF/WFhXVv8cumj+RA== +"@sentry/types@7.46.0": + version "7.46.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.46.0.tgz#8573ba8676342c594fcfefff4552123278cfec51" + integrity sha512-2FMEMgt2h6u7AoELhNhu9L54GAh67KKfK2pJ1kEXJHmWxM9FSCkizjLs/t+49xtY7jEXr8qYq8bV967VfDPQ9g== + "@sentry/utils@7.11.1": version "7.11.1" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.11.1.tgz#1635c5b223369d9428bc83c9b8908c9c3287ee10" @@ -4088,14 +4099,6 @@ "@sentry/types" "7.11.1" tslib "^1.9.3" -"@sentry/utils@7.38.0": - version "7.38.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.38.0.tgz#d10716e730108301f58766970493e9c5da0ba502" - integrity sha512-MgbI3YmYuyyhUtvcXkgGBqjOW+nuLLNGUdWCK+C4kObf8VbLt3dSE/7SEMT6TSHLYQmxs2BxFgx5Agn97m68kQ== - dependencies: - "@sentry/types" "7.38.0" - tslib "^1.9.3" - "@sentry/utils@7.44.2": version "7.44.2" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.44.2.tgz#a2f77713fec4471076e79e050c75561c21ad8abb" @@ -4104,6 +4107,14 @@ "@sentry/types" "7.44.2" tslib "^1.9.3" +"@sentry/utils@7.46.0": + version "7.46.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.46.0.tgz#7a713724db3d1c8bc0aef6d19a7fe2c76db0bdf2" + integrity sha512-elRezDAF84guMG0OVIIZEWm6wUpgbda4HGks98CFnPsrnMm3N1bdBI9XdlxYLtf+ir5KsGR5YlEIf/a0kRUwAQ== + dependencies: + "@sentry/types" "7.46.0" + tslib "^1.9.3" + "@sidvind/better-ajv-errors@^2.0.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@sidvind/better-ajv-errors/-/better-ajv-errors-2.1.0.tgz#54f4216d2200d60e90ec25c6a27c1ea3afdc6cdf" @@ -4948,12 +4959,12 @@ resolved "https://registry.yarnpkg.com/@tryghost/config-url-helpers/-/config-url-helpers-1.0.5.tgz#9817b7e2eabf7b47e942f1ecaf48168723ceddb9" integrity sha512-to637+pe13V0qzr+F/K9fkAUhjdFRDB0U8KrcJlD/FK2cMNSvNNyJQdeXlpezOB+bXhItu4k4rXQGGH9s6Unyg== -"@tryghost/config@0.2.13": - version "0.2.13" - resolved "https://registry.yarnpkg.com/@tryghost/config/-/config-0.2.13.tgz#0809e2c68a607ae19060dc25f3d837feda5e9021" - integrity sha512-hoLCR3lpv4Uzemz0gphv2KS0+cYTjQzmRZBTK1uHNRK4bKUcOiauMrD48hOqkkpFhlyWkfQb7WDISphYrWaINw== +"@tryghost/config@0.2.14": + version "0.2.14" + resolved "https://registry.yarnpkg.com/@tryghost/config/-/config-0.2.14.tgz#dbb0294787c4e00c3679a96d705afc682a1c9f16" + integrity sha512-sgMlAB/HzEp2oIi4lL7e5g5sQQX9lMaERiDV8chxPjE2h1o41MJfPviy0ORmaL+ftJp0T8iFJoGqZWyy419vYQ== dependencies: - "@tryghost/root-utils" "^0.3.19" + "@tryghost/root-utils" "^0.3.20" nconf "^0.12.0" "@tryghost/content-api@1.11.7": @@ -4963,11 +4974,6 @@ dependencies: axios "^0.27.0" -"@tryghost/database-info@0.3.14": - version "0.3.14" - resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.14.tgz#e9af86a68e3b782b9e31197ddc485774758f21d1" - integrity sha512-Y9JcXD9baxF+ZC4i1R2mtilMYurA3EV1q+IPpPvOF69/vR6jTxJ9xZKez+m5MVKBkppAHS55E4O1nFih1nRvvg== - "@tryghost/database-info@0.3.15": version "0.3.15" resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.15.tgz#add73e5acdae02fa0f9f9cb087c1dee39fdc7989" @@ -4981,7 +4987,7 @@ "@tryghost/root-utils" "^0.3.19" debug "^4.3.1" -"@tryghost/debug@0.1.22", "@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.21", "@tryghost/debug@^0.1.22": +"@tryghost/debug@0.1.22", "@tryghost/debug@^0.1.13", "@tryghost/debug@^0.1.22": version "0.1.22" resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.22.tgz#a80fa29c991d2900f29cb46e2afa952e4d8275bc" integrity sha512-MoxooDwcPm4wcY5mbGgELw7mQn41hKAVNr4EmxzmYY/8D5sRpZztX3ekgznKm2IUAjrHYJdqK1doyOMgk3N9uw== @@ -4989,6 +4995,14 @@ "@tryghost/root-utils" "^0.3.20" debug "^4.3.1" +"@tryghost/debug@^0.1.24": + version "0.1.24" + resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.24.tgz#90ea467ab7bca847b89df642b0cbdfc5a8f15df6" + integrity sha512-jL3QH6/FAKGw3ZRw57fzknaHdiStomJl5oF+2smQdXZz30xcV9Sj841CD6pUprQ3Vsjub8FjupOFL6IQsuqLrg== + dependencies: + "@tryghost/root-utils" "^0.3.22" + debug "^4.3.1" + "@tryghost/elasticsearch@^3.0.10": version "3.0.10" resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch/-/elasticsearch-3.0.10.tgz#7d0417749193afba9688834e5de35409770c7fac" @@ -5019,19 +5033,10 @@ focus-trap "^6.7.2" postcss-preset-env "^7.3.1" -"@tryghost/errors@1.2.21", "@tryghost/errors@^1.0.0", "@tryghost/errors@^1.2.1", "@tryghost/errors@^1.2.21", "@tryghost/errors@^1.2.3": - version "1.2.21" - resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.21.tgz#27c57ccd27324dfc4ab1dc34f8618939fc494324" - integrity sha512-TzV8wxDDFw2ZTI+zsFi0xggpKpc2ABqSzDp+t6dngcLuDs9erBdK5JJTV3wYBOBrJbbK6LzQlAsmH66vgO5HLQ== - dependencies: - "@stdlib/utils" "^0.0.12" - lodash "^4.17.21" - uuid "^9.0.0" - -"@tryghost/errors@^1.2.22": - version "1.2.22" - resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.22.tgz#951aee3632e8e819f90c04b86e2c443f7ef3855a" - integrity sha512-/DsrjIUvXEP2G4/vBUGPifp7D5EBqlE2N955ZGuM1iDLy6wqyA+IKy41huMuTZsZRMSUKeRL37L1OR6axMV3zw== +"@tryghost/errors@1.2.21", "@tryghost/errors@1.2.23", "@tryghost/errors@^1.0.0", "@tryghost/errors@^1.2.1", "@tryghost/errors@^1.2.21", "@tryghost/errors@^1.2.22", "@tryghost/errors@^1.2.3": + version "1.2.23" + resolved "https://registry.yarnpkg.com/@tryghost/errors/-/errors-1.2.23.tgz#d39232c237377f6ea235d20616de91d32e4d3f65" + integrity sha512-qst9/++FDK+CZOC1EYbFo0rsvuZ25tkO2lFdjlIsCemIOPEo9SL4XLMpmDbBxslJoPF+Yp0gTpdjlbShYnyauA== dependencies: "@stdlib/utils" "^0.0.12" lodash "^4.17.21" @@ -5236,7 +5241,7 @@ lodash "^4.17.21" luxon "^1.26.0" -"@tryghost/logging@2.4.0", "@tryghost/logging@2.4.1", "@tryghost/logging@^2.4.0": +"@tryghost/logging@2.4.1", "@tryghost/logging@2.4.3", "@tryghost/logging@^2.4.3": version "2.4.1" resolved "https://registry.yarnpkg.com/@tryghost/logging/-/logging-2.4.1.tgz#cc4697cb3b530812fe6b64f2c0a94ef15d3578b2" integrity sha512-l6OsPbDkVYRcsbmxgyTk0nNJPwRzQnigIvOJzBiF2An4edc2hNzCPifT/VQP0PRGLh5qQXDZt5YNRgd2CcoFmA== @@ -5325,14 +5330,6 @@ "@tryghost/nql-lang" "^0.5.0" mingo "^2.2.2" -"@tryghost/pretty-cli@1.2.33": - version "1.2.33" - resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.33.tgz#a40eb6805d3b434cde874f39889843dfbb44d507" - integrity sha512-+Sg+L6qj+9mND25y2rjGtbGlPEXrFz7BOqyA9PU58hv8rjOufeZPTYIyEZOB6lTyRgsIiAOm1yAIUb0gMpkOuA== - dependencies: - chalk "^4.1.0" - sywac "^1.3.0" - "@tryghost/pretty-cli@1.2.34": version "1.2.34" resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.34.tgz#317cd15455512fb0a623c0673ec4816ab3e20c9e" @@ -5341,6 +5338,14 @@ chalk "^4.1.0" sywac "^1.3.0" +"@tryghost/pretty-cli@1.2.36": + version "1.2.36" + resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.36.tgz#ea4466214bb99c5d192e40bfa947448d3b058cb1" + integrity sha512-Bxnzou/BiMS+Kz3SaRwcVrxbnbqu3XYkXjAorZKy9eKJ26OXQ4F1TC8oLS1aByOLz1QgqjOgzTytwjSxNyfXAQ== + dependencies: + chalk "^4.1.0" + sywac "^1.3.0" + "@tryghost/pretty-stream@^0.1.16": version "0.1.16" resolved "https://registry.yarnpkg.com/@tryghost/pretty-stream/-/pretty-stream-0.1.16.tgz#e11ba791b1eee3d7f73297a6f034ac5843b81c9b" @@ -5393,13 +5398,21 @@ caller "^1.0.1" find-root "^1.1.0" -"@tryghost/server@0.1.30": - version "0.1.30" - resolved "https://registry.yarnpkg.com/@tryghost/server/-/server-0.1.30.tgz#3f5e3a869648fcd333a7bb9b14b7ed7483e1b606" - integrity sha512-ia08XPAPj9sgej6ifRfIz96GtMoWjMLk759b8moMffD7P9UZUj0JRKQvZyjl6Qpp0kIrJum6fAvV9QhEUmJnEA== +"@tryghost/root-utils@^0.3.22": + version "0.3.22" + resolved "https://registry.yarnpkg.com/@tryghost/root-utils/-/root-utils-0.3.22.tgz#23793e467afb41b27f4e289a3618d71bd90bc575" + integrity sha512-vA9zdwlS3nPISTptr94/9psgxcISZ0tB8SoT4HxtPif2wjYgfvSDPJCBaVh1TKXhFZAxcwQSedQElK2XoIs83g== dependencies: - "@tryghost/debug" "^0.1.21" - "@tryghost/logging" "^2.4.0" + caller "^1.0.1" + find-root "^1.1.0" + +"@tryghost/server@0.1.33": + version "0.1.33" + resolved "https://registry.yarnpkg.com/@tryghost/server/-/server-0.1.33.tgz#b7662677e52c4d7afe2db643e884e329386e312f" + integrity sha512-JSfhTU6tkMJ1XMtWqeJnlFlOLWVw+fGD5HFUKmdiTJpVMZaSlJpPucl5R6H5Kjeo2WtxxznePzlGfnPKXe2L0Q== + dependencies: + "@tryghost/debug" "^0.1.24" + "@tryghost/logging" "^2.4.3" "@tryghost/social-urls@0.1.35": version "0.1.35" @@ -5489,16 +5502,6 @@ dependencies: p-wait-for "3.2.0" -"@tryghost/zip@1.1.31": - version "1.1.31" - resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.31.tgz#a85097d20bebe0caf19b380742763f0453268100" - integrity sha512-1gaCUATzTBBV7tVGnblPiaAxWe9FJlMpxrtKxlOkObrAzzV03uWIUEkZaF+rXBv7QcIplITpQZip/1v6criVIQ== - dependencies: - archiver "^5.0.0" - bluebird "^3.7.2" - extract-zip "^2.0.1" - fs-extra "^10.0.0" - "@tryghost/zip@1.1.32": version "1.1.32" resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.32.tgz#687fded0901a8e6a4f8af6fbaaf6619991145602" @@ -5508,6 +5511,15 @@ extract-zip "^2.0.1" fs-extra "^10.0.0" +"@tryghost/zip@1.1.33": + version "1.1.33" + resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.33.tgz#704ebf66adc32d290a768fbe96102003320b079d" + integrity sha512-F0PFF2n5o+gQvBKY7cOdAodKwZZMQulm9XmrDe1R75G1F+3U3AEpgo7hijFzpfHNJn2JKbMmgfG0hzCYSNL81A== + dependencies: + archiver "^5.0.0" + extract-zip "^2.0.1" + fs-extra "^10.0.0" + "@trysound/sax@0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" @@ -15487,15 +15499,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed" - integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@11.1.1, fs-extra@^11.0.0, fs-extra@^11.1.0: version "11.1.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" @@ -16253,25 +16256,25 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw== -gscan@4.36.1: - version "4.36.1" - resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.36.1.tgz#7bde8ddfb36c7f17fc7ab75e96317c869872a633" - integrity sha512-2FGcKwIlmsQ0XmQqvq2K9IQlnCTgZ9zH8iVH0H6UNB8HVE96rbOHwVwtDgzpj+fp4pa049uxiBXDLrCsEInt/A== +gscan@4.36.2: + version "4.36.2" + resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.36.2.tgz#443f23f1933976de7648d197a4c1e695f4a5a0b6" + integrity sha512-RRkkznMPIch18nTYigumziorZyQQv7SXVjhPlCROkLtklwsD29dP5ps8Uk+IvSmIuEI/Z3RIwNT7aC5kw8NAuQ== dependencies: - "@sentry/node" "7.38.0" - "@tryghost/config" "0.2.13" + "@sentry/node" "7.46.0" + "@tryghost/config" "0.2.14" "@tryghost/debug" "0.1.21" - "@tryghost/errors" "1.2.21" - "@tryghost/logging" "2.4.0" - "@tryghost/pretty-cli" "1.2.33" - "@tryghost/server" "0.1.30" - "@tryghost/zip" "1.1.31" + "@tryghost/errors" "1.2.23" + "@tryghost/logging" "2.4.3" + "@tryghost/pretty-cli" "1.2.36" + "@tryghost/server" "0.1.33" + "@tryghost/zip" "1.1.33" bluebird "3.7.2" chalk "4.1.2" common-tags "1.8.2" express "4.18.2" express-hbs "2.4.0" - fs-extra "11.1.0" + fs-extra "11.1.1" glob "8.1.0" lodash "4.17.21" multer "1.4.4" @@ -19250,46 +19253,26 @@ klona@^2.0.4, klona@^2.0.5: resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22" integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA== -knex-migrator@5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-5.1.2.tgz#0b3e56b23ccce7cf050cf236b6e4d04258fc537b" - integrity sha512-av7lhFv/q6btFbzRcu7lzK7MJ9ABlSOUEfs9b09hnud3U6Yt7waW+MD1gaKODz25HFodk4jH3vDWuErz9QXo9g== +knex-migrator@5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-5.1.3.tgz#6057a45465b5476719d98b8153b68c375e1227c7" + integrity sha512-lbLEAvIiHCALzhoFQfBViEbRt2LjBXG/sZBPMjpmjHZJhwu7l4dv9aTkv1sB/1s9nvvyO1aQoLiEQmLoHZ9+pQ== dependencies: - "@tryghost/database-info" "0.3.14" - "@tryghost/errors" "1.2.21" - "@tryghost/logging" "2.4.0" + "@tryghost/database-info" "0.3.15" + "@tryghost/errors" "1.2.23" + "@tryghost/logging" "2.4.3" bluebird "3.7.2" commander "5.1.0" compare-ver "2.0.2" debug "4.3.4" - knex "2.4.1" + knex "2.4.2" lodash "4.17.21" moment "2.24.0" - mysql2 "3.0.1" + mysql2 "3.2.0" nconf "0.12.0" resolve "1.22.1" optionalDependencies: - sqlite3 "5.1.4" - -knex@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/knex/-/knex-2.4.1.tgz#eff21a905e102a306a9c43ea11d984b0f54c4583" - integrity sha512-5wylehvnTOE8EdypPFakccA1zgo6Lp+TNultncvBUCUD0PasY+PLVa9qPrTFCioxPSPVha1u9ye2niAVVbLM0Q== - dependencies: - colorette "2.0.19" - commander "^9.1.0" - debug "4.3.4" - escalade "^3.1.1" - esm "^3.2.25" - get-package-type "^0.1.0" - getopts "2.3.0" - interpret "^2.2.0" - lodash "^4.17.21" - pg-connection-string "2.5.0" - rechoir "^0.8.0" - resolve-from "^5.0.0" - tarn "^3.0.2" - tildify "2.0.0" + sqlite3 "5.1.6" knex@2.4.2: version "2.4.2" @@ -21399,20 +21382,6 @@ mv@~2: ncp "~2.0.0" rimraf "~2.4.0" -mysql2@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.0.1.tgz#436db56e96d5b7fed350192387f54881658b8b44" - integrity sha512-Wrh5KuE0OOlm6wRwRhE2q+C8LjwwfT3sFKVauyTwMwPbOd2i0SzxMqTZPqs90ZNAEWjot5GFywje84qVn3ITYw== - dependencies: - denque "^2.1.0" - generate-function "^2.3.1" - iconv-lite "^0.6.3" - long "^5.2.1" - lru-cache "^7.14.1" - named-placeholders "^1.1.3" - seq-queue "^0.0.5" - sqlstring "^2.3.2" - mysql2@3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.2.0.tgz#3613a8903bcb7ade0ae35b29945a0378eb67da89" @@ -26697,17 +26666,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -sqlite3@5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz#35f83d368963168b324ad2f0fffce09f3b8723a7" - integrity sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA== - dependencies: - "@mapbox/node-pre-gyp" "^1.0.0" - node-addon-api "^4.2.0" - tar "^6.1.11" - optionalDependencies: - node-gyp "8.x" - sqlite3@5.1.6: version "5.1.6" resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.6.tgz#1d4fbc90fe4fbd51e952e0a90fd8f6c2b9098e97"