diff --git a/apps/decap/src/main.tsx b/apps/decap/src/main.tsx
index 24cfa23e2..9a4fae0f0 100644
--- a/apps/decap/src/main.tsx
+++ b/apps/decap/src/main.tsx
@@ -1,4 +1,4 @@
-import { PreviewDecapPageQuery } from '@custom/schema';
+import { PreviewDecapPageQuery, ViewPageQuery } from '@custom/schema';
import { registerExecutor } from '@custom/ui';
import { Page } from '@custom/ui/routes/Page';
import CMS from 'decap-cms-app';
@@ -67,7 +67,7 @@ CMS.registerPreviewTemplate(
PreviewDecapPageQuery,
pageSchema,
(data) => {
- registerExecutor(PreviewDecapPageQuery, data);
+ registerExecutor(ViewPageQuery, { page: data.preview });
return ;
},
'previewDecapPage',
diff --git a/apps/website/src/preview/page.tsx b/apps/website/src/preview/page.tsx
index 53d48009e..3668826be 100644
--- a/apps/website/src/preview/page.tsx
+++ b/apps/website/src/preview/page.tsx
@@ -8,28 +8,21 @@ import { usePreviewParameters } from '../utils/preview';
const previewExecutor = drupalExecutor(
`${process.env.GATSBY_DRUPAL_URL}/graphql`,
+ false,
);
export default function PagePreview() {
const { nid, rid, lang } = usePreviewParameters();
-
- registerExecutor(ViewPageQuery, () => {
- return new Promise((resolve, reject) => {
- if (nid && rid && lang) {
- previewExecutor(PreviewDrupalPageQuery, {
- id: nid,
- locale: lang,
- rid,
- })
- .then((result) => {
- if (result.preview) {
- resolve({ page: result.preview });
- }
- return;
- })
- .catch((error) => reject(error));
- }
+ if (nid && rid && lang) {
+ registerExecutor(ViewPageQuery, async () => {
+ const data = await previewExecutor(PreviewDrupalPageQuery, {
+ id: nid,
+ locale: lang,
+ rid,
+ });
+ return { page: data.preview };
});
- });
- return ;
+ return ;
+ }
+ return null;
}
diff --git a/apps/website/src/utils/drupal-executor.ts b/apps/website/src/utils/drupal-executor.ts
index 3335abe26..8d6c85a25 100644
--- a/apps/website/src/utils/drupal-executor.ts
+++ b/apps/website/src/utils/drupal-executor.ts
@@ -17,9 +17,8 @@ export type OperationVariables> =
/**
* Create an executor that operates against a Drupal endpoint.
- * TODO: Fix typing after moving Operation types into executors package.
*/
-export function drupalExecutor(endpoint: string) {
+export function drupalExecutor(endpoint: string, forward: boolean = true) {
return async function (
id: OperationId,
variables?: OperationVariables,
@@ -30,11 +29,13 @@ export function drupalExecutor(endpoint: string) {
const { data, errors } = await (
await fetch(url, {
credentials: 'include',
- headers: {
- 'SLB-Forwarded-Proto': window.location.protocol.slice(0, -1),
- 'SLB-Forwarded-Host': window.location.hostname,
- 'SLB-Forwarded-Port': window.location.port,
- },
+ headers: forward
+ ? {
+ 'SLB-Forwarded-Proto': window.location.protocol.slice(0, -1),
+ 'SLB-Forwarded-Host': window.location.hostname,
+ 'SLB-Forwarded-Port': window.location.port,
+ }
+ : {},
})
).json();
if (errors) {
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 113772f8e..22da512f6 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -165,8 +165,9 @@ input PaginationInput {
}
type Query {
- previewDecapPage: Page
- previewDrupalPage(id: ID!, rid: ID, locale: String!): Page
+ previewDecapPage: DecapPage
+ previewDrupalPage(id: ID!, rid: ID, locale: String!): DrupalPage
+ @fetchEntity(type: "node", id: "$id", rid: "$rid", language: "$locale")
mainNavigations: [MainNavigation] @gatsbyNodes(type: "MainNavigation")
footerNavigations: [FooterNavigation] @gatsbyNodes(type: "FooterNavigation")
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bdbaf596f..9cf43e9c0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -336,13 +336,13 @@ importers:
devDependencies:
'@amazeelabs/eslint-config':
specifier: ^1.4.43
- version: 1.4.43(eslint@8.56.0)(tailwindcss@3.3.2)(typescript@5.3.3)
+ version: 1.4.43(eslint@7.32.0)(tailwindcss@3.3.2)(typescript@5.3.3)
'@amazeelabs/prettier-config':
specifier: ^1.1.3
version: 1.1.3(prettier@2.8.8)
eslint:
- specifier: ^8.43.0
- version: 8.56.0
+ specifier: '7'
+ version: 7.32.0
prettier:
specifier: ^2.8.8
version: 2.8.8
@@ -795,12 +795,11 @@ packages:
/@amazeelabs/eslint-config@1.4.43(eslint@7.32.0)(tailwindcss@3.3.2)(typescript@5.3.3):
resolution: {integrity: sha512-PsXbfV/R1Xu26ToEZFrnJKzC6MlTH2MLV4XbyX9nT4CO9Y+SHbDJu9qUeXYENbUYED1TyRv6BsCw+NEmRBg39A==}
- requiresBuild: true
peerDependencies:
eslint: ^8.36.0
dependencies:
'@typescript-eslint/eslint-plugin': 5.60.1(@typescript-eslint/parser@5.60.1)(eslint@7.32.0)(typescript@5.3.3)
- '@typescript-eslint/parser': 5.60.1(eslint@7.32.0)(typescript@5.1.6)
+ '@typescript-eslint/parser': 5.60.1(eslint@7.32.0)(typescript@5.3.3)
eslint: 7.32.0
eslint-config-prettier: 8.8.0(eslint@7.32.0)
eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.60.1)(eslint@7.32.0)
@@ -816,32 +815,6 @@ packages:
- supports-color
- tailwindcss
- typescript
- dev: false
- optional: true
-
- /@amazeelabs/eslint-config@1.4.43(eslint@8.56.0)(tailwindcss@3.3.2)(typescript@5.3.3):
- resolution: {integrity: sha512-PsXbfV/R1Xu26ToEZFrnJKzC6MlTH2MLV4XbyX9nT4CO9Y+SHbDJu9qUeXYENbUYED1TyRv6BsCw+NEmRBg39A==}
- peerDependencies:
- eslint: ^8.36.0
- dependencies:
- '@typescript-eslint/eslint-plugin': 5.60.1(@typescript-eslint/parser@5.60.1)(eslint@8.56.0)(typescript@5.3.3)
- '@typescript-eslint/parser': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- eslint: 8.56.0
- eslint-config-prettier: 8.8.0(eslint@8.56.0)
- eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.60.1)(eslint@8.56.0)
- eslint-plugin-no-only-tests: 3.1.0
- eslint-plugin-promise: 6.1.1(eslint@8.56.0)
- eslint-plugin-react: 7.32.2(eslint@8.56.0)
- eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0)
- eslint-plugin-simple-import-sort: 10.0.0(eslint@8.56.0)
- eslint-plugin-tailwindcss: 3.13.0(tailwindcss@3.3.2)
- transitivePeerDependencies:
- - eslint-import-resolver-typescript
- - eslint-import-resolver-webpack
- - supports-color
- - tailwindcss
- - typescript
- dev: true
/@amazeelabs/gatsby-silverback-cloudinary@1.2.5:
resolution: {integrity: sha512-EwaakDLR0TAcYiYcf3ntu5MqbNrCZVjh9Qq215jofmvoFK91qFzD8+rnUiGvTMfyWsCsI+tIXRpK81R0Lt4wjA==}
@@ -4580,22 +4553,6 @@ packages:
eslint: 7.32.0
eslint-visitor-keys: 3.4.3
- /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0):
- resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- requiresBuild: true
- peerDependencies:
- eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
- dependencies:
- eslint: 8.56.0
- eslint-visitor-keys: 3.4.3
- dev: true
-
- /@eslint-community/regexpp@4.10.0:
- resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==}
- engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
- dev: true
-
/@eslint-community/regexpp@4.5.1:
resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -4618,28 +4575,6 @@ packages:
transitivePeerDependencies:
- supports-color
- /@eslint/eslintrc@2.1.4:
- resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dependencies:
- ajv: 6.12.6
- debug: 4.3.4
- espree: 9.6.1
- globals: 13.20.0
- ignore: 5.2.4
- import-fresh: 3.3.0
- js-yaml: 4.1.0
- minimatch: 3.1.2
- strip-json-comments: 3.1.1
- transitivePeerDependencies:
- - supports-color
- dev: true
-
- /@eslint/js@8.56.0:
- resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dev: true
-
/@fal-works/esbuild-plugin-global-externals@2.1.2:
resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
dev: true
@@ -5699,17 +5634,6 @@ packages:
react-hook-form: 7.45.1(react@18.2.0)
dev: false
- /@humanwhocodes/config-array@0.11.13:
- resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==}
- engines: {node: '>=10.10.0'}
- dependencies:
- '@humanwhocodes/object-schema': 2.0.1
- debug: 4.3.4
- minimatch: 3.1.2
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/@humanwhocodes/config-array@0.5.0:
resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==}
engines: {node: '>=10.10.0'}
@@ -5721,11 +5645,6 @@ packages:
transitivePeerDependencies:
- supports-color
- /@humanwhocodes/module-importer@1.0.1:
- resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
- engines: {node: '>=12.22'}
- dev: true
-
/@humanwhocodes/momoa@2.0.4:
resolution: {integrity: sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==}
engines: {node: '>=10.10.0'}
@@ -5735,10 +5654,6 @@ packages:
resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
requiresBuild: true
- /@humanwhocodes/object-schema@2.0.1:
- resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==}
- dev: true
-
/@iarna/toml@2.2.5:
resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==}
dev: false
@@ -10682,7 +10597,7 @@ packages:
optional: true
dependencies:
'@eslint-community/regexpp': 4.5.1
- '@typescript-eslint/parser': 5.60.1(eslint@7.32.0)(typescript@5.1.6)
+ '@typescript-eslint/parser': 5.60.1(eslint@7.32.0)(typescript@5.3.3)
'@typescript-eslint/scope-manager': 5.60.1
'@typescript-eslint/type-utils': 5.60.1(eslint@7.32.0)(typescript@5.3.3)
'@typescript-eslint/utils': 5.60.1(eslint@7.32.0)(typescript@5.3.3)
@@ -10696,37 +10611,6 @@ packages:
typescript: 5.3.3
transitivePeerDependencies:
- supports-color
- dev: false
- optional: true
-
- /@typescript-eslint/eslint-plugin@5.60.1(@typescript-eslint/parser@5.60.1)(eslint@8.56.0)(typescript@5.3.3):
- resolution: {integrity: sha512-KSWsVvsJsLJv3c4e73y/Bzt7OpqMCADUO846bHcuWYSYM19bldbAeDv7dYyV0jwkbMfJ2XdlzwjhXtuD7OY6bw==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- requiresBuild: true
- peerDependencies:
- '@typescript-eslint/parser': ^5.0.0
- eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@eslint-community/regexpp': 4.5.1
- '@typescript-eslint/parser': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- '@typescript-eslint/scope-manager': 5.60.1
- '@typescript-eslint/type-utils': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- '@typescript-eslint/utils': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- debug: 4.3.4
- eslint: 8.56.0
- grapheme-splitter: 1.0.4
- ignore: 5.2.4
- natural-compare-lite: 1.4.0
- semver: 7.5.4
- tsutils: 3.21.0(typescript@5.3.3)
- typescript: 5.3.3
- transitivePeerDependencies:
- - supports-color
- dev: true
/@typescript-eslint/eslint-plugin@6.0.0(@typescript-eslint/parser@6.0.0)(eslint@7.32.0)(typescript@5.1.6):
resolution: {integrity: sha512-xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A==}
@@ -10800,7 +10684,7 @@ packages:
transitivePeerDependencies:
- supports-color
- /@typescript-eslint/parser@5.60.1(eslint@8.56.0)(typescript@5.3.3):
+ /@typescript-eslint/parser@5.60.1(eslint@7.32.0)(typescript@5.3.3):
resolution: {integrity: sha512-pHWlc3alg2oSMGwsU/Is8hbm3XFbcrb6P5wIxcQW9NsYBfnrubl/GhVVD/Jm/t8HXhA2WncoIRfBtnCgRGV96Q==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
requiresBuild: true
@@ -10815,11 +10699,10 @@ packages:
'@typescript-eslint/types': 5.60.1
'@typescript-eslint/typescript-estree': 5.60.1(typescript@5.3.3)
debug: 4.3.4
- eslint: 8.56.0
+ eslint: 7.32.0
typescript: 5.3.3
transitivePeerDependencies:
- supports-color
- dev: true
/@typescript-eslint/parser@6.0.0(eslint@7.32.0)(typescript@5.1.6):
resolution: {integrity: sha512-TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg==}
@@ -10918,29 +10801,6 @@ packages:
typescript: 5.3.3
transitivePeerDependencies:
- supports-color
- dev: false
- optional: true
-
- /@typescript-eslint/type-utils@5.60.1(eslint@8.56.0)(typescript@5.3.3):
- resolution: {integrity: sha512-vN6UztYqIu05nu7JqwQGzQKUJctzs3/Hg7E2Yx8rz9J+4LgtIDFWjjl1gm3pycH0P3mHAcEUBd23LVgfrsTR8A==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- requiresBuild: true
- peerDependencies:
- eslint: '*'
- typescript: '*'
- peerDependenciesMeta:
- typescript:
- optional: true
- dependencies:
- '@typescript-eslint/typescript-estree': 5.60.1(typescript@5.3.3)
- '@typescript-eslint/utils': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- debug: 4.3.4
- eslint: 8.56.0
- tsutils: 3.21.0(typescript@5.3.3)
- typescript: 5.3.3
- transitivePeerDependencies:
- - supports-color
- dev: true
/@typescript-eslint/type-utils@6.0.0(eslint@7.32.0)(typescript@5.1.6):
resolution: {integrity: sha512-ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ==}
@@ -11165,29 +11025,6 @@ packages:
transitivePeerDependencies:
- supports-color
- typescript
- dev: false
- optional: true
-
- /@typescript-eslint/utils@5.60.1(eslint@8.56.0)(typescript@5.3.3):
- resolution: {integrity: sha512-tiJ7FFdFQOWssFa3gqb94Ilexyw0JVxj6vBzaSpfN/8IhoKkDuSAenUKvsSHw2A/TMpJb26izIszTXaqygkvpQ==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- requiresBuild: true
- peerDependencies:
- eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
- dependencies:
- '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
- '@types/json-schema': 7.0.12
- '@types/semver': 7.5.0
- '@typescript-eslint/scope-manager': 5.60.1
- '@typescript-eslint/types': 5.60.1
- '@typescript-eslint/typescript-estree': 5.60.1(typescript@5.3.3)
- eslint: 8.56.0
- eslint-scope: 5.1.1
- semver: 7.5.4
- transitivePeerDependencies:
- - supports-color
- - typescript
- dev: true
/@typescript-eslint/utils@6.0.0(eslint@7.32.0)(typescript@5.1.6):
resolution: {integrity: sha512-SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ==}
@@ -11214,7 +11051,7 @@ packages:
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
dependencies:
'@typescript-eslint/types': 5.59.0
- eslint-visitor-keys: 3.4.1
+ eslint-visitor-keys: 3.4.3
dev: true
/@typescript-eslint/visitor-keys@5.60.1:
@@ -11230,11 +11067,7 @@ packages:
engines: {node: ^16.0.0 || >=18.0.0}
dependencies:
'@typescript-eslint/types': 6.0.0
- eslint-visitor-keys: 3.4.1
- dev: true
-
- /@ungap/structured-clone@1.2.0:
- resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
+ eslint-visitor-keys: 3.4.3
dev: true
/@vercel/nft@0.22.6:
@@ -11244,7 +11077,7 @@ packages:
dependencies:
'@mapbox/node-pre-gyp': 1.0.10
'@rollup/pluginutils': 4.2.1
- acorn: 8.9.0
+ acorn: 8.11.2
async-sema: 3.1.1
bindings: 1.5.0
estree-walker: 2.0.2
@@ -11265,7 +11098,7 @@ packages:
dependencies:
'@mapbox/node-pre-gyp': 1.0.10(supports-color@9.4.0)
'@rollup/pluginutils': 4.2.1
- acorn: 8.9.0
+ acorn: 8.11.2
async-sema: 3.1.1
bindings: 1.5.0
estree-walker: 2.0.2
@@ -12068,12 +11901,12 @@ packages:
mime-types: 2.1.35
negotiator: 0.6.3
- /acorn-import-assertions@1.9.0(acorn@8.9.0):
+ /acorn-import-assertions@1.9.0(acorn@8.11.2):
resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
peerDependencies:
acorn: ^8
dependencies:
- acorn: 8.9.0
+ acorn: 8.11.2
/acorn-jsx@5.3.2(acorn@7.4.1):
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
@@ -12083,20 +11916,11 @@ packages:
dependencies:
acorn: 7.4.1
- /acorn-jsx@5.3.2(acorn@8.11.2):
- resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
- requiresBuild: true
- peerDependencies:
- acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
- dependencies:
- acorn: 8.11.2
- dev: true
-
/acorn-loose@8.3.0:
resolution: {integrity: sha512-75lAs9H19ldmW+fAbyqHdjgdCrz0pWGXKmnqFoh8PyVd1L2RIb4RzYrSjmopeqv3E1G3/Pimu6GgLlrGbrkF7w==}
engines: {node: '>=0.4.0'}
dependencies:
- acorn: 8.9.0
+ acorn: 8.11.2
/acorn-walk@7.2.0:
resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
@@ -12128,6 +11952,7 @@ packages:
resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
engines: {node: '>=0.4.0'}
hasBin: true
+ requiresBuild: true
/acorn@8.9.0:
resolution: {integrity: sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==}
@@ -17023,16 +16848,6 @@ packages:
dependencies:
eslint: 7.32.0
- /eslint-config-prettier@8.8.0(eslint@8.56.0):
- resolution: {integrity: sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==}
- hasBin: true
- requiresBuild: true
- peerDependencies:
- eslint: '>=7.0.0'
- dependencies:
- eslint: 8.56.0
- dev: true
-
/eslint-config-react-app@6.0.0(@typescript-eslint/eslint-plugin@5.60.1)(@typescript-eslint/parser@5.60.1)(babel-eslint@10.1.0)(eslint-plugin-flowtype@5.10.0)(eslint-plugin-import@2.27.5)(eslint-plugin-jsx-a11y@6.7.1)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.32.2)(eslint@7.32.0)(typescript@4.9.5):
resolution: {integrity: sha512-bpoAAC+YRfzq0dsTk+6v9aHm/uqnDwayNAXleMypGl6CpxI9oXXscVHo4fk3eJPIn+rsbtNetB4r/ZIidFIE8A==}
engines: {node: ^10.12.0 || >=12.0.0}
@@ -17144,35 +16959,6 @@ packages:
transitivePeerDependencies:
- supports-color
- /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.60.1)(eslint-import-resolver-node@0.3.7)(eslint@8.56.0):
- resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==}
- engines: {node: '>=4'}
- peerDependencies:
- '@typescript-eslint/parser': '*'
- eslint: '*'
- eslint-import-resolver-node: '*'
- eslint-import-resolver-typescript: '*'
- eslint-import-resolver-webpack: '*'
- peerDependenciesMeta:
- '@typescript-eslint/parser':
- optional: true
- eslint:
- optional: true
- eslint-import-resolver-node:
- optional: true
- eslint-import-resolver-typescript:
- optional: true
- eslint-import-resolver-webpack:
- optional: true
- dependencies:
- '@typescript-eslint/parser': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- debug: 3.2.7
- eslint: 8.56.0
- eslint-import-resolver-node: 0.3.7
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/eslint-plugin-flowtype@5.10.0(eslint@7.32.0):
resolution: {integrity: sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==}
engines: {node: ^10.12.0 || >=12.0.0}
@@ -17238,40 +17024,6 @@ packages:
- eslint-import-resolver-webpack
- supports-color
- /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.60.1)(eslint@8.56.0):
- resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==}
- engines: {node: '>=4'}
- requiresBuild: true
- peerDependencies:
- '@typescript-eslint/parser': '*'
- eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
- peerDependenciesMeta:
- '@typescript-eslint/parser':
- optional: true
- dependencies:
- '@typescript-eslint/parser': 5.60.1(eslint@8.56.0)(typescript@5.3.3)
- array-includes: 3.1.6
- array.prototype.flat: 1.3.1
- array.prototype.flatmap: 1.3.1
- debug: 3.2.7
- doctrine: 2.1.0
- eslint: 8.56.0
- eslint-import-resolver-node: 0.3.7
- eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.60.1)(eslint-import-resolver-node@0.3.7)(eslint@8.56.0)
- has: 1.0.3
- is-core-module: 2.12.1
- is-glob: 4.0.3
- minimatch: 3.1.2
- object.values: 1.1.6
- resolve: 1.22.2
- semver: 6.3.1
- tsconfig-paths: 3.14.2
- transitivePeerDependencies:
- - eslint-import-resolver-typescript
- - eslint-import-resolver-webpack
- - supports-color
- dev: true
-
/eslint-plugin-jsx-a11y@6.7.1(eslint@7.32.0):
resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
engines: {node: '>=4.0'}
@@ -17310,16 +17062,6 @@ packages:
dependencies:
eslint: 7.32.0
- /eslint-plugin-promise@6.1.1(eslint@8.56.0):
- resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- requiresBuild: true
- peerDependencies:
- eslint: ^7.0.0 || ^8.0.0
- dependencies:
- eslint: 8.56.0
- dev: true
-
/eslint-plugin-react-hooks@4.6.0(eslint@7.32.0):
resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
engines: {node: '>=10'}
@@ -17329,16 +17071,6 @@ packages:
dependencies:
eslint: 7.32.0
- /eslint-plugin-react-hooks@4.6.0(eslint@8.56.0):
- resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==}
- engines: {node: '>=10'}
- requiresBuild: true
- peerDependencies:
- eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
- dependencies:
- eslint: 8.56.0
- dev: true
-
/eslint-plugin-react@7.32.2(eslint@7.32.0):
resolution: {integrity: sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==}
engines: {node: '>=4'}
@@ -17363,31 +17095,6 @@ packages:
semver: 6.3.1
string.prototype.matchall: 4.0.8
- /eslint-plugin-react@7.32.2(eslint@8.56.0):
- resolution: {integrity: sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==}
- engines: {node: '>=4'}
- requiresBuild: true
- peerDependencies:
- eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
- dependencies:
- array-includes: 3.1.6
- array.prototype.flatmap: 1.3.1
- array.prototype.tosorted: 1.1.1
- doctrine: 2.1.0
- eslint: 8.56.0
- estraverse: 5.3.0
- jsx-ast-utils: 3.3.4
- minimatch: 3.1.2
- object.entries: 1.1.6
- object.fromentries: 2.0.6
- object.hasown: 1.1.2
- object.values: 1.1.6
- prop-types: 15.8.1
- resolve: 2.0.0-next.4
- semver: 6.3.1
- string.prototype.matchall: 4.0.8
- dev: true
-
/eslint-plugin-simple-import-sort@10.0.0(eslint@7.32.0):
resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
requiresBuild: true
@@ -17396,15 +17103,6 @@ packages:
dependencies:
eslint: 7.32.0
- /eslint-plugin-simple-import-sort@10.0.0(eslint@8.56.0):
- resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==}
- requiresBuild: true
- peerDependencies:
- eslint: '>=5.0.0'
- dependencies:
- eslint: 8.56.0
- dev: true
-
/eslint-plugin-storybook@0.6.12(eslint@7.32.0)(typescript@5.1.6):
resolution: {integrity: sha512-XbIvrq6hNVG6rpdBr+eBw63QhOMLpZneQVSooEDow8aQCWGCk/5vqtap1yxpVydNfSxi3S/3mBBRLQqKUqQRww==}
engines: {node: 12.x || 14.x || >= 16}
@@ -17440,14 +17138,6 @@ packages:
esrecurse: 4.3.0
estraverse: 4.3.0
- /eslint-scope@7.2.2:
- resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dependencies:
- esrecurse: 4.3.0
- estraverse: 5.3.0
- dev: true
-
/eslint-utils@2.1.0:
resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
engines: {node: '>=6'}
@@ -17465,15 +17155,10 @@ packages:
engines: {node: '>=10'}
requiresBuild: true
- /eslint-visitor-keys@3.4.1:
- resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- requiresBuild: true
- dev: true
-
/eslint-visitor-keys@3.4.3:
resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+ requiresBuild: true
/eslint-webpack-plugin@2.7.0(eslint@7.32.0)(webpack@5.88.1):
resolution: {integrity: sha512-bNaVVUvU4srexGhVcayn/F4pJAz19CWBkKoMx7aSQ4wtTbZQCnG5O9LHCE42mM+JSKOUp7n6vd5CIwzj7lOVGA==}
@@ -17540,53 +17225,6 @@ packages:
transitivePeerDependencies:
- supports-color
- /eslint@8.56.0:
- resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- hasBin: true
- dependencies:
- '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0)
- '@eslint-community/regexpp': 4.10.0
- '@eslint/eslintrc': 2.1.4
- '@eslint/js': 8.56.0
- '@humanwhocodes/config-array': 0.11.13
- '@humanwhocodes/module-importer': 1.0.1
- '@nodelib/fs.walk': 1.2.8
- '@ungap/structured-clone': 1.2.0
- ajv: 6.12.6
- chalk: 4.1.2
- cross-spawn: 7.0.3
- debug: 4.3.4
- doctrine: 3.0.0
- escape-string-regexp: 4.0.0
- eslint-scope: 7.2.2
- eslint-visitor-keys: 3.4.3
- espree: 9.6.1
- esquery: 1.5.0
- esutils: 2.0.3
- fast-deep-equal: 3.1.3
- file-entry-cache: 6.0.1
- find-up: 5.0.0
- glob-parent: 6.0.2
- globals: 13.20.0
- graphemer: 1.4.0
- ignore: 5.2.4
- imurmurhash: 0.1.4
- is-glob: 4.0.3
- is-path-inside: 3.0.3
- js-yaml: 4.1.0
- json-stable-stringify-without-jsonify: 1.0.1
- levn: 0.4.1
- lodash.merge: 4.6.2
- minimatch: 3.1.2
- natural-compare: 1.4.0
- optionator: 0.9.3
- strip-ansi: 6.0.1
- text-table: 0.2.0
- transitivePeerDependencies:
- - supports-color
- dev: true
-
/espree@7.3.1:
resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==}
engines: {node: ^10.12.0 || >=12.0.0}
@@ -17596,15 +17234,6 @@ packages:
acorn-jsx: 5.3.2(acorn@7.4.1)
eslint-visitor-keys: 1.3.0
- /espree@9.6.1:
- resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
- engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- dependencies:
- acorn: 8.11.2
- acorn-jsx: 5.3.2(acorn@8.11.2)
- eslint-visitor-keys: 3.4.3
- dev: true
-
/esprima@4.0.1:
resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
engines: {node: '>=4'}
@@ -30598,7 +30227,7 @@ packages:
hasBin: true
dependencies:
'@jridgewell/source-map': 0.3.3
- acorn: 8.9.0
+ acorn: 8.11.2
commander: 2.20.3
source-map-support: 0.5.21
@@ -31626,7 +31255,7 @@ packages:
/unplugin@1.4.0:
resolution: {integrity: sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==}
dependencies:
- acorn: 8.9.0
+ acorn: 8.11.2
chokidar: 3.5.3
webpack-sources: 3.2.3
webpack-virtual-modules: 0.5.0
@@ -32234,7 +31863,7 @@ packages:
'@vitest/snapshot': 0.32.2
'@vitest/spy': 0.32.2
'@vitest/utils': 0.32.2
- acorn: 8.9.0
+ acorn: 8.11.2
acorn-walk: 8.2.0
cac: 6.7.14
chai: 4.3.7
@@ -32325,7 +31954,6 @@ packages:
- sugarss
- supports-color
- terser
- dev: false
optional: true
/vitest@0.32.2(happy-dom@9.20.3):
@@ -32367,7 +31995,7 @@ packages:
'@vitest/snapshot': 0.32.2
'@vitest/spy': 0.32.2
'@vitest/utils': 0.32.2
- acorn: 8.9.0
+ acorn: 8.11.2
acorn-walk: 8.2.0
cac: 6.7.14
chai: 4.3.7
@@ -32706,8 +32334,8 @@ packages:
'@webassemblyjs/ast': 1.11.6
'@webassemblyjs/wasm-edit': 1.11.6
'@webassemblyjs/wasm-parser': 1.11.6
- acorn: 8.9.0
- acorn-import-assertions: 1.9.0(acorn@8.9.0)
+ acorn: 8.11.2
+ acorn-import-assertions: 1.9.0(acorn@8.11.2)
browserslist: 4.21.9
chrome-trace-event: 1.0.3
enhanced-resolve: 5.15.0
@@ -32746,8 +32374,8 @@ packages:
'@webassemblyjs/ast': 1.11.6
'@webassemblyjs/wasm-edit': 1.11.6
'@webassemblyjs/wasm-parser': 1.11.6
- acorn: 8.9.0
- acorn-import-assertions: 1.9.0(acorn@8.9.0)
+ acorn: 8.11.2
+ acorn-import-assertions: 1.9.0(acorn@8.11.2)
browserslist: 4.21.9
chrome-trace-event: 1.0.3
enhanced-resolve: 5.15.0