diff --git a/models/Activity/Award.ts b/models/Activity/Award.ts index e888cc45..7be66d22 100644 --- a/models/Activity/Award.ts +++ b/models/Activity/Award.ts @@ -1,8 +1,9 @@ import { User } from '@authing/native-js-ui-components'; -import { ListModel, Stream, toggle } from 'mobx-restful'; +import { Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { Base, createListStream, InputData, Media } from '../Base'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { Team } from './Team'; export interface Award @@ -22,8 +23,8 @@ export interface AwardAssignment award: Award; } -export class AwardModel extends Stream(ListModel) { - client = sessionStore.client; +export class AwardModel extends StrapiListModel { + client = strapiClient; currentAssignment?: AwardAssignmentModel; constructor(baseURI: string) { @@ -55,8 +56,10 @@ export class AwardModel extends Stream(ListModel) { } } -export class AwardAssignmentModel extends Stream(ListModel) { - client = sessionStore.client; +export class AwardAssignmentModel extends Stream( + StrapiListModel, +) { + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/Enrollment.ts b/models/Activity/Enrollment.ts index 850a8f1a..b6ef8c67 100644 --- a/models/Activity/Enrollment.ts +++ b/models/Activity/Enrollment.ts @@ -1,11 +1,12 @@ import { computed, observable } from 'mobx'; -import { ListModel, Statistic, Stream, toggle } from 'mobx-restful'; +import { Statistic, Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { buildURLData, countBy, groupBy } from 'web-utility'; import { Base, createListStream, Filter } from '../Base'; import { i18n } from '../Base/Translation'; import { User } from '../User'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; const { t } = i18n; @@ -32,7 +33,7 @@ export interface EnrollmentStatistic } export class EnrollmentModel extends Stream( - ListModel, + StrapiListModel, ) { constructor(baseURI: string) { super(); @@ -40,7 +41,7 @@ export class EnrollmentModel extends Stream( this.baseURI = `${baseURI}/enrollment`; } - client = sessionStore.client; + client = strapiClient; indexKey = 'userId' as const; @observable diff --git a/models/Activity/Log.ts b/models/Activity/Log.ts index 379489d9..c6036c01 100644 --- a/models/Activity/Log.ts +++ b/models/Activity/Log.ts @@ -1,7 +1,8 @@ -import { IDType, ListModel, Stream } from 'mobx-restful'; +import { IDType, Stream } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { Base, createListStream } from '../Base'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; export interface Log extends Base { operatorId: IDType; @@ -10,8 +11,8 @@ export interface Log extends Base { activityLogType: string; } -export class LogModel extends Stream(ListModel) { - client = sessionStore.client; +export class LogModel extends Stream(StrapiListModel) { + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/Message.ts b/models/Activity/Message.ts index a0c066e8..4a0cf679 100644 --- a/models/Activity/Message.ts +++ b/models/Activity/Message.ts @@ -1,9 +1,10 @@ -import { IDType, ListModel, Stream, toggle } from 'mobx-restful'; +import { IDType, Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { buildURLData } from 'web-utility'; import { Base, createListStream, Filter, InputData } from '../Base'; import { i18n } from '../Base/Translation'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; const { t } = i18n; @@ -22,8 +23,10 @@ export interface Message extends Base { export type MessageFilter = Filter; -export class MessageModel extends Stream(ListModel) { - client = sessionStore.client; +export class MessageModel extends Stream( + StrapiListModel, +) { + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/Organization.ts b/models/Activity/Organization.ts index b87e05a0..2819d78f 100644 --- a/models/Activity/Organization.ts +++ b/models/Activity/Organization.ts @@ -1,10 +1,11 @@ import { computed } from 'mobx'; -import { IDType, ListModel, Stream, toggle } from 'mobx-restful'; +import { IDType, Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { groupBy } from 'web-utility'; import { Base, createListStream, InputData, Media } from '../Base'; import { i18n } from '../Base/Translation'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; const { t } = i18n; @@ -32,8 +33,8 @@ export interface Organization extends Base { url?: string; } -export class OrganizationModel extends Stream(ListModel) { - client = sessionStore.client; +export class OrganizationModel extends Stream(StrapiListModel) { + client = strapiClient; constructor(public baseURI: string) { super(); diff --git a/models/Activity/Staff.ts b/models/Activity/Staff.ts index d56a73ec..d4f23cf7 100644 --- a/models/Activity/Staff.ts +++ b/models/Activity/Staff.ts @@ -1,10 +1,11 @@ import { computed } from 'mobx'; -import { ListModel, Stream, toggle } from 'mobx-restful'; +import { Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { groupBy, mergeStream } from 'web-utility'; import { Base, createListStream, InputData } from '../Base'; import { User } from '../User'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; export interface HackathonAdmin extends Base, @@ -16,8 +17,8 @@ export interface Staff extends HackathonAdmin { type: 'admin' | 'judge' | 'member'; } -export class StaffModel extends Stream(ListModel) { - client = sessionStore.client; +export class StaffModel extends Stream(StrapiListModel) { + client = strapiClient; indexKey = 'userId' as const; constructor(public baseURI: string) { diff --git a/models/Activity/Team.ts b/models/Activity/Team.ts index a5a64c58..a15c9676 100644 --- a/models/Activity/Team.ts +++ b/models/Activity/Team.ts @@ -1,5 +1,6 @@ import { action, computed, observable } from 'mobx'; -import { ListModel, Stream, toggle } from 'mobx-restful'; +import { Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { buildURLData } from 'web-utility'; import { @@ -11,7 +12,7 @@ import { } from '../Base'; import { WorkspaceModel } from '../Git'; import { User } from '../User'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { AwardAssignment } from './Award'; import { NameAvailability } from './index'; @@ -67,14 +68,14 @@ export interface JoinTeamReqBody extends Pick { description?: string; } -export class TeamModel extends Stream(ListModel) { +export class TeamModel extends Stream(StrapiListModel) { constructor(baseURI: string) { super(); this.baseURI = `${baseURI}/team`; } - client = sessionStore.client; + client = strapiClient; currentMember?: TeamMemberModel; currentWork?: TeamWorkModel; currentWorkspace?: WorkspaceModel; @@ -175,14 +176,14 @@ export class TeamModel extends Stream(ListModel) { } export class TeamMemberModel extends Stream>( - ListModel, + StrapiListModel, ) { constructor(baseURI: string) { super(); this.baseURI = `${baseURI}/member`; } - client = sessionStore.client; + client = strapiClient; @observable accessor sessionOne: TeamMember | undefined; @@ -225,8 +226,8 @@ export class TeamMemberModel extends Stream>( } } -export class TeamWorkModel extends Stream(ListModel) { - client = sessionStore.client; +export class TeamWorkModel extends Stream(StrapiListModel) { + client = strapiClient; constructor(baseURI: string) { super(); @@ -251,8 +252,10 @@ export class TeamWorkModel extends Stream(ListModel) { } } -export class TeamAssignmentModel extends Stream(ListModel) { - client = sessionStore.client; +export class TeamAssignmentModel extends Stream( + StrapiListModel, +) { + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/Activity/index.ts b/models/Activity/index.ts index a576630b..82ac0454 100644 --- a/models/Activity/index.ts +++ b/models/Activity/index.ts @@ -1,12 +1,13 @@ import { action, observable } from 'mobx'; -import { ListModel, Stream, toggle } from 'mobx-restful'; +import { Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { buildURLData } from 'web-utility'; import { Base, createListStream, Filter, InputData, Media } from '../Base'; import { GitModel } from '../Git'; import { GitTemplateModal } from '../TemplateRepo'; import platformAdmin from '../User/PlatformAdmin'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { AwardModel } from './Award'; import { Enrollment, EnrollmentModel } from './Enrollment'; import { LogModel } from './Log'; @@ -73,8 +74,10 @@ export interface Questionnaire extends Base { hackathonName: string; } -export class ActivityModel extends Stream(ListModel) { - client = sessionStore.client; +export class ActivityModel extends Stream( + StrapiListModel, +) { + client = strapiClient; baseURI = 'hackathon'; indexKey = 'name' as const; diff --git a/models/Base/File.ts b/models/Base/File.ts index 34878561..76f7e335 100644 --- a/models/Base/File.ts +++ b/models/Base/File.ts @@ -2,7 +2,7 @@ import { HTTPError, Request, request } from 'koajax'; import { DataObject, toggle } from 'mobx-restful'; import { FileModel } from 'mobx-restful-table'; -import sessionStore from '../User/Session'; +import sessionStore, { strapiClient } from '../User/Session'; import { ErrorBaseData, UploadUrl } from './index'; export class AzureFileModel extends FileModel { @@ -38,7 +38,7 @@ export class AzureFileModel extends FileModel { async upload(file: File) { const { type, name } = file; - const { body } = await sessionStore.client.post( + const { body } = await strapiClient.post( `user/generateFileUrl`, { filename: name, diff --git a/models/Git.ts b/models/Git.ts index 16599443..ff991e71 100644 --- a/models/Git.ts +++ b/models/Git.ts @@ -1,12 +1,13 @@ import { components } from '@octokit/openapi-types'; import { HTTPClient } from 'koajax'; import { memoize } from 'lodash'; -import { ListModel, Stream, toggle } from 'mobx-restful'; +import { Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { averageOf } from 'web-utility'; import { TeamWork, TeamWorkType } from './Activity/Team'; import { Base, createListStream } from './Base'; -import sessionStore from './User/Session'; +import sessionStore, { strapiClient } from './User/Session'; type Repository = components['schemas']['repository']; @@ -84,7 +85,7 @@ const getGitRepository = memoize( }, ); -export class GitModel extends Stream(ListModel) { +export class GitModel extends Stream(StrapiListModel) { baseURI = 'repos'; client = gitClient; @@ -133,7 +134,7 @@ const DefaultTemplates = [ ]; export class WorkspaceModel extends GitModel { - client = sessionStore.client; + client = strapiClient; constructor(baseURI: string) { super(); diff --git a/models/TemplateRepo.ts b/models/TemplateRepo.ts index 86910d4b..81cf88aa 100644 --- a/models/TemplateRepo.ts +++ b/models/TemplateRepo.ts @@ -1,7 +1,8 @@ -import { ListModel, Stream, toggle } from 'mobx-restful'; +import { Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { Base, createListStream, InputData } from './Base'; -import sessionStore from './User/Session'; +import sessionStore, { strapiClient } from './User/Session'; export interface GitTemplate extends Base { url: string; @@ -13,8 +14,8 @@ export interface GitTemplate extends Base { description?: string; } -export class GitTemplateModal extends Stream(ListModel) { - client = sessionStore.client; +export class GitTemplateModal extends Stream(StrapiListModel) { + client = strapiClient; constructor(public baseURI: string) { super(); diff --git a/models/User/PlatformAdmin.ts b/models/User/PlatformAdmin.ts index 7233f894..d9430505 100644 --- a/models/User/PlatformAdmin.ts +++ b/models/User/PlatformAdmin.ts @@ -1,9 +1,10 @@ import { observable } from 'mobx'; -import { IDType, ListModel, Stream, toggle } from 'mobx-restful'; +import { IDType, Stream, toggle } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { HackathonAdmin } from '../Activity/Staff'; import { createListStream, Filter } from '../Base'; -import sessionStore from './Session'; +import sessionStore, { strapiClient } from './Session'; export type PlatformAdmin = HackathonAdmin; @@ -12,8 +13,8 @@ export type PlatformAdminFilter = Filter; export class PlatformAdminModel extends Stream< PlatformAdmin, PlatformAdminFilter ->(ListModel) { - client = sessionStore.client; +>(StrapiListModel) { + client = strapiClient; baseURI = 'platform/admin'; indexKey = 'userId' as const; diff --git a/models/User/index.ts b/models/User/index.ts index a975936f..72d17a4d 100644 --- a/models/User/index.ts +++ b/models/User/index.ts @@ -1,8 +1,9 @@ -import { ListModel, Stream } from 'mobx-restful'; +import { Stream } from 'mobx-restful'; +import { StrapiListModel } from 'mobx-strapi'; import { buildURLData } from 'web-utility'; import { Base, createListStream, Filter, ListData } from '../Base'; -import sessionStore from './Session'; +import sessionStore, { strapiClient } from './Session'; export interface UserBase { username: string; @@ -125,8 +126,8 @@ export interface UserFilter extends Filter { keyword?: string; } -export class UserModel extends Stream(ListModel) { - client = sessionStore.client; +export class UserModel extends Stream(StrapiListModel) { + client = strapiClient; baseURI = 'user'; async getUserTopList() { diff --git a/package.json b/package.json index d8c662bd..794c9be4 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "mobx-react-helper": "^0.3.1", "mobx-restful": "^0.7.0-rc.0", "mobx-restful-table": "^2.0.0-rc.0", + "mobx-strapi": "^0.5.0", "next": "^14.1.0", "next-ssr-middleware": "^0.7.0", "open-react-map": "^0.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f3e8c3ba..35a06dcd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -37,7 +37,7 @@ dependencies: version: 0.5.4(react@18.2.0)(typescript@5.3.3) idea-react: specifier: ^2.0.0-rc.2 - version: 2.0.0-rc.2(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) + version: 2.0.0-rc.2(@types/react@18.2.58)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) koajax: specifier: ^0.9.6 version: 0.9.6(typescript@5.3.3) @@ -67,7 +67,10 @@ dependencies: version: 0.7.0-rc.0(mobx@6.12.0)(typescript@5.3.3) mobx-restful-table: specifier: ^2.0.0-rc.0 - version: 2.0.0-rc.0(@types/react@18.2.57)(mobx-i18n@0.5.0)(mobx-react@9.1.0)(mobx-restful@0.7.0-rc.0)(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) + version: 2.0.0-rc.0(@types/react@18.2.58)(mobx-i18n@0.5.0)(mobx-react@9.1.0)(mobx-restful@0.7.0-rc.0)(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) + mobx-strapi: + specifier: ^0.5.0 + version: 0.5.0(mobx@6.12.0)(typescript@5.3.3) next: specifier: ^14.1.0 version: 14.1.0(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0) @@ -82,7 +85,7 @@ dependencies: version: 18.2.0 react-bootstrap: specifier: ^2.10.1 - version: 2.10.1(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0) + version: 2.10.1(@types/react@18.2.58)(react-dom@18.2.0)(react@18.2.0) react-bootstrap-editor: specifier: ^2.0.1 version: 2.0.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3) @@ -123,7 +126,7 @@ devDependencies: version: 18.19.18 '@types/react': specifier: ^18.2.57 - version: 18.2.57 + version: 18.2.58 eslint: specifier: ^8.56.0 version: 8.56.0 @@ -1759,6 +1762,7 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] requiresBuild: true optional: true @@ -1767,6 +1771,7 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] requiresBuild: true optional: true @@ -1775,6 +1780,7 @@ packages: engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] requiresBuild: true optional: true @@ -1783,6 +1789,7 @@ packages: engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] requiresBuild: true optional: true @@ -2140,11 +2147,11 @@ packages: /@types/react-transition-group@4.4.10: resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} dependencies: - '@types/react': 18.2.57 + '@types/react': 18.2.58 dev: false - /@types/react@18.2.57: - resolution: {integrity: sha512-ZvQsktJgSYrQiMirAN60y4O/LRevIV8hUzSOSNB6gfR3/o3wCBFQx3sPwIYtuDMeiVgsSS3UzCV26tEzgnfvQw==} + /@types/react@18.2.58: + resolution: {integrity: sha512-TaGvMNhxvG2Q0K0aYxiKfNDS5m5ZsoIBBbtfUorxdH4NGSXIlYvZxLJI+9Dd3KjeB3780bciLyAb7ylO8pLhPw==} dependencies: '@types/prop-types': 15.7.11 '@types/scheduler': 0.16.8 @@ -4167,7 +4174,7 @@ packages: resolution: {integrity: sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==} dev: true - /idea-react@2.0.0-rc.2(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): + /idea-react@2.0.0-rc.2(@types/react@18.2.58)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): resolution: {integrity: sha512-E+HZegixmsKRplvZol9AU6GAH8Hzn1dzwKqizos9hsd3vjMSr2dG0dtABelERdrqifhTIO7YYxnubTsExjK9xQ==} peerDependencies: react: '>=16' @@ -4187,7 +4194,7 @@ packages: mobx-react-helper: 0.3.1(mobx@6.12.0)(react@18.2.0) prismjs: 1.29.0 react: 18.2.0 - react-bootstrap: 2.10.1(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0) + react-bootstrap: 2.10.1(@types/react@18.2.58)(react-dom@18.2.0)(react@18.2.0) react-dom: 18.2.0(react@18.2.0) react-editor-js: 2.1.0(@editorjs/editorjs@2.29.0)(@editorjs/paragraph@2.11.3)(react@18.2.0) react-element-to-jsx-string: 15.0.0(react-dom@18.2.0)(react@18.2.0) @@ -5139,7 +5146,7 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /mobx-restful-table@2.0.0-rc.0(@types/react@18.2.57)(mobx-i18n@0.5.0)(mobx-react@9.1.0)(mobx-restful@0.7.0-rc.0)(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): + /mobx-restful-table@2.0.0-rc.0(@types/react@18.2.58)(mobx-i18n@0.5.0)(mobx-react@9.1.0)(mobx-restful@0.7.0-rc.0)(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0)(typescript@5.3.3): resolution: {integrity: sha512-1ERdomImZVGgVtQyuiYS6Bphm+pCnHTJmkj404mO6vN82/RdkUThhMA4viCAbHCFWs3RZPg2OHrM3rCwoYKeCw==} peerDependencies: mobx: '>=6.11' @@ -5157,7 +5164,7 @@ packages: mobx-react-helper: 0.3.1(mobx@6.12.0)(react@18.2.0) mobx-restful: 0.7.0-rc.0(mobx@6.12.0)(typescript@5.3.3) react: 18.2.0 - react-bootstrap: 2.10.1(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0) + react-bootstrap: 2.10.1(@types/react@18.2.58)(react-dom@18.2.0)(react@18.2.0) regenerator-runtime: 0.14.1 web-utility: 4.3.0(typescript@5.3.3) transitivePeerDependencies: @@ -5181,6 +5188,22 @@ packages: - typescript dev: false + /mobx-strapi@0.5.0(mobx@6.12.0)(typescript@5.3.3): + resolution: {integrity: sha512-vJkaK56KPNHhQ0YrBU8zsGNVj64DVwcqqGBVFGMw+O7CntZ+q21/Y/NadolhEroTpU0PbGtq4ogG7h4EBB9GSA==} + peerDependencies: + mobx: '>=6.11' + dependencies: + '@swc/helpers': 0.5.6 + mobx: 6.12.0 + mobx-restful: 0.7.0-rc.0(mobx@6.12.0)(typescript@5.3.3) + qs: 6.11.2 + regenerator-runtime: 0.14.1 + web-utility: 4.3.0(typescript@5.3.3) + transitivePeerDependencies: + - jsdom + - typescript + dev: false + /mobx@6.12.0: resolution: {integrity: sha512-Mn6CN6meXEnMa0a5u6a5+RKrqRedHBhZGd15AWLk9O6uFY4KYHzImdt8JI8WODo1bjTSRnwXhJox+FCUZhCKCQ==} dev: false @@ -6268,7 +6291,7 @@ packages: - typescript dev: false - /react-bootstrap@2.10.1(@types/react@18.2.57)(react-dom@18.2.0)(react@18.2.0): + /react-bootstrap@2.10.1(@types/react@18.2.58)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-J3OpRZIvCTQK+Tg/jOkRUvpYLHMdGeU9KqFUBQrV0d/Qr/3nsINpiOJyZMWnM5SJ3ctZdhPA6eCIKpEJR3Ellg==} peerDependencies: '@types/react': '>=16.14.8' @@ -6281,7 +6304,7 @@ packages: '@babel/runtime': 7.23.9 '@restart/hooks': 0.4.16(react@18.2.0) '@restart/ui': 1.6.6(react-dom@18.2.0)(react@18.2.0) - '@types/react': 18.2.57 + '@types/react': 18.2.58 '@types/react-transition-group': 4.4.10 classnames: 2.5.1 dom-helpers: 5.2.1 @@ -6579,7 +6602,7 @@ packages: jest-worker: 26.6.2 rollup: 2.79.1 serialize-javascript: 4.0.0 - terser: 5.27.2 + terser: 5.28.0 dev: true /rollup@2.79.1: @@ -7098,12 +7121,12 @@ packages: jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 - terser: 5.27.2 + terser: 5.28.0 webpack: 5.90.3 dev: true - /terser@5.27.2: - resolution: {integrity: sha512-sHXmLSkImesJ4p5apTeT63DsV4Obe1s37qT8qvwHRmVxKTBH7Rv9Wr26VcAMmLbmk9UliiwK8z+657NyJHHy/w==} + /terser@5.28.0: + resolution: {integrity: sha512-UK1n2JZN6gqfwmjzcikRp+uF/7jdwPXO7M0k/Hnqxzj3T5POL4YBVrv5Y4MKixTzBq4OmH7FfEYRxcy/Eh7YhA==} engines: {node: '>=10'} hasBin: true dependencies: @@ -7291,7 +7314,7 @@ packages: react: '>=15.0.0' dependencies: '@babel/runtime': 7.23.9 - '@types/react': 18.2.57 + '@types/react': 18.2.58 invariant: 2.2.4 react: 18.2.0 react-lifecycles-compat: 3.0.4 @@ -7629,6 +7652,7 @@ packages: /workbox-google-analytics@6.6.0: resolution: {integrity: sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==} + deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained dependencies: workbox-background-sync: 6.6.0 workbox-core: 6.6.0