Skip to content

Commit

Permalink
Added yarn resolution for @tryghost/errors
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
daniellockyer committed Apr 5, 2023
1 parent 11183e3 commit 7ec2656
Show file tree
Hide file tree
Showing 31 changed files with 144 additions and 184 deletions.
2 changes: 1 addition & 1 deletion ghost/api-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/audience-feedback/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
7 changes: 4 additions & 3 deletions ghost/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/custom-theme-settings-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ghost/email-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/job-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/link-tracking/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/magic-link/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/members-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/members-events-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/members-importer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/members-ssr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ghost/milestones/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"sinon": "15.0.2"
},
"dependencies": {
"@tryghost/errors": "1.2.21",
"@tryghost/errors": "1.2.23",
"bson-objectid": "2.0.4"
}
}
2 changes: 1 addition & 1 deletion ghost/minifier/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/mw-api-version-mismatch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/mw-error-handler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/mw-version-match/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ghost/oembed-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/offers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/package-json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/payments/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ghost/posts-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ghost/settings-path-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion ghost/slack-notifications/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/stripe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/tiers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ghost/update-check-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ghost/verification-trigger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion ghost/webmentions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 7ec2656

Please sign in to comment.