From 36a4443ed2751ce152bf18bd8a28775ae96f8466 Mon Sep 17 00:00:00 2001 From: Igor Lobanov Date: Sun, 20 Nov 2022 19:49:44 +0100 Subject: [PATCH 1/2] WIP --- package.json | 4 +++- src/graphql/client.ts | 20 -------------------- src/graphql/privateGraphQLClient.ts | 5 ++--- src/graphql/publicGraphQLClient.ts | 5 ++--- src/utils/config.ts | 4 ++-- yarn.lock | 26 +++++++++++++++++++++++++- 6 files changed, 34 insertions(+), 30 deletions(-) delete mode 100644 src/graphql/client.ts diff --git a/package.json b/package.json index 45c110ed..c6f5562f 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "preview": "astro preview", "server": "node server/server.mjs", "start": "astro dev", + "start:local": "cross-env PUBLIC_API_URL=http://localhost:8080 astro dev", "typecheck": "astro check && tsc --noEmit", "typecheck:watch": "tsc --noEmit --watch", "vercel-build": "astro build" @@ -46,7 +47,7 @@ "@nanostores/router": "^0.7.0", "@nanostores/solid": "^0.3.0", "@popperjs/core": "^2.11.6", - "@solid-devtools/debugger": "^0.15.0", + "@solid-devtools/debugger": "^0.15.1", "@solid-devtools/logger": "^0.5.0", "@solid-primitives/memo": "^1.1.2", "@solid-primitives/storage": "^1.3.3", @@ -65,6 +66,7 @@ "clsx": "^1.2.1", "cookie": "^0.5.0", "cookie-signature": "^1.2.0", + "cross-env": "^7.0.3", "eslint": "^8.27.0", "eslint-config-stylelint": "^17.0.0", "eslint-import-resolver-typescript": "^3.5.2", diff --git a/src/graphql/client.ts b/src/graphql/client.ts deleted file mode 100644 index 3cf12b35..00000000 --- a/src/graphql/client.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { createClient } from '@urql/core' -import { isDev } from '../utils/config' - -const localClient = (options) => { - console.info('[graphql] using local client') - const url = 'http://localhost:8080' - return createClient({ ...options, url }) -} - -export const initClient = (options) => { - try { - if (isDev) { - console.info('[graphql] devmode detected') - return localClient(options) - } else return createClient(options) - } catch (error) { - console.error(error) - return localClient(options) - } -} diff --git a/src/graphql/privateGraphQLClient.ts b/src/graphql/privateGraphQLClient.ts index bbecdc00..0beff1ec 100644 --- a/src/graphql/privateGraphQLClient.ts +++ b/src/graphql/privateGraphQLClient.ts @@ -1,7 +1,6 @@ -import { ClientOptions, dedupExchange, fetchExchange, Exchange } from '@urql/core' +import { ClientOptions, dedupExchange, fetchExchange, Exchange, createClient } from '@urql/core' import { devtoolsExchange } from '@urql/devtools' import { isDev, apiBaseUrl } from '../utils/config' -import { initClient } from './client' // import { cache } from './cache' const TOKEN_LOCAL_STORAGE_KEY = 'token' @@ -39,4 +38,4 @@ const options: ClientOptions = { exchanges } -export const privateGraphQLClient = initClient(options) +export const privateGraphQLClient = createClient(options) diff --git a/src/graphql/publicGraphQLClient.ts b/src/graphql/publicGraphQLClient.ts index 657ea6d9..13c97c16 100644 --- a/src/graphql/publicGraphQLClient.ts +++ b/src/graphql/publicGraphQLClient.ts @@ -1,7 +1,6 @@ -import { ClientOptions, dedupExchange, fetchExchange, Exchange } from '@urql/core' +import { ClientOptions, dedupExchange, fetchExchange, Exchange, createClient } from '@urql/core' import { devtoolsExchange } from '@urql/devtools' import { isDev, apiBaseUrl } from '../utils/config' -import { initClient } from './client' import { cache } from './cache' const exchanges: Exchange[] = [dedupExchange, fetchExchange] //, cache] @@ -17,4 +16,4 @@ const options: ClientOptions = { exchanges } -export const publicGraphQLClient = initClient(options) +export const publicGraphQLClient = createClient(options) diff --git a/src/utils/config.ts b/src/utils/config.ts index 7631c9e5..428dcddb 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -1,4 +1,4 @@ export const isDev = import.meta.env.MODE === 'development' -// export const apiBaseUrl = 'https://v2.discours.io' -export const apiBaseUrl = 'https://testapi.discours.io' +const defaultApiUrl = 'https://testapi.discours.io' +export const apiBaseUrl = import.meta.env.PUBLIC_API_URL || defaultApiUrl diff --git a/yarn.lock b/yarn.lock index cb10ff83..dc56d754 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1655,6 +1655,23 @@ "@solid-primitives/utils" "^4.0.0" type-fest "^3.2.0" +"@solid-devtools/debugger@^0.15.1": + version "0.15.1" + resolved "https://registry.yarnpkg.com/@solid-devtools/debugger/-/debugger-0.15.1.tgz#c98ccf401be9efb2965809de27525e6175ea6d6c" + integrity sha512-E5vXsdemei9T/k/0X0GyZFvKpHiz73am3o8PmWV6vYhipvwVgPRnBvvHI85IjmtqBKK8gqHVtqu2D2qNu0rN2w== + dependencies: + "@solid-devtools/shared" "^0.10.1" + "@solid-devtools/transform" "^0.9.0" + "@solid-primitives/bounds" "^0.0.105" + "@solid-primitives/cursor" "^0.0.103" + "@solid-primitives/event-bus" "^0.1.3" + "@solid-primitives/event-listener" "^2.2.3" + "@solid-primitives/keyboard" "^1.0.3" + "@solid-primitives/platform" "^0.0.102" + "@solid-primitives/scheduled" "^1.2.0" + "@solid-primitives/utils" "^4.0.0" + type-fest "^3.2.0" + "@solid-devtools/logger@^0.5.0": version "0.5.1" resolved "https://registry.yarnpkg.com/@solid-devtools/logger/-/logger-0.5.1.tgz#7481f05246a558b680e2fbbaeafd8dc60b9ff949" @@ -3401,6 +3418,13 @@ crelt@^1.0.0: resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94" integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA== +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" @@ -3408,7 +3432,7 @@ cross-fetch@^3.1.5: dependencies: node-fetch "2.6.7" -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== From 649461973f350d11f056d33943616ebd7acaf957 Mon Sep 17 00:00:00 2001 From: Igor Lobanov Date: Sun, 20 Nov 2022 20:57:19 +0100 Subject: [PATCH 2/2] deprecation fix --- package.json | 2 +- yarn.lock | 186 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 112 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index 3e36a155..f43a7dde 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "prosemirror-view": "^1.29.1", "rollup": "^2.79.1", "rollup-plugin-visualizer": "^5.8.3", - "sass": "^1.56.1", + "sass": "1.32.13", "solid-devtools": "^0.22.0", "solid-js": "^1.6.2", "solid-js-form": "^0.1.5", diff --git a/yarn.lock b/yarn.lock index d100e685..01df5fa3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1108,11 +1108,11 @@ tslib "^2.4.0" "@graphql-tools/prisma-loader@^7.2.7": - version "7.2.37" - resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.37.tgz#79bbfea8e5f09cd24bd5d9c686e6367af53aafd1" - integrity sha512-6O18hT/LRAUMhWh28MjHzvZB6Ad8SGWhmQlgKlQUJGo8MR2uhk14m/VelZBdsiDcN7F84+leZE9XvCERncqvSQ== + version "7.2.39" + resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.39.tgz#056c97751fb89787cba30bb2d0cc0ceccce297de" + integrity sha512-WcLOFFDmLjxcE3Lp0qdX7vD0KkJqAh3af1sVQnpFQLptWLoRHru44AbhECGs3XigICMBKrHO9MV+qtg7FAzhvA== dependencies: - "@graphql-tools/url-loader" "7.16.17" + "@graphql-tools/url-loader" "7.16.19" "@graphql-tools/utils" "9.1.1" "@types/js-yaml" "^4.0.0" "@types/json-stable-stringify" "^1.0.32" @@ -1161,10 +1161,10 @@ tslib "^2.4.0" value-or-promise "1.0.11" -"@graphql-tools/url-loader@7.16.17", "@graphql-tools/url-loader@^7.13.2", "@graphql-tools/url-loader@^7.16.16", "@graphql-tools/url-loader@^7.9.7": - version "7.16.17" - resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.16.17.tgz#73edd2881101f1367ef24a0d5e3593345cb45e62" - integrity sha512-foI9ZKG2ILN2Aj308Sx54+QMYCr1MkP5CNpBFzYzrizWq/MbG3rEycIy+Q+BrxF+cU/Ms4hGcT9+0Gy9oi6Fow== +"@graphql-tools/url-loader@7.16.19", "@graphql-tools/url-loader@^7.13.2", "@graphql-tools/url-loader@^7.16.16", "@graphql-tools/url-loader@^7.9.7": + version "7.16.19" + resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.16.19.tgz#4e95443bcaf8ec66e72118caa48252180bedf37d" + integrity sha512-vFHstaANoojDCXUb/a25mTubteTUV8b7XVLHbbSvAQvwGUne6d+Upg5MeGrKBeHl2Wpn240cJnaa4A1mrwivWA== dependencies: "@ardatan/sync-fetch" "0.0.1" "@graphql-tools/delegate" "9.0.17" @@ -1172,7 +1172,7 @@ "@graphql-tools/executor-http" "0.0.3" "@graphql-tools/executor-legacy-ws" "0.0.3" "@graphql-tools/utils" "9.1.1" - "@graphql-tools/wrap" "9.2.14" + "@graphql-tools/wrap" "9.2.16" "@types/ws" "^8.0.0" "@whatwg-node/fetch" "^0.5.0" isomorphic-ws "5.0.0" @@ -1201,10 +1201,10 @@ dependencies: tslib "^2.4.0" -"@graphql-tools/wrap@9.2.14": - version "9.2.14" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.2.14.tgz#4d25820496d5d1a218fc901b6b150f1e8a901893" - integrity sha512-aAHZpCiYD87GckVK+WAxI6ZTru3D+zxv/EI9TU/wSg6FAgdAPvT/z/oGTDNOPOT0MrYDqVGCIrk0vU4QWiFRJA== +"@graphql-tools/wrap@9.2.16": + version "9.2.16" + resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.2.16.tgz#ec7696101a34cacd1bfefb86ccb631f55651c8fa" + integrity sha512-fWTvGytllPq0IVrRcEAc6VuVUInfCEpOUhSAo1ocsSe0HZMoyrQkS1ST0jmCpEWeGWuUd/S2zBLS2yjH8fYfhA== dependencies: "@graphql-tools/delegate" "9.0.17" "@graphql-tools/schema" "9.0.10" @@ -1656,27 +1656,44 @@ optionalDependencies: "@solid-devtools/transform" "^0.8.0" -"@solid-devtools/logger@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@solid-devtools/logger/-/logger-0.5.0.tgz#612c5b4849af81840faf3f6e51fe4f7cf95f0c0a" - integrity sha512-xuigrpLs4eqtP9E73dbu8lhXpIWndNzW3NayflFSaEhYf/E0SjyRQWlQfMPMz10uN6NyfDBe82Blum55+cXrpw== +"@solid-devtools/debugger@^0.15.0": + version "0.15.1" + resolved "https://registry.yarnpkg.com/@solid-devtools/debugger/-/debugger-0.15.1.tgz#c98ccf401be9efb2965809de27525e6175ea6d6c" + integrity sha512-E5vXsdemei9T/k/0X0GyZFvKpHiz73am3o8PmWV6vYhipvwVgPRnBvvHI85IjmtqBKK8gqHVtqu2D2qNu0rN2w== dependencies: - "@solid-devtools/debugger" "^0.14.0" - "@solid-devtools/shared" "^0.10.0" - "@solid-primitives/utils" "^3.1.0" + "@solid-devtools/shared" "^0.10.1" + "@solid-devtools/transform" "^0.9.0" + "@solid-primitives/bounds" "^0.0.105" + "@solid-primitives/cursor" "^0.0.103" + "@solid-primitives/event-bus" "^0.1.3" + "@solid-primitives/event-listener" "^2.2.3" + "@solid-primitives/keyboard" "^1.0.3" + "@solid-primitives/platform" "^0.0.102" + "@solid-primitives/scheduled" "^1.2.0" + "@solid-primitives/utils" "^4.0.0" + type-fest "^3.2.0" -"@solid-devtools/shared@^0.10.0": - version "0.10.0" - resolved "https://registry.yarnpkg.com/@solid-devtools/shared/-/shared-0.10.0.tgz#d925e5fe2778bd37d3d380bddc89566d7b862c29" - integrity sha512-3kCdzGUbiJxOTcWJSqOSpe/lJnysIPg8+PVxnHMRz7GSUxi73+vXQWcuOQDOcf8trzxyQCJcgBd6KN13nj4K/A== +"@solid-devtools/logger@^0.5.0": + version "0.5.1" + resolved "https://registry.yarnpkg.com/@solid-devtools/logger/-/logger-0.5.1.tgz#7481f05246a558b680e2fbbaeafd8dc60b9ff949" + integrity sha512-tn1KRLKW0Ho/hhGM/JeiC0NauAvcMLsTgx736ARnSesyJJd8y3YKnVrlH9oN/jeh1F66VVxBmZYW/ubz+rgQhw== + dependencies: + "@solid-devtools/debugger" "^0.15.0" + "@solid-devtools/shared" "^0.10.1" + "@solid-primitives/utils" "^4.0.0" + +"@solid-devtools/shared@^0.10.0", "@solid-devtools/shared@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@solid-devtools/shared/-/shared-0.10.1.tgz#1547665eba540203ddcb7a104a1e3c6a0ec42d31" + integrity sha512-RCa6Ev5ZGdOWIo34bqcZixlaV9tEuVMTxELjuzCg561Lbja2JSp3SwKCpxu9CQrJ21CZpgvu/PxsJ28YEHJ0TA== dependencies: "@solid-primitives/event-bus" "^0.1.3" "@solid-primitives/event-listener" "^2.2.3" "@solid-primitives/media" "^2.0.3" "@solid-primitives/rootless" "^1.2.0" "@solid-primitives/scheduled" "^1.1.0" - "@solid-primitives/styles" "^0.0.100" - "@solid-primitives/utils" "^3.1.0" + "@solid-primitives/styles" "^0.0.101" + "@solid-primitives/utils" "^4.0.0" type-fest "^3.2.0" "@solid-devtools/transform@^0.8.0": @@ -1689,6 +1706,16 @@ "@babel/types" "^7.19.4" "@solid-devtools/shared" "^0.10.0" +"@solid-devtools/transform@^0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@solid-devtools/transform/-/transform-0.9.0.tgz#d1bf14184786c487c3301b542d372fd82fc90ed6" + integrity sha512-68Fz80+lkUNTfePvjiv0jC02cPGsZTYl06F2N8Y2DxnujAGYEJbg5mpdC805Q5ykIWMDcibUP3vdGYmNq1JL9w== + dependencies: + "@babel/core" "^7.19.6" + "@babel/plugin-syntax-typescript" "^7.18.6" + "@babel/types" "^7.19.4" + "@solid-devtools/shared" "^0.10.1" + "@solid-primitives/bounds@^0.0.104": version "0.0.104" resolved "https://registry.yarnpkg.com/@solid-primitives/bounds/-/bounds-0.0.104.tgz#fa83e4bdb0966e915abfea1820cabd2da8856298" @@ -1698,6 +1725,15 @@ "@solid-primitives/resize-observer" "^2.0.5" "@solid-primitives/utils" "^3.1.0" +"@solid-primitives/bounds@^0.0.105": + version "0.0.105" + resolved "https://registry.yarnpkg.com/@solid-primitives/bounds/-/bounds-0.0.105.tgz#5f8330b2b5b86c724d05d3e895da29c1149c347a" + integrity sha512-a2ZRuZayXV1/kSKx8cEOR5pIs2zKAF9lS3Gj/r7uHmBQBmn25GYCYOwj4LbLQbqqbumZr2eJO+/wDyi4UOX5pw== + dependencies: + "@solid-primitives/event-listener" "^2.2.4" + "@solid-primitives/resize-observer" "^2.0.6" + "@solid-primitives/utils" "^4.0.0" + "@solid-primitives/cursor@^0.0.101": version "0.0.101" resolved "https://registry.yarnpkg.com/@solid-primitives/cursor/-/cursor-0.0.101.tgz#06945f518cd0de747a87a49eeb7b074b7d6a127b" @@ -1705,6 +1741,13 @@ dependencies: "@solid-primitives/utils" "^3.1.0" +"@solid-primitives/cursor@^0.0.103": + version "0.0.103" + resolved "https://registry.yarnpkg.com/@solid-primitives/cursor/-/cursor-0.0.103.tgz#d127b069b0e62e2c33f912f382bd47f1deea6725" + integrity sha512-bb5x5lCimBf7R2VqrrMVcP2y/aGTMjNj7fjvY+RvTAC3/WtG/odqeYwka4lCBV27pX9TiJCKtNS6mVTigdfLMA== + dependencies: + "@solid-primitives/utils" "^4.0.0" + "@solid-primitives/event-bus@^0.1.3": version "0.1.4" resolved "https://registry.yarnpkg.com/@solid-primitives/event-bus/-/event-bus-0.1.4.tgz#1f3186e8d51386c433d94c006daecc04a5c49f5b" @@ -1765,7 +1808,7 @@ resolved "https://registry.yarnpkg.com/@solid-primitives/platform/-/platform-0.0.102.tgz#cd4aa3e209f6b1671656396ef0d890802a17ef5f" integrity sha512-1eZA1/HYOhmlZ9LrrGot+LUi/ypO2NXqfB+9F1WY98dGNDMz9pG9k+X7kg2YDJTUHDGbzY7WrsBRyAE8LurE7Q== -"@solid-primitives/resize-observer@^2.0.5": +"@solid-primitives/resize-observer@^2.0.5", "@solid-primitives/resize-observer@^2.0.6": version "2.0.7" resolved "https://registry.yarnpkg.com/@solid-primitives/resize-observer/-/resize-observer-2.0.7.tgz#0f909ed58d5fd7ec59b2fee15ddafdd28fdce4c8" integrity sha512-/RtCTs61ACdsCKJodNTgnKA05CI09dkg7usAb5jg14L6mzwTNWWdZbXtbYsUlD+kh1/1j+BKxp6VtkbpgJE5yQ== @@ -1774,7 +1817,7 @@ "@solid-primitives/rootless" "^1.2.1" "@solid-primitives/utils" "^4.0.0" -"@solid-primitives/rootless@^1.1.3", "@solid-primitives/rootless@^1.2.0", "@solid-primitives/rootless@^1.2.1": +"@solid-primitives/rootless@^1.2.0", "@solid-primitives/rootless@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@solid-primitives/rootless/-/rootless-1.2.1.tgz#17d3a7428ebc3d2c7fbf2ec96093edad3b7ad217" integrity sha512-8RpdyS1e58PQbDjgjpyCh+IGoX3QEs/2LauMfl94eXJ5d/o1y/c6P61z9XqQm+Bx1Otdgx4nbFCoF7HPqa0mwg== @@ -1796,12 +1839,12 @@ resolved "https://registry.yarnpkg.com/@solid-primitives/storage/-/storage-1.3.3.tgz#22b5a4e70497aa9ae06cb2f579582d389a65e625" integrity sha512-xauu5jMgZMALB9UAzPUHm0Tnkt0JvtX+37UEP6fVJUOcS9WvnsZqUnZTJaRI69sO3jSCFUBKfQk4aRquGIO+ig== -"@solid-primitives/styles@^0.0.100": - version "0.0.100" - resolved "https://registry.yarnpkg.com/@solid-primitives/styles/-/styles-0.0.100.tgz#142d52c2ade553c71cbe5008469d6987dcc5e8eb" - integrity sha512-9OPLQX3dbi26ur0f/VayIvW8FZ+wMMxRYLj6xnxtgUayVX8ZqmPqRBsBSBDWEL4C0YihEhAsYYUzXhiL76jiWw== +"@solid-primitives/styles@^0.0.101": + version "0.0.101" + resolved "https://registry.yarnpkg.com/@solid-primitives/styles/-/styles-0.0.101.tgz#63220a1d7a40034913f27c155e383f7fdac3d6ee" + integrity sha512-tHkeUMntlS/w+/zDzXJv82hhMy3J3q7tVV3ZTbahRo0hZienAM8ZJrCYZNK/fu2px8NHVSZFRufxv9qhIclPTw== dependencies: - "@solid-primitives/rootless" "^1.1.3" + "@solid-primitives/rootless" "^1.2.0" "@solid-primitives/utils@^3.1.0": version "3.1.0" @@ -2580,9 +2623,9 @@ astro-eslint-parser@^0.9.0: espree "^9.0.0" astro@^1.6.8: - version "1.6.9" - resolved "https://registry.yarnpkg.com/astro/-/astro-1.6.9.tgz#08d7aed72168f8f45fc46e3ac47dd1a8ac0e2bbc" - integrity sha512-KXFKXobe8MIYl4gduUPLcAazMz+thox6N1pOv3F3QMbJS5rMRXkWloVK/6XebBO7p3DYkOfOGB4qA9ijTc4ftA== + version "1.6.10" + resolved "https://registry.yarnpkg.com/astro/-/astro-1.6.10.tgz#8d9877b49e6f2b0ee64503bcc759d73a992b05bf" + integrity sha512-W/ZGROkCKsDicpiXB82n8EkY6I0/12wdXS80NGaBdIUR1jZZxdN+0YMmdz+C2kYbjlo45KUsXpC/Tej+5KQYSQ== dependencies: "@astrojs/compiler" "^0.29.15" "@astrojs/language-server" "^0.28.3" @@ -4291,9 +4334,9 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3 integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.27.0, eslint@^8.7.0: - version "8.27.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.27.0.tgz#d547e2f7239994ad1faa4bb5d84e5d809db7cf64" - integrity sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ== + version "8.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e" + integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ== dependencies: "@eslint/eslintrc" "^1.3.3" "@humanwhocodes/config-array" "^0.11.6" @@ -4846,9 +4889,9 @@ globals@^11.1.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.15.0: - version "13.17.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4" - integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw== + version "13.18.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.18.0.tgz#fb224daeeb2bb7d254cd2c640f003528b8d0c1dc" + integrity sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A== dependencies: type-fest "^0.20.2" @@ -5279,11 +5322,6 @@ ignore@^5.1.1, ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== -immutable@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" - integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== - immutable@~3.7.6: version "3.7.6" resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b" @@ -6531,9 +6569,9 @@ magic-string@^0.25.9: sourcemap-codec "^1.4.8" mailgun.js@^8.0.2: - version "8.0.4" - resolved "https://registry.yarnpkg.com/mailgun.js/-/mailgun.js-8.0.4.tgz#cb0ff2c8119f23cff70f52346550453f698b9bbc" - integrity sha512-9XbXz0TMOFFwdm/8mTtAf6EXAKITREJp/yKVUq9vHfBx9a4U9sebj0Q4E8XDWJ4PRuEIlsM6Rv+OafSVVAvzNg== + version "8.0.6" + resolved "https://registry.yarnpkg.com/mailgun.js/-/mailgun.js-8.0.6.tgz#56a4e208bab5cfe0476f413cdf271c905ff34d8c" + integrity sha512-b+c7QO1T4oFsudEcRB2H7oZKth8ZDeYRW4xjW12QQVNYDSJCVxqSQfps6ofcH8fqcCMJdzc76HVNGdnUZgBPCw== dependencies: axios "^0.27.2" base-64 "^1.0.0" @@ -7801,9 +7839,9 @@ postcss-scss@^4.0.2: integrity sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA== postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.6: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== + version "6.0.11" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" + integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -7920,9 +7958,9 @@ property-expr@^2.0.4: integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA== property-information@^6.0.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22" - integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w== + version "6.2.0" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.2.0.tgz#b74f522c31c097b5149e3c3cb8d7f3defd986a1d" + integrity sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg== prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1: version "1.3.1" @@ -8011,9 +8049,9 @@ prosemirror-menu@^1.0.0, prosemirror-menu@^1.2.1: prosemirror-state "^1.0.0" prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.2.tgz#a85c2dbf66ccc114ab35d8dac39228ed294b9b7a" - integrity sha512-uOQorJr20qVvqp2hs2RdWtWoidQxJ1ceE11bSmkf57XS989mdg1zKPJIp5HOHfY8/KjXPn3cLZqUYYwRrfBBPw== + version "1.18.3" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.3.tgz#d1026a78cff928fd600e90d87cf7d162e0a4e3fd" + integrity sha512-yUVejauEY3F1r7PDy4UJKEGeIU+KFc71JQl5sNvG66CLVdKXRjhWpBW6KMeduGsmGOsw85f6EGrs6QxIKOVILA== dependencies: orderedmap "^2.0.0" @@ -8151,9 +8189,9 @@ refa@^0.9.0: regexpp "^3.2.0" regenerator-runtime@^0.13.10: - version "0.13.10" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee" - integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw== + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== regexp-ast-analysis@^0.2.3: version "0.2.4" @@ -8517,14 +8555,12 @@ sass-formatter@^0.7.5: dependencies: suf-log "^2.5.3" -sass@^1.56.1: - version "1.56.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7" - integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ== +sass@1.32.13: + version "1.32.13" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00" + integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA== dependencies: chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" scslre@^0.1.6: version "0.1.6" @@ -8773,7 +8809,7 @@ sort-package-json@^2.1.0: is-plain-obj "^4.1.0" sort-object-keys "^1.1.3" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -9687,17 +9723,17 @@ vfile-location@^4.0.0: vfile "^5.0.0" vfile-message@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.2.tgz#a2908f64d9e557315ec9d7ea3a910f658ac05f7d" - integrity sha512-QjSNP6Yxzyycd4SVOtmKKyTsSvClqBPJcd00Z0zuPj3hOIjg0rUPG6DbFGPvUKRgYyaIWLPKpuEclcuvb3H8qA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.1.3.tgz#1360c27a99234bebf7bddbbbca67807115e6b0dd" + integrity sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA== dependencies: "@types/unist" "^2.0.0" unist-util-stringify-position "^3.0.0" vfile@^5.0.0, vfile@^5.3.2: - version "5.3.5" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.5.tgz#ec2e206b1414f561c85b7972bb1eeda8ab47ee61" - integrity sha512-U1ho2ga33eZ8y8pkbQLH54uKqGhFJ6GYIHnnG5AhRpAh3OWjkrRHKa/KogbmQn8We+c0KVV3rTOgR9V/WowbXQ== + version "5.3.6" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.3.6.tgz#61b2e70690cc835a5d0d0fd135beae74e5a39546" + integrity sha512-ADBsmerdGBs2WYckrLBEmuETSPyTD4TuLxTrw0DvjirxW1ra4ZwkbzG8ndsv3Q57smvHxo677MHaQrY9yxH8cA== dependencies: "@types/unist" "^2.0.0" is-buffer "^2.0.0"