diff --git a/packages/chonky/package.json b/packages/chonky/package.json index 5ef5e583..cd6c1e61 100644 --- a/packages/chonky/package.json +++ b/packages/chonky/package.json @@ -75,7 +75,6 @@ "@types/react-virtualized-auto-sizer": "^1.0.0", "@types/react-window": "^1.8.2", "@types/redux-watch": "^1.1.0", - "@types/shortid": "^0.0.29", "classnames": "^2.2.6", "deepmerge": "^4.2.2", "exact-trie": "^1.0.13", @@ -83,6 +82,7 @@ "filesize": "^6.1.0", "fuzzy-search": "^3.2.1", "hotkeys-js": "^3.8.3", + "nanoid": "^5.0.9", "react-dnd": "11", "react-dnd-html5-backend": "11", "react-intl": "^5.13.2", @@ -91,7 +91,6 @@ "react-virtualized-auto-sizer": "^1.0.5", "react-window": "^1.8.6", "redux-watch": "^1.2.0", - "shortid": "^2.2.16", "styled-components": "^5.3.0", "tsdef": "^0.0.14" }, diff --git a/packages/chonky/src/components/external/FileBrowser.tsx b/packages/chonky/src/components/external/FileBrowser.tsx index 56346323..ef343564 100644 --- a/packages/chonky/src/components/external/FileBrowser.tsx +++ b/packages/chonky/src/components/external/FileBrowser.tsx @@ -9,7 +9,6 @@ import { HTML5Backend } from 'react-dnd-html5-backend'; import { IntlProvider } from 'react-intl'; import { ThemeProvider } from 'react-jss'; import { Provider as ReduxProvider } from 'react-redux'; -import shortid from 'shortid'; import { useChonkyStore } from '../../redux/store'; import { FileBrowserHandle, FileBrowserProps } from '../../types/file-browser.types'; @@ -27,6 +26,7 @@ import { import { ChonkyBusinessLogic } from '../internal/ChonkyBusinessLogic'; import { ChonkyIconPlaceholder } from '../internal/ChonkyIconPlaceholder'; import { ChonkyPresentationLayer } from '../internal/ChonkyPresentationLayer'; +import { nanoid } from 'nanoid'; // if (process.env.NODE_ENV === 'development') { // const whyDidYouRender = require('@welldone-software/why-did-you-render'); @@ -60,7 +60,7 @@ export const FileBrowser = React.forwardRef< i18n, ]); - const chonkyInstanceId = useStaticValue(() => instanceId ?? shortid.generate()); + const chonkyInstanceId = useStaticValue(() => instanceId ?? nanoid()); const store = useChonkyStore(chonkyInstanceId); const isMobileBreakpoint = useIsMobileBreakpoint(); diff --git a/yarn.lock b/yarn.lock index 6470d013..2317d699 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4476,11 +4476,6 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275" integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA== -"@types/shortid@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-0.0.29.tgz#8093ee0416a6e2bf2aa6338109114b3fbffa0e9b" - integrity sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps= - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -12998,16 +12993,16 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== -nanoid@^2.1.0: - version "2.1.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" - integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== - nanoid@^3.1.23: version "3.1.23" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== +nanoid@^5.0.9: + version "5.0.9" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.0.9.tgz#977dcbaac055430ce7b1e19cf0130cea91a20e50" + integrity sha512-Aooyr6MXU6HpvvWXKoVoXwKMs/KyVakWwg7xQfv5/S/RIgJMy0Ifa45H9qqYy7pTCszrHzP21Uk4PZq2HpEM8Q== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -16374,13 +16369,6 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== -shortid@^2.2.16: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"