Skip to content

Commit

Permalink
fix: handle more edge cases
Browse files Browse the repository at this point in the history
  • Loading branch information
@mxdvl
mxdvl committed Feb 10, 2023
1 parent c5d5597 commit 1ea0c62
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 63 deletions.
72 changes: 48 additions & 24 deletions dotcom-rendering/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"lint-staged": {
"*": "lint"
},
"devDependencies": {
"dependencies": {
"@aws-sdk/client-cloudwatch": "^3.45.0",
"@aws-sdk/client-ssm": "^3.45.0",
"@babel/core": "^7.16.12",
Expand All @@ -61,10 +61,10 @@
"@cypress/skip-test": "^2.6.0",
"@emotion/babel-plugin": "^11.3.0",
"@emotion/cache": "^11.4.0",
"@emotion/react": "^11.4.1",
"@emotion/react": "11.5",
"@emotion/server": "^11.4.0",
"@guardian/ab-core": "^3.1.0",
"@guardian/atoms-rendering": "^25.1.5",
"@guardian/atoms-rendering": "^26.0.0",
"@guardian/braze-components": "^9.0.2",
"@guardian/browserslist-config": "^2.0.3",
"@guardian/commercial-core": "^5.2.1",
Expand All @@ -77,8 +77,8 @@
"@guardian/libs": "^13.1.0",
"@guardian/prettier": "^2.1.5",
"@guardian/shimport": "^1.0.2",
"@guardian/source-foundations": "^7.0.1",
"@guardian/source-react-components": "^9.1.0",
"@guardian/source-foundations": "^9.0.0",
"@guardian/source-react-components": "^11.0.0",
"@guardian/source-react-components-development-kitchen": "9.1.0",
"@guardian/support-dotcom-components": "^1.0.7",
"@guardian/tsconfig": "^0.1.4",
Expand Down Expand Up @@ -252,38 +252,58 @@
]
},
"@guardian/discussion-rendering@^12.0.0": {
"@emotion/react": [
"^11.5.0",
"^11.4.1"
],
"@guardian/libs": [
"^10.0.0",
"^12.0.0"
"^13.1.0"
],
"@guardian/source-foundations": [
"^7.0.1",
"^9.0.0"
],
"@guardian/source-react-components": [
"^9.0.1",
"^11.0.0"
]
},
"@guardian/eslint-plugin-source-react-components@^10.0.0": {
"@guardian/libs": [
"^9.0.0",
"^12.0.0"
"^13.1.0"
],
"@guardian/source-react-components": [
"^9.0.0",
"^11.0.0"
]
},
"@guardian/braze-components@^8.1.3": {
"@guardian/braze-components@^9.0.2": {
"@guardian/libs": [
"^7.1.4 || ^10.1.1",
"^13.1.0"
],
"@guardian/source-foundations": [
"^7.0.1",
"^9.0.0"
],
"@guardian/source-react-components-development-kitchen": [
"5.0.0",
"8.2.2"
"^6.0.2 || ^7.1.1",
"9.1.0"
],
"@guardian/libs": [
"^3.1.0",
"^12.0.0"
"@guardian/source-react-components": [
"^9.0.0",
"^11.0.0"
]
},
"@guardian/core-web-vitals@^2.0.1": {
"@guardian/libs": [
"^10.0.0",
"^12.0.0"
"^13.1.0"
]
},
"@guardian/atoms-rendering@^25.1.5": {
"@guardian/atoms-rendering@^26.0.0": {
"@guardian/libs": [
"^12.0.0",
"^13.1.0"
],
"@guardian/source-foundations": [
"^8.0.0",
"^7.0.1"
Expand All @@ -293,16 +313,16 @@
"^9.1.0"
]
},
"@guardian/source-react-components-development-kitchen@8.2.2": {
"@guardian/source-react-components-development-kitchen@9.1.0": {
"@guardian/libs": [
"^9.0.0 || ^10.0.0",
"^12.0.0"
"^12.0.0",
"^13.1.0"
]
},
"@guardian/[email protected]": {
"@guardian/libs": [
"^10.0.0",
"^12.0.0"
"^13.1.0"
]
},
"he@~1.2.0": {
Expand All @@ -318,9 +338,13 @@
]
},
"@guardian/commercial-core@^5.2.1": {
"@guardian/ab-core": [
"^2.0.0",
"^3.1.0"
],
"@guardian/libs": [
"^10.0.0",
"^12.0.1"
"^13.1.0"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions dotcom-rendering/scripts/env/check-deps.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const pkg = require('../../package.json');

if (pkg.dependencies) {
if (pkg.devDependencies) {
const { warn, log } = require('./log');

warn('Don’t use dependencies, devDependencies only!');
warn('Don’t use devDependencies, dependencies only!');
log('See https://github.com/guardian/dotcom-rendering/pull/4001');
process.exit(1);
}
80 changes: 43 additions & 37 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1880,6 +1880,13 @@
dependencies:
regenerator-runtime "^0.13.11"

"@babel/runtime@^7.13.10":
version "7.20.13"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b"
integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
dependencies:
regenerator-runtime "^0.13.11"

"@babel/template@^7.12.7", "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3", "@babel/template@^7.4.0":
version "7.20.7"
resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
Expand Down Expand Up @@ -1996,7 +2003,7 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==

"@emotion/babel-plugin@^11.10.5", "@emotion/babel-plugin@^11.3.0":
"@emotion/babel-plugin@^11.3.0":
version "11.10.5"
resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c"
integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==
Expand All @@ -2014,7 +2021,7 @@
source-map "^0.5.7"
stylis "4.1.3"

"@emotion/cache@^11.10.5", "@emotion/cache@^11.4.0":
"@emotion/cache@^11.4.0", "@emotion/cache@^11.5.0":
version "11.10.5"
resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.5.tgz#c142da9351f94e47527ed458f7bbbbe40bb13c12"
integrity sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==
Expand All @@ -2035,21 +2042,20 @@
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f"
integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==

"@emotion/react@^11.4.1":
version "11.10.5"
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.5.tgz#95fff612a5de1efa9c0d535384d3cfa115fe175d"
integrity sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==
dependencies:
"@babel/runtime" "^7.18.3"
"@emotion/babel-plugin" "^11.10.5"
"@emotion/cache" "^11.10.5"
"@emotion/serialize" "^1.1.1"
"@emotion/use-insertion-effect-with-fallbacks" "^1.0.0"
"@emotion/utils" "^1.2.0"
"@emotion/weak-memoize" "^0.3.0"
"@emotion/[email protected]":
version "11.5.0"
resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.5.0.tgz#19b5771bbfbda5e8517e948a2d9064810f0022bd"
integrity sha512-MYq/bzp3rYbee4EMBORCn4duPQfgpiEB5XzrZEBnUZAL80Qdfr7CEv/T80jwaTl/dnZmt9SnTa8NkTrwFNpLlw==
dependencies:
"@babel/runtime" "^7.13.10"
"@emotion/cache" "^11.5.0"
"@emotion/serialize" "^1.0.2"
"@emotion/sheet" "^1.0.3"
"@emotion/utils" "^1.0.0"
"@emotion/weak-memoize" "^0.2.5"
hoist-non-react-statics "^3.3.1"

"@emotion/serialize@^1.1.1":
"@emotion/serialize@^1.0.2", "@emotion/serialize@^1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0"
integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==
Expand All @@ -2070,7 +2076,7 @@
multipipe "^1.0.2"
through "^2.3.8"

"@emotion/sheet@^1.2.1":
"@emotion/sheet@^1.0.3", "@emotion/sheet@^1.2.1":
version "1.2.1"
resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.1.tgz#0767e0305230e894897cadb6c8df2c51e61a6c2c"
integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA==
Expand All @@ -2080,16 +2086,16 @@
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.8.0.tgz#a4a36e9cbdc6903737cd20d38033241e1b8833db"
integrity sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw==

"@emotion/use-insertion-effect-with-fallbacks@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df"
integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==

"@emotion/utils@^1.2.0":
"@emotion/utils@^1.0.0", "@emotion/utils@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561"
integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw==

"@emotion/weak-memoize@^0.2.5":
version "0.2.5"
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==

"@emotion/weak-memoize@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb"
Expand Down Expand Up @@ -2230,10 +2236,10 @@
resolved "https://registry.yarnpkg.com/@guardian/ab-core/-/ab-core-3.1.0.tgz#8974bc0a0a25f6f47d946252cc410657801372b2"
integrity sha512-DGyDH1NrQEkyudUN2HlIb+BuEQNL4ftSG4DvDd+SPhcqCKH/41k2JMnchVM4KTO6ctHTw7D3AD9POhr+3Xm/YA==

"@guardian/atoms-rendering@^25.1.5":
version "25.1.5"
resolved "https://registry.yarnpkg.com/@guardian/atoms-rendering/-/atoms-rendering-25.1.5.tgz#d5806933ca5c0f4997b0935dfdb08003c9366b8e"
integrity sha512-fuHJjrv9xv7FnIuoJWYOrBgGX6y0QzS3RGelgxq+YAHtbqFmBBMDODftkqiDq7RHRuAyPchOI7poi0tKG6vsfg==
"@guardian/atoms-rendering@^26.0.0":
version "26.0.0"
resolved "https://registry.yarnpkg.com/@guardian/atoms-rendering/-/atoms-rendering-26.0.0.tgz#7107032a9a7a1769bc15ce3e1d23b188fcf788bf"
integrity sha512-MeABSNmFlbei+RasH2zORx+a4uzGc+WMrKHy1BYEBkXp3YDatXFwKdwQYx0bIozDgfa9ZNzJLW8puYsge8R56g==
dependencies:
is-mobile "^3.1.1"

Expand Down Expand Up @@ -2314,10 +2320,10 @@
dependencies:
tslib "^2.0.0"

"@guardian/source-foundations@^7.0.1":
version "7.0.3"
resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-7.0.3.tgz#2d30d8a76ac1a5382774bbaaaa39a84551d4709d"
integrity sha512-XDShUQ1MvQlTaa1Va+QbLSjHA2hg/lBhfoP31wQAFd0mqpGeCjGnwI6snSX31EdpkniLqJH4Y7gGcOsZ1SqtQg==
"@guardian/source-foundations@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@guardian/source-foundations/-/source-foundations-9.0.0.tgz#bb3678a95b0ecb280f1ea5051b21f89412bbb9b4"
integrity sha512-yOLQ9Vq2YtschUc2tJO4bbPUEKHNFd3CUaWHJctsaI38vf1qW5vxT0DIRaI2DEGRJxVY0kQdy8rlxIarM5fsAg==
dependencies:
mini-svg-data-uri "1.4.4"

Expand All @@ -2326,10 +2332,10 @@
resolved "https://registry.yarnpkg.com/@guardian/source-react-components-development-kitchen/-/source-react-components-development-kitchen-9.1.0.tgz#07aa6a8bc73b5844f1e063dc292e44ccc9788780"
integrity sha512-fTtMyVe8wxBcx/5qy5X9D0FPGqs+D3TACpvnIB72bGrSSNJDonNe1phnNnhHOEY6MerhEU44DcKVfHtvHRa+og==

"@guardian/source-react-components@^9.1.0":
version "9.1.2"
resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-9.1.2.tgz#2afe6b660773449ffbedbaa74f2fc1a79cb7c3f8"
integrity sha512-cBw9vj9K8UrHrqAARI11fv81hnHQB4fIVVsCUhuzl/J2nvoUCicA4mo4mBl23TtlMRo+mmD+N9dn9HiZYiW95Q==
"@guardian/source-react-components@^11.0.0":
version "11.2.0"
resolved "https://registry.yarnpkg.com/@guardian/source-react-components/-/source-react-components-11.2.0.tgz#4732c2ab994af5c585cf5d6e8f28d4d3e2de1ab8"
integrity sha512-xwvKAFThOlu1F5kyHkWv3i7Fa7oxK+XJc9b7TVE/WCt7qJJrVRsSBfLIz4C68YWctbvQ34XDgk2dB0GI8/wKFg==

"@guardian/support-dotcom-components@^1.0.7":
version "1.0.7"
Expand Down Expand Up @@ -4745,9 +4751,9 @@
"@types/react" "*"

"@types/react@*", "@types/react@^17", "@types/react@^17.0.52", "@types/react@~17.0.52":
version "17.0.52"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.52.tgz#10d8b907b5c563ac014a541f289ae8eaa9bf2e9b"
integrity sha512-vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A==
version "17.0.53"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab"
integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
Expand Down

0 comments on commit 1ea0c62

Please sign in to comment.