diff --git a/package.json b/package.json index eac940ba3..8b689ef4f 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/preset-env": "^7.22.2", "@babel/preset-react": "^7.22.3", + "@city-of-helsinki/react-helsinki-notification-manager": "^0.1.0", "@draft-js-plugins/drag-n-drop": "^4.2.0", "@draft-js-plugins/editor": "^4.1.0", "@draft-js-plugins/focus": "^4.1.1", @@ -111,7 +112,6 @@ "react-dom": "^18.0.0", "react-dropzone": "^14.2.3", "react-helmet": "^6.1.0", - "react-helsinki-notification-manager": "git+https://github.com/City-of-Helsinki/react-helsinki-notification-manager.git", "react-i18next": "^15.5.2", "react-image-lightbox": "^5.1.1", "react-intl": "^5.0.0", diff --git a/src/__tests__/App.test.jsx b/src/__tests__/App.test.jsx index b7a2c8d87..40bb3d6ef 100644 --- a/src/__tests__/App.test.jsx +++ b/src/__tests__/App.test.jsx @@ -36,7 +36,7 @@ vi.mock('react-router-dom', async () => { useSearchParams: vi.fn().mockImplementation(() => [new URLSearchParams({ lang: 'fi' })]), }; }); -vi.mock('react-helsinki-notification-manager', () => ({ +vi.mock('@city-of-helsinki/react-helsinki-notification-manager', () => ({ NotificationService: () =>
NotificationService
, })) diff --git a/src/components/MaintenanceNotification.jsx b/src/components/MaintenanceNotification.jsx index 11ac64994..d08c40523 100644 --- a/src/components/MaintenanceNotification.jsx +++ b/src/components/MaintenanceNotification.jsx @@ -1,8 +1,8 @@ import React, { Suspense } from 'react'; import PropTypes from 'prop-types'; -import { NotificationService } from 'react-helsinki-notification-manager'; +import { NotificationService } from '@city-of-helsinki/react-helsinki-notification-manager'; // eslint-disable-next-line import/no-unresolved -import 'react-helsinki-notification-manager/style.css'; +import '@city-of-helsinki/react-helsinki-notification-manager/style.css'; import useNotifications from '../hooks/useNotifications'; import LoadSpinner from './LoadSpinner'; diff --git a/yarn.lock b/yarn.lock index 1992475bf..dca50012b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1507,6 +1507,13 @@ "@babel/helper-string-parser" "^7.27.1" "@babel/helper-validator-identifier" "^7.27.1" +"@city-of-helsinki/react-helsinki-notification-manager@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@city-of-helsinki/react-helsinki-notification-manager/-/react-helsinki-notification-manager-0.1.0.tgz#020c44d9d8c6036798b44ac956e02230f00e134d" + integrity sha512-0XCMBYao0Kgw/ozCtITS4tHD6NarRLG4e1KFfSYfJ/WvEnwriPCpdmuM9zN2mIvASioYLTfK3SdpnXyL/NAwHg== + dependencies: + sass "^1.89.0" + "@commitlint/cli@^19.8.0": version "19.8.0" resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.8.0.tgz#e66e5a5268437e42b7c6f2a447e94ea83b8a3272" @@ -7988,12 +7995,6 @@ react-helmet@^6.1.0: react-fast-compare "^3.1.1" react-side-effect "^2.1.0" -"react-helsinki-notification-manager@git+https://github.com/City-of-Helsinki/react-helsinki-notification-manager.git": - version "0.0.1" - resolved "git+https://github.com/City-of-Helsinki/react-helsinki-notification-manager.git#9594b32b401443c72b916eb9f0fd81fb084de8df" - dependencies: - sass "^1.89.0" - react-hook-form@^7.43.3: version "7.62.0" resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.62.0.tgz#2d81e13c2c6b6d636548e440818341ca753218d0" @@ -8898,16 +8899,8 @@ std-env@^3.9.0: resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.9.0.tgz#1a6f7243b339dca4c9fd55e1c7504c77ef23e8f1" integrity sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + name string-width-cjs version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -9020,14 +9013,8 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: + name strip-ansi-cjs version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -9883,7 +9870,8 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + name wrap-ansi-cjs version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -9901,15 +9889,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"