From 7a3558ecac75283e8f87af6b690c6f7607b00a6e Mon Sep 17 00:00:00 2001 From: Pooria Mehregan Date: Fri, 22 Sep 2023 12:43:37 +0200 Subject: [PATCH 1/6] refactor(concept): move page components to sub-folder --- .../components/details-page/index.tsx | 9 +- .../ContactPoint/index.tsx | 44 +++ .../concept-details-page/Created/index.tsx | 31 ++ .../Description/index.tsx | 70 ++++ .../{ => Description}/styled.ts | 0 .../concept-details-page/Example/index.tsx | 21 ++ .../concept-details-page/Identifier/index.tsx | 18 + .../concept-details-page/Range/index.tsx | 22 ++ .../RelationsList/index.tsx | 51 +++ .../concept-details-page/Remark/index.tsx | 25 ++ .../SubjectAndApplication/index.tsx | 60 ++++ .../concept-details-page/Terms/index.tsx | 60 ++++ .../concept-details-page/Validity/index.tsx | 38 ++ src/pages/concept-details-page/index.tsx | 324 ++++-------------- 14 files changed, 504 insertions(+), 269 deletions(-) create mode 100644 src/pages/concept-details-page/ContactPoint/index.tsx create mode 100644 src/pages/concept-details-page/Created/index.tsx create mode 100644 src/pages/concept-details-page/Description/index.tsx rename src/pages/concept-details-page/{ => Description}/styled.ts (100%) create mode 100644 src/pages/concept-details-page/Example/index.tsx create mode 100644 src/pages/concept-details-page/Identifier/index.tsx create mode 100644 src/pages/concept-details-page/Range/index.tsx create mode 100644 src/pages/concept-details-page/RelationsList/index.tsx create mode 100644 src/pages/concept-details-page/Remark/index.tsx create mode 100644 src/pages/concept-details-page/SubjectAndApplication/index.tsx create mode 100644 src/pages/concept-details-page/Terms/index.tsx create mode 100644 src/pages/concept-details-page/Validity/index.tsx diff --git a/src/components/details-page/components/details-page/index.tsx b/src/components/details-page/components/details-page/index.tsx index 3811ffb64..6dde72fab 100755 --- a/src/components/details-page/components/details-page/index.tsx +++ b/src/components/details-page/components/details-page/index.tsx @@ -60,7 +60,6 @@ import withCommunity, { Props as CommunityProps } from '../../../with-community'; import Aside from '../aside'; -import RelationsContainer from '../../../../pages/concept-details-page/RelatedConcepts'; interface ExternalProps { entity: Entity; @@ -213,13 +212,7 @@ const DetailsPage: FC> = ({ const renderContentSections = () => contentSections - .map( - child => - isValidElement(child) && - (child.type === ContentSection || child.type === RelationsContainer - ? child - : null) - ) + .map(child => (isValidElement(child) ? child : null)) ?.filter(Boolean); const renderAside = () => diff --git a/src/pages/concept-details-page/ContactPoint/index.tsx b/src/pages/concept-details-page/ContactPoint/index.tsx new file mode 100644 index 000000000..75d2f7abf --- /dev/null +++ b/src/pages/concept-details-page/ContactPoint/index.tsx @@ -0,0 +1,44 @@ +import React from 'react'; +import { + ContentSection, + KeyValueList, + KeyValueListItem +} from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import { ConceptContactPoint } from '../../../types'; + +interface Props { + contactPoint: Partial; +} + +const ContactPoint = ({ contactPoint }: Props) => ( + + + {contactPoint.email && ( + + {contactPoint.email} + + } + /> + )} + {contactPoint.telephone && ( + + )} + + +); + +export default ContactPoint; diff --git a/src/pages/concept-details-page/Created/index.tsx b/src/pages/concept-details-page/Created/index.tsx new file mode 100644 index 000000000..a01f9e267 --- /dev/null +++ b/src/pages/concept-details-page/Created/index.tsx @@ -0,0 +1,31 @@ +import React from 'react'; +import { + ContentSection, + KeyValueList, + KeyValueListItem +} from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import { formatISO } from '../../../utils/date'; + +interface Props { + created: string; +} + +const Created = ({ created }: Props) => ( + + {created && ( + + + + )} + +); + +export default Created; diff --git a/src/pages/concept-details-page/Description/index.tsx b/src/pages/concept-details-page/Description/index.tsx new file mode 100644 index 000000000..b3d347987 --- /dev/null +++ b/src/pages/concept-details-page/Description/index.tsx @@ -0,0 +1,70 @@ +import React from 'react'; +import Link from '@fellesdatakatalog/link'; +import { ContentSection } from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import MultiLingualField from '../../../components/multilingual-field'; +import SC from './styled'; +import { getTranslateText as translate } from '../../../lib/translateText'; +import { Language } from '../../../types/domain'; + +interface Props { + description: Record; + selectedLanguages: Language[] | []; + sources: Array<{ text?: string; uri?: string }>; + sourceRelationship: string | undefined; +} + +const Description = ({ + description, + sources, + sourceRelationship, + selectedLanguages +}: Props) => { + const renderSources = () => { + if (sourceRelationship === 'egendefinert') { + return `${translations.compare.source}: ${translations.sourceRelationship[sourceRelationship]}`; + } + + return sources?.length ? ( + <> + + {`${translations.compare.source}: ${ + sourceRelationship + ? translations.sourceRelationship[sourceRelationship] + : '' + }`} + + {sources.map(({ text, uri }, index) => ( + + {index > 0 && ','} +   + {uri ? ( + + {translate(text) || uri} + + ) : ( + translate(text) + )} + + ))} + + ) : null; + }; + + return ( + + + {renderSources()} + + ); +}; + +export default Description; diff --git a/src/pages/concept-details-page/styled.ts b/src/pages/concept-details-page/Description/styled.ts similarity index 100% rename from src/pages/concept-details-page/styled.ts rename to src/pages/concept-details-page/Description/styled.ts diff --git a/src/pages/concept-details-page/Example/index.tsx b/src/pages/concept-details-page/Example/index.tsx new file mode 100644 index 000000000..47d0e72d8 --- /dev/null +++ b/src/pages/concept-details-page/Example/index.tsx @@ -0,0 +1,21 @@ +import React from 'react'; +import { ContentSection } from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import MultiLingualField from '../../../components/multilingual-field'; +import { Language, TextLanguage } from '../../../types'; + +interface Props { + example: Partial; + selectedLanguages: Language[]; +} + +const Example = ({ example, selectedLanguages }: Props) => ( + + + +); + +export default Example; diff --git a/src/pages/concept-details-page/Identifier/index.tsx b/src/pages/concept-details-page/Identifier/index.tsx new file mode 100644 index 000000000..84b7dc631 --- /dev/null +++ b/src/pages/concept-details-page/Identifier/index.tsx @@ -0,0 +1,18 @@ +import React from 'react'; +import { ContentSection } from '../../../components/details-page'; +import translations from '../../../lib/localization'; + +interface Props { + identifier: string; +} + +const Identifier = ({ identifier }: Props) => ( + + {identifier} + +); + +export default Identifier; diff --git a/src/pages/concept-details-page/Range/index.tsx b/src/pages/concept-details-page/Range/index.tsx new file mode 100644 index 000000000..dea4f3387 --- /dev/null +++ b/src/pages/concept-details-page/Range/index.tsx @@ -0,0 +1,22 @@ +import React from 'react'; +import Link from '@fellesdatakatalog/link'; +import { ContentSection } from '../../../components/details-page'; +import translations from '../../../lib/localization'; + +interface Props { + range: string; + rangeUri: string; +} + +const Range = ({ range, rangeUri }: Props) => ( + + + {range} + + +); + +export default Range; diff --git a/src/pages/concept-details-page/RelationsList/index.tsx b/src/pages/concept-details-page/RelationsList/index.tsx new file mode 100644 index 000000000..fc203fc19 --- /dev/null +++ b/src/pages/concept-details-page/RelationsList/index.tsx @@ -0,0 +1,51 @@ +import React from 'react'; +import { ContentSection } from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import RelationList, { + ItemWithRelationType +} from '../../../components/relation-list'; +import { + Concept, + Dataset, + InformationModel, + PublicService +} from '../../../types'; + +interface Props { + identifier: string | undefined; + conceptsRelations: Concept[]; + datasetsRelations: Dataset[]; + publicServicesRelations: PublicService[]; + informationModelsRelations: InformationModel[]; +} + +const RelationsList = ({ + identifier, + conceptsRelations, + datasetsRelations, + publicServicesRelations, + informationModelsRelations +}: Props) => { + const publicServicesRelationsWithRelationType: ItemWithRelationType[] = + publicServicesRelations.map(relation => ({ + relation, + relationType: translations.sampleData + })); + + return ( + + + + ); +}; + +export default RelationsList; diff --git a/src/pages/concept-details-page/Remark/index.tsx b/src/pages/concept-details-page/Remark/index.tsx new file mode 100644 index 000000000..abf451da2 --- /dev/null +++ b/src/pages/concept-details-page/Remark/index.tsx @@ -0,0 +1,25 @@ +import React from 'react'; +import { ContentSection } from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import MultiLingualField from '../../../components/multilingual-field'; +import { Language, TextLanguage } from '../../../types'; + +interface Props { + remark: Partial; + selectedLanguages: Language[]; +} + +const Remark = ({ remark, selectedLanguages }: Props) => ( + + + +); + +export default Remark; diff --git a/src/pages/concept-details-page/SubjectAndApplication/index.tsx b/src/pages/concept-details-page/SubjectAndApplication/index.tsx new file mode 100644 index 000000000..1dab991cf --- /dev/null +++ b/src/pages/concept-details-page/SubjectAndApplication/index.tsx @@ -0,0 +1,60 @@ +import React from 'react'; +import { + ContentSection, + KeyValueList, + KeyValueListItem +} from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import MultiLingualField from '../../../components/multilingual-field'; +import { Language, TextLanguage } from '../../../types'; +import { languageSorter } from '../../../lib/languageSorter'; + +interface Props { + applications: Partial[]; + subjectLabels: Partial[]; + hasFieldSelectedLanguage: (field: Partial[]) => boolean; + selectedLanguages: Language[]; +} + +const SubjectAndApplication = ({ + subjectLabels, + hasFieldSelectedLanguage, + selectedLanguages, + applications +}: Props) => ( + + + {subjectLabels && hasFieldSelectedLanguage(subjectLabels) && ( + ( + + ))} + /> + )} + {applications.length > 0 && hasFieldSelectedLanguage(applications) && ( + ( + + ))} + /> + )} + + +); + +export default SubjectAndApplication; diff --git a/src/pages/concept-details-page/Terms/index.tsx b/src/pages/concept-details-page/Terms/index.tsx new file mode 100644 index 000000000..7d242981f --- /dev/null +++ b/src/pages/concept-details-page/Terms/index.tsx @@ -0,0 +1,60 @@ +import React from 'react'; +import { + ContentSection, + KeyValueList, + KeyValueListItem +} from '../../../components/details-page'; +import translations from '../../../lib/localization'; +import MultiLingualField from '../../../components/multilingual-field'; +import { Language, TextLanguage } from '../../../types'; +import { languageSorter } from '../../../lib/languageSorter'; + +interface Props { + altLabels: Partial[]; + hiddenLabels: Partial[]; + hasFieldSelectedLanguage: (field: Partial[]) => boolean; + selectedLanguages: Language[]; +} + +const Terms = ({ + hasFieldSelectedLanguage, + selectedLanguages, + altLabels, + hiddenLabels +}: Props) => ( + + + {hasFieldSelectedLanguage(altLabels) && ( + ( + + ))} + /> + )} + {hasFieldSelectedLanguage(hiddenLabels) && ( + ( + + ))} + /> + )} + + +); + +export default Terms; diff --git a/src/pages/concept-details-page/Validity/index.tsx b/src/pages/concept-details-page/Validity/index.tsx new file mode 100644 index 000000000..386f8c39f --- /dev/null +++ b/src/pages/concept-details-page/Validity/index.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import { + ContentSection, + KeyValueList, + KeyValueListItem +} from '../../../components/details-page'; +import translations from '../../../lib/localization'; + +interface Props { + validFromIncluding: string; + validToIncluding: string; +} + +const Validity = ({ validFromIncluding, validToIncluding }: Props) => ( + + + {(validFromIncluding || validToIncluding) && ( + + )} + + +); + +export default Validity; diff --git a/src/pages/concept-details-page/index.tsx b/src/pages/concept-details-page/index.tsx index 29c2e8429..7adab6a09 100755 --- a/src/pages/concept-details-page/index.tsx +++ b/src/pages/concept-details-page/index.tsx @@ -3,12 +3,10 @@ import React, { memo, useState, useEffect } from 'react'; import { compose } from 'redux'; import type { RouteComponentProps } from 'react-router-dom'; import { ThemeProvider } from 'styled-components'; -import Link from '@fellesdatakatalog/link'; import translations from '../../lib/localization'; import { dateStringToDate, formatDate } from '../../lib/date-utils'; import { getTranslateText as translate } from '../../lib/translateText'; import { deepKeys } from '../../lib/deep-keys'; -import { languageSorter } from '../../lib/languageSorter'; import { themeFDK } from '../../app/theme'; import type { Props as ConceptProps } from '../../components/with-concept'; @@ -23,22 +21,23 @@ import type { Props as PublicServicesProps } from '../../components/with-public- import withPublicServices from '../../components/with-public-services'; import withErrorBoundary from '../../components/with-error-boundary'; -import DetailsPage, { - ContentSection, - KeyValueList, - KeyValueListItem -} from '../../components/details-page'; +import DetailsPage from '../../components/details-page'; import ErrorPage from '../error-page'; -import MultiLingualField from '../../components/multilingual-field'; -import type { ItemWithRelationType } from '../../components/relation-list'; -import RelationList from '../../components/relation-list'; - -import SC from './styled'; import type { Theme, Language, TextLanguage } from '../../types'; import { Entity } from '../../types/enums'; -import { formatISO } from '../../utils/date'; import RelatedConcepts from './RelatedConcepts'; +import ContactPoint from './ContactPoint'; +import Created from './Created'; +import Description from './Description'; +import Validity from './Validity'; +import Remark from './Remark'; +import Terms from './Terms'; +import Example from './Example'; +import SubjectAndApplication from './SubjectAndApplication'; +import Range from './Range'; +import Identifier from './Identifier'; +import RelationsList from './RelationsList'; interface RouteParams { conceptId: string; @@ -114,12 +113,6 @@ const ConceptDetailsPage: FC = ({ }; }, [conceptId]); - const publicServicesRelationsWithRelationType: ItemWithRelationType[] = - publicServicesRelations.map(relation => ({ - relation, - relationType: translations.sampleData - })); - const translatableFields = [ 'prefLabel', 'altLabel', @@ -211,37 +204,18 @@ const ConceptDetailsPage: FC = ({ concept?.isReplacedBy || concept?.memberOf || concept?.seeAlso; - - const renderSources = () => { - if (sourceRelationship === 'egendefinert') { - return `${translations.compare.source}: ${translations.sourceRelationship[sourceRelationship]}`; - } - - return sources?.length ? ( - <> - - {`${translations.compare.source}: ${ - sourceRelationship - ? translations.sourceRelationship[sourceRelationship] - : '' - }`} - - {sources.map(({ text, uri }, index) => ( - - {index > 0 && ','} -   - {uri ? ( - - {translate(text) || uri} - - ) : ( - translate(text) - )} - - ))} - - ) : null; - }; + const hasRelationsList = + conceptsRelations.length > 0 || + datasetsRelations.length > 0 || + publicServicesRelations.length > 0 || + informationModelsRelations.length > 0; + const hasSubjectAndApplication = + (subjectLabels.length > 0 && hasFieldSelectedLanguage(subjectLabels)) || + hasFieldSelectedLanguage(applications); + const hasValidity = validFromIncluding || validToIncluding; + const hasTerms = + hasFieldSelectedLanguage(altLabels) || + (hiddenLabels.length > 0 && hasFieldSelectedLanguage(hiddenLabels)); return renderPage ? ( @@ -260,181 +234,45 @@ const ConceptDetailsPage: FC = ({ themes={themes} languages={selectedLanguages} > - {created && ( - - {created && ( - - - - )} - - )} + {created && } {description && ( - - - {renderSources()} - + )} - {(validFromIncluding || validToIncluding) && ( - - - {(validFromIncluding || validToIncluding) && ( - - )} - - + {hasValidity && ( + )} {remark && ( - - - + )} - {(hasFieldSelectedLanguage(altLabels) || - (hiddenLabels.length > 0 && - hasFieldSelectedLanguage(hiddenLabels))) && ( - - - {hasFieldSelectedLanguage(altLabels) && ( - ( - - ))} - /> - )} - {hasFieldSelectedLanguage(hiddenLabels) && ( - ( - - ) - )} - /> - )} - - + {hasTerms && ( + )} {example && ( - - - - )} - {((subjectLabels.length > 0 && - hasFieldSelectedLanguage(subjectLabels)) || - hasFieldSelectedLanguage(applications)) && ( - - - {subjectLabels && hasFieldSelectedLanguage(subjectLabels) && ( - ( - - ) - )} - /> - )} - {applications.length > 0 && - hasFieldSelectedLanguage(applications) && ( - ( - - ) - )} - /> - )} - - + )} - {range && ( - - - {range} - - - )} - {identifier && ( - - {identifier} - + {hasSubjectAndApplication && ( + )} + {range && } + {identifier && } {hasRelatedConcepts && ( = ({ getPublicServicesRelations={getPublicServicesRelations} /> )} - {(conceptsRelations.length > 0 || - datasetsRelations.length > 0 || - publicServicesRelations.length > 0 || - informationModelsRelations.length > 0) && ( - - - + {hasRelationsList && ( + )} {(contactPoint?.email || contactPoint?.telephone) && ( - - - {contactPoint.email && ( - - {contactPoint.email} - - } - /> - )} - {contactPoint.telephone && ( - - )} - - + )} From c89038594eb4538cfb2b1e37057d6a9bfec07f74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 18:53:59 +0000 Subject: [PATCH 2/6] chore(deps): bump graphql from 16.8.0 to 16.8.1 Bumps [graphql](https://github.com/graphql/graphql-js) from 16.8.0 to 16.8.1. - [Release notes](https://github.com/graphql/graphql-js/releases) - [Commits](https://github.com/graphql/graphql-js/compare/v16.8.0...v16.8.1) --- updated-dependencies: - dependency-name: graphql dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4fcf70581..267556754 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "core-js-pure": "^3.27.1", "deserialize-json-api": "^1.4.0", "eslint-import-resolver-typescript": "^3.5.3", - "graphql": "^16.8.0", + "graphql": "^16.8.1", "highlight.js": "^11.7.0", "html-react-parser": "^3.0.9", "immutable": "^4.2.4", @@ -13859,9 +13859,9 @@ "dev": true }, "node_modules/graphql": { - "version": "16.8.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.0.tgz", - "integrity": "sha512-0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg==", + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", + "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } diff --git a/package.json b/package.json index e76e17700..d80950714 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "core-js-pure": "^3.27.1", "deserialize-json-api": "^1.4.0", "eslint-import-resolver-typescript": "^3.5.3", - "graphql": "^16.8.0", + "graphql": "^16.8.1", "highlight.js": "^11.7.0", "html-react-parser": "^3.0.9", "immutable": "^4.2.4", From ed209b0acda529a067398202cfd90e819b3035ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Sep 2023 16:36:45 +0000 Subject: [PATCH 3/6] chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/pa11y-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pa11y-ci.yaml b/.github/workflows/pa11y-ci.yaml index 946e4b8b4..89d0bc928 100644 --- a/.github/workflows/pa11y-ci.yaml +++ b/.github/workflows/pa11y-ci.yaml @@ -8,7 +8,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Node uses: actions/setup-node@v3 with: From 892a50a855ad71bf61d0b2a7d42382a6d421fc9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:55:31 +0000 Subject: [PATCH 4/6] chore(deps): bump react-select from 5.7.0 to 5.7.4 Bumps [react-select](https://github.com/JedWatson/react-select) from 5.7.0 to 5.7.4. - [Release notes](https://github.com/JedWatson/react-select/releases) - [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.7.0...react-select@5.7.4) --- updated-dependencies: - dependency-name: react-select dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 267556754..6d9ac1352 100644 --- a/package-lock.json +++ b/package-lock.json @@ -65,7 +65,7 @@ "react-router-breadcrumbs-hoc": "^4.1.0", "react-router-dom": "^5.3.4", "react-scroll": "^1.8.9", - "react-select": "^5.7.0", + "react-select": "^5.7.4", "reactstrap": "^9.1.5", "redux": "^4.2.1", "redux-api-middleware": "^3.2.1", @@ -22322,9 +22322,9 @@ } }, "node_modules/react-select": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.0.tgz", - "integrity": "sha512-lJGiMxCa3cqnUr2Jjtg9YHsaytiZqeNOKeibv6WF5zbK/fPegZ1hg3y/9P1RZVLhqBTs0PfqQLKuAACednYGhQ==", + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.4.tgz", + "integrity": "sha512-NhuE56X+p9QDFh4BgeygHFIvJJszO1i1KSkg/JPcIJrbovyRtI+GuOEa4XzFCEpZRAEoEI8u/cAHK+jG/PgUzQ==", "dependencies": { "@babel/runtime": "^7.12.0", "@emotion/cache": "^11.4.0", diff --git a/package.json b/package.json index d80950714..335cae9ad 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "react-router-breadcrumbs-hoc": "^4.1.0", "react-router-dom": "^5.3.4", "react-scroll": "^1.8.9", - "react-select": "^5.7.0", + "react-select": "^5.7.4", "reactstrap": "^9.1.5", "redux": "^4.2.1", "redux-api-middleware": "^3.2.1", From de5ef7f7e93f2ec190c765fa4b7bb97963f5b807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 16:57:40 +0000 Subject: [PATCH 5/6] chore(deps-dev): bump webpack-dev-server from 4.11.1 to 4.15.1 Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.11.1 to 4.15.1. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.11.1...v4.15.1) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 53 +++++++++++++++++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d9ac1352..5e7fb9c07 100644 --- a/package-lock.json +++ b/package-lock.json @@ -164,7 +164,7 @@ "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.11.1", + "webpack-dev-server": "^4.15.1", "webpack-merge": "^5.8.0" }, "engines": { @@ -7799,9 +7799,9 @@ } }, "node_modules/@types/ws": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz", - "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==", + "version": "8.5.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", + "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", "dev": true, "dependencies": { "@types/node": "*" @@ -18033,6 +18033,16 @@ "language-subtag-registry": "~0.3.2" } }, + "node_modules/launch-editor": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz", + "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.7.3" + } + }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -26127,9 +26137,9 @@ } }, "node_modules/webpack-dev-server": { - "version": "4.11.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz", - "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==", + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", "dev": true, "dependencies": { "@types/bonjour": "^3.5.9", @@ -26138,7 +26148,7 @@ "@types/serve-index": "^1.9.1", "@types/serve-static": "^1.13.10", "@types/sockjs": "^0.3.33", - "@types/ws": "^8.5.1", + "@types/ws": "^8.5.5", "ansi-html-community": "^0.0.8", "bonjour-service": "^1.0.11", "chokidar": "^3.5.3", @@ -26151,6 +26161,7 @@ "html-entities": "^2.3.2", "http-proxy-middleware": "^2.0.3", "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", "open": "^8.0.9", "p-retry": "^4.5.0", "rimraf": "^3.0.2", @@ -26160,7 +26171,7 @@ "sockjs": "^0.3.24", "spdy": "^4.0.2", "webpack-dev-middleware": "^5.3.1", - "ws": "^8.4.2" + "ws": "^8.13.0" }, "bin": { "webpack-dev-server": "bin/webpack-dev-server.js" @@ -26176,6 +26187,9 @@ "webpack": "^4.37.0 || ^5.0.0" }, "peerDependenciesMeta": { + "webpack": { + "optional": true + }, "webpack-cli": { "optional": true } @@ -26234,6 +26248,27 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", + "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/webpack-merge": { "version": "5.8.0", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", diff --git a/package.json b/package.json index 335cae9ad..62dd1aa23 100644 --- a/package.json +++ b/package.json @@ -205,7 +205,7 @@ "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.11.1", + "webpack-dev-server": "^4.15.1", "webpack-merge": "^5.8.0" }, "optionalDependencies": { From 3e5f1ca0faea93710c5fb97a13080b1f6227ec20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 12:44:29 +0000 Subject: [PATCH 6/6] chore(deps-dev): bump webpack and @types/webpack Bumps [webpack](https://github.com/webpack/webpack) and [@types/webpack](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/webpack). These dependencies needed to be updated together. Updates `webpack` from 5.76.1 to 5.87.0 - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.76.1...v5.87.0) Updates `@types/webpack` from 5.28.0 to 5.28.1 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/webpack) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: "@types/webpack" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 258 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 131 insertions(+), 131 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5e7fb9c07..76dad3c00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ "@types/sanitize-html": "^2.8.0", "@types/styled-components": "^5.1.24", "@types/turndown": "^5.0.1", - "@types/webpack": "^5.28.0", + "@types/webpack": "^5.28.1", "@typescript-eslint/eslint-plugin": "^5.48.0", "@typescript-eslint/parser": "^5.59.7", "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", @@ -161,7 +161,7 @@ "ts-node": "^10.9.1", "typescript": "^4.9.4", "url-loader": "^4.1.1", - "webpack": "^5.75.0", + "webpack": "^5.87.0", "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.15.1", @@ -5974,9 +5974,9 @@ } }, "node_modules/@jridgewell/source-map": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", - "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz", + "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==", "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", @@ -7318,9 +7318,9 @@ } }, "node_modules/@types/estree": { - "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", + "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==", "dev": true }, "node_modules/@types/express": { @@ -7788,9 +7788,9 @@ "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" }, "node_modules/@types/webpack": { - "version": "5.28.0", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz", - "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==", + "version": "5.28.1", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.1.tgz", + "integrity": "sha512-qw1MqGZclCoBrpiSe/hokSgQM/su8Ocpl3L/YHE0L6moyaypg4+5F7Uzq7NgaPKPxUxUbQ4fLPLpDWdR27bCZw==", "dev": true, "dependencies": { "@types/node": "*", @@ -8154,148 +8154,148 @@ } }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", "dev": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1" + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", "dev": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", "dev": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==", "dev": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", "dev": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", "dev": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", "dev": true, "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", "dev": true, "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", "dev": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/helper-wasm-section": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-opt": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", - "@webassemblyjs/wast-printer": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-buffer": "1.11.1", - "@webassemblyjs/wasm-gen": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/helper-api-error": "1.11.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.1", - "@webassemblyjs/ieee754": "1.11.1", - "@webassemblyjs/leb128": "1.11.1", - "@webassemblyjs/utf8": "1.11.1" + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", "dev": true, "dependencies": { - "@webassemblyjs/ast": "1.11.1", + "@webassemblyjs/ast": "1.11.6", "@xtuc/long": "4.2.2" } }, @@ -8547,9 +8547,9 @@ } }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz", + "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -8590,9 +8590,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -11602,9 +11602,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -11779,9 +11779,9 @@ } }, "node_modules/es-module-lexer": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz", + "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==", "dev": true }, "node_modules/es-shim-unscopables": { @@ -23250,9 +23250,9 @@ } }, "node_modules/schema-utils": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -23357,9 +23357,9 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz", + "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==", "dev": true, "dependencies": { "randombytes": "^2.1.0" @@ -24456,13 +24456,13 @@ } }, "node_modules/terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz", + "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==", "dev": true, "dependencies": { - "@jridgewell/source-map": "^0.3.2", - "acorn": "^8.5.0", + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", "commander": "^2.20.0", "source-map-support": "~0.5.20" }, @@ -24474,16 +24474,16 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz", - "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==", + "version": "5.3.9", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz", + "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.14", + "@jridgewell/trace-mapping": "^0.3.17", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.0", - "terser": "^5.14.1" + "serialize-javascript": "^6.0.1", + "terser": "^5.16.8" }, "engines": { "node": ">= 10.13.0" @@ -25803,22 +25803,22 @@ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/webpack": { - "version": "5.76.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", - "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", + "version": "5.87.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.87.0.tgz", + "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", - "@types/estree": "^0.0.51", - "@webassemblyjs/ast": "1.11.1", - "@webassemblyjs/wasm-edit": "1.11.1", - "@webassemblyjs/wasm-parser": "1.11.1", + "@types/estree": "^1.0.0", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.10.0", - "es-module-lexer": "^0.9.0", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", @@ -25827,9 +25827,9 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.0", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.1.3", + "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, diff --git a/package.json b/package.json index 62dd1aa23..7e2b2e8d6 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,7 @@ "@types/sanitize-html": "^2.8.0", "@types/styled-components": "^5.1.24", "@types/turndown": "^5.0.1", - "@types/webpack": "^5.28.0", + "@types/webpack": "^5.28.1", "@typescript-eslint/eslint-plugin": "^5.48.0", "@typescript-eslint/parser": "^5.59.7", "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", @@ -202,7 +202,7 @@ "ts-node": "^10.9.1", "typescript": "^4.9.4", "url-loader": "^4.1.1", - "webpack": "^5.75.0", + "webpack": "^5.87.0", "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.15.1",