diff --git a/.lintstagedrc b/.lintstagedrc index f6d24a5e..6de8a64b 100644 --- a/.lintstagedrc +++ b/.lintstagedrc @@ -2,5 +2,5 @@ "*.{js,ts,tsx,json,scss,css,html}": "prettier --write", "package.json": "sort-package-json", "*.{scss,css}": "stylelint", - "*.{ts,tsx,js}": "eslint --fix", + "*.{ts,tsx,js}": "eslint --fix" } diff --git a/astro.config.ts b/astro.config.ts index fb57d0b1..6bb2b731 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -9,7 +9,7 @@ import { markdownOptions as markdown } from './mdx.config' import type { CSSOptions } from 'vite' import defaultGenerateScopedName from 'postcss-modules/build/generateScopedName' import { isDev } from './src/utils/config' -import { fileURLToPath, URL } from 'url' +import { visualizer } from 'rollup-plugin-visualizer' const PATH_PREFIX = '/src/' @@ -37,35 +37,43 @@ const css: CSSOptions = { const astroConfig: AstroUserConfig = { site: 'https://new.discours.io', - // Enable Solid to support Solid JSX components. - // experimental: { integrations: true }, integrations: [solidJs(), mdx()], - // sitemap({ - /* customPages: [ - '', - '/feed', - '/search', - 'topics', - 'authors' - ] - })],*/ //, partytown({})], markdown, output: 'server', adapter: vercel(), vite: { build: { - chunkSizeWarningLimit: 777, rollupOptions: { + output: { + manualChunks(id) { + if (id.includes('node_modules')) { + let chunkid = 'vendor' + if (id.includes('prosemirror')) { + chunkid = 'prosemirror' + } + if (id.includes('markdown')) { + chunkid = 'markdown' + } + if (id.includes('remark') || id.includes('rehype')) { + chunkid = 'remark' + } + if (id.includes('yjs') || id.includes('y-')) { + chunkid = 'yjs' + } + if (id.includes('loglevel')) { + chunkid = 'loglevel' + } + if (id.includes('nanostores')) { + chunkid = 'nanostores' + } + return chunkid + } + } + }, external: ['@aws-sdk/clients/s3'] } }, - resolve: { - alias: { - './runtimeConfig': './runtimeConfig.browser', - '@': fileURLToPath(new URL('src', import.meta.url)) - } - }, css } } diff --git a/package.json b/package.json index 269e4cde..d093067b 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ }, "dependencies": { "@aws-sdk/client-s3": "^3.178.0", - "@jsdevtools/rehype-toc": "^3.0.2", "@nanostores/persistent": "^0.7.0", "@nanostores/router": "^0.7.0", "@nanostores/solid": "^0.3.0", @@ -41,15 +40,16 @@ "postcss-modules": "^5.0.0", "rehype-autolink-headings": "^6.1.1", "rehype-slug": "^5.0.1", + "rehype-toc": "^3.0.2", "remark-code-titles": "^0.1.2" }, "devDependencies": { "@astrojs/markdown-remark": "1.1.2", "@astrojs/mdx": "^0.11.1", - "@astrojs/node": "^1.0.1", + "@astrojs/node": "^1.1.0", "@astrojs/partytown": "^1.0.0", "@astrojs/solid-js": "^1.1.0", - "@astrojs/vercel": "^2.0.0", + "@astrojs/vercel": "^2.1.0", "@babel/core": "^7.18.13", "@graphql-codegen/cli": "^2.12.1", "@graphql-codegen/typescript": "^2.7.3", @@ -115,6 +115,7 @@ "prosemirror-state": "^1.4.1", "prosemirror-view": "^1.28.1", "rollup": "~2.79.1", + "rollup-plugin-visualizer": "^5.8.2", "sass": "^1.55.0", "solid-devtools": "^0.16.2", "solid-js": "^1.5.6", @@ -122,7 +123,7 @@ "solid-jsx": "^0.9.1", "solid-social": "^0.9.0", "solid-utils": "^0.8.1", - "sort-package-json": "^1.57.0", + "sort-package-json": "^2.0.0", "stylelint": "^14.12.1", "stylelint-config-css-modules": "^4.1.0", "stylelint-config-prettier-scss": "^0.0.1", diff --git a/src/components/Root.tsx b/src/components/Root.tsx index 2bd69fa2..34704518 100644 --- a/src/components/Root.tsx +++ b/src/components/Root.tsx @@ -2,50 +2,30 @@ // import 'solid-devtools' import { setLocale } from '../stores/ui' -import { Component, createEffect, createMemo } from 'solid-js' +import { Component, createEffect, createMemo, lazy } from 'solid-js' import { Routes, useRouter } from '../stores/router' import { Dynamic, isServer } from 'solid-js/web' import { getLogger } from '../utils/logger' import type { PageProps } from './types' -import { HomePage } from './Pages/HomePage' -import { AllTopicsPage } from './Pages/AllTopicsPage' -import { TopicPage } from './Pages/TopicPage' -import { AllAuthorsPage } from './Pages/AllAuthorsPage' -import { AuthorPage } from './Pages/AuthorPage' -import { FeedPage } from './Pages/FeedPage' -import { ArticlePage } from './Pages/ArticlePage' -import { SearchPage } from './Pages/SearchPage' -import { FourOuFourPage } from './Pages/FourOuFourPage' -import { DogmaPage } from './Pages/about/DogmaPage' -import { GuidePage } from './Pages/about/GuidePage' -import { HelpPage } from './Pages/about/HelpPage' -import { ManifestPage } from './Pages/about/ManifestPage' -import { PartnersPage } from './Pages/about/PartnersPage' -import { ProjectsPage } from './Pages/about/ProjectsPage' -import { TermsOfUsePage } from './Pages/about/TermsOfUsePage' -import { ThanksPage } from './Pages/about/ThanksPage' -import { CreatePage } from './Pages/CreatePage' - -// TODO: lazy load -// const HomePage = lazy(() => import('./Pages/HomePage')) -// const AllTopicsPage = lazy(() => import('./Pages/AllTopicsPage')) -// const TopicPage = lazy(() => import('./Pages/TopicPage')) -// const AllAuthorsPage = lazy(() => import('./Pages/AllAuthorsPage')) -// const AuthorPage = lazy(() => import('./Pages/AuthorPage')) -// const FeedPage = lazy(() => import('./Pages/FeedPage')) -// const ArticlePage = lazy(() => import('./Pages/ArticlePage')) -// const SearchPage = lazy(() => import('./Pages/SearchPage')) -// const FourOuFourPage = lazy(() => import('./Pages/FourOuFourPage')) -// const DogmaPage = lazy(() => import('./Pages/about/DogmaPage')) -// const GuidePage = lazy(() => import('./Pages/about/GuidePage')) -// const HelpPage = lazy(() => import('./Pages/about/HelpPage')) -// const ManifestPage = lazy(() => import('./Pages/about/ManifestPage')) -// const PartnersPage = lazy(() => import('./Pages/about/PartnersPage')) -// const ProjectsPage = lazy(() => import('./Pages/about/ProjectsPage')) -// const TermsOfUsePage = lazy(() => import('./Pages/about/TermsOfUsePage')) -// const ThanksPage = lazy(() => import('./Pages/about/ThanksPage')) +const HomePage = lazy(() => import('./Pages/HomePage')) +const AllTopicsPage = lazy(() => import('./Pages/AllTopicsPage')) +const TopicPage = lazy(() => import('./Pages/TopicPage')) +const AllAuthorsPage = lazy(() => import('./Pages/AllAuthorsPage')) +const AuthorPage = lazy(() => import('./Pages/AuthorPage')) +const FeedPage = lazy(() => import('./Pages/FeedPage')) +const ArticlePage = lazy(() => import('./Pages/ArticlePage')) +const SearchPage = lazy(() => import('./Pages/SearchPage')) +const FourOuFourPage = lazy(() => import('./Pages/FourOuFourPage')) +const DogmaPage = lazy(() => import('./Pages/about/DogmaPage')) +const GuidePage = lazy(() => import('./Pages/about/GuidePage')) +const HelpPage = lazy(() => import('./Pages/about/HelpPage')) +const ManifestPage = lazy(() => import('./Pages/about/ManifestPage')) +const PartnersPage = lazy(() => import('./Pages/about/PartnersPage')) +const ProjectsPage = lazy(() => import('./Pages/about/ProjectsPage')) +const TermsOfUsePage = lazy(() => import('./Pages/about/TermsOfUsePage')) +const ThanksPage = lazy(() => import('./Pages/about/ThanksPage')) const log = getLogger('root') diff --git a/src/utils/p2p.ts b/src/utils/p2p.ts index ebad5938..06d04889 100644 --- a/src/utils/p2p.ts +++ b/src/utils/p2p.ts @@ -10,7 +10,7 @@ export const roomConnect = ( keyname = 'reactions' ): [Y.XmlFragment, WebrtcProvider] => { const ydoc = new Y.Doc() - const yxmlfrag = ydoc.getXmlFragment(keyname) // TODO: encode/decode payload to Reactions[] + const yxmlfrag = ydoc.getXmlFragment(keyname) // TODO: use ydoc.getArray(keyname) as Reactions[] const webrtcOptions = { awareness: new Awareness(ydoc), filterBcConns: true, diff --git a/yarn.lock b/yarn.lock index 461f7d4a..70a712bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -163,7 +163,7 @@ uvu "^0.5.0" vfile-message "^3.0.0" -"@astrojs/node@^1.0.1": +"@astrojs/node@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@astrojs/node/-/node-1.1.0.tgz#3eb93d2062e4756a8a9886e28aff46e75ff3856d" integrity sha512-4KkCEFYtmTUSvU49UZSJD/VQfD/oKzf0ld8COjFW1pxfquBgvevLxRVpYLRanZB20L3c8/xyyQpDq7zMSMqQrg== @@ -206,7 +206,7 @@ node-fetch "^3.2.5" which-pm-runs "^1.1.0" -"@astrojs/vercel@^2.0.0": +"@astrojs/vercel@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@astrojs/vercel/-/vercel-2.1.0.tgz#c4cebbf2e6421c9de47b9721a72d7f0e861aa247" integrity sha512-fgudrqk/iG+CCtqdJ8B1nUWo7abzON5FEiL+VxNMdgDUgT5ChsAIOhvhxE+beyDqenQ3L3OyDsNPhSgLArEXtg== @@ -2353,7 +2353,7 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jsdevtools/rehype-toc@^3.0.2": +"@jsdevtools/rehype-toc@3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@jsdevtools/rehype-toc/-/rehype-toc-3.0.2.tgz#29c32e6b40cd4b5dafd96cb90d5057ac5dab4a51" integrity sha512-n5JEf16Wr4mdkRMZ8wMP/wN9/sHmTjRPbouXjJH371mZ2LEGDl72t8tEsMRNFerQN/QJtivOxqK1frdGa4QK5Q== @@ -2947,14 +2947,6 @@ "@types/qs" "*" "@types/serve-static" "*" -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/graceful-fs@^4.1.3": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" @@ -3047,11 +3039,6 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== -"@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - "@types/minimist@^1.2.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" @@ -4607,6 +4594,11 @@ detect-indent@^6.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== +detect-indent@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-7.0.1.tgz#cbb060a12842b9c4d333f1cac4aa4da1bb66bc25" + integrity sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g== + detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -4617,11 +4609,16 @@ detect-libc@^2.0.0: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== -detect-newline@3.1.0, detect-newline@^3.0.0: +detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== +detect-newline@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-4.0.0.tgz#450ac3f864d5f61112b53a524123b012c59581bc" + integrity sha512-1aXUEPdfGdzVPFpzGJJNgq9o81bGg1s09uxTWsqBlo9PI332uyJRQq13+LK/UN4JfxJbFdCXonUFQ9R/p7yCtw== + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" @@ -5654,7 +5651,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9: +fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -5975,10 +5972,10 @@ get-tsconfig@^4.2.0: resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.2.0.tgz#ff368dd7104dab47bf923404eb93838245c66543" integrity sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg== -git-hooks-list@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156" - integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ== +git-hooks-list@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-3.0.0.tgz#6d888988bb445b34e7c2e1eb97cb88358153221e" + integrity sha512-XDfdemBGJIMAsHHOONHQxEH5dX2kCpE6MGZ1IsNvBuDPBZM3p4EAwAC7ygMjn/1/x+BJX0TK1ara1Zrh7JCFdQ== github-slugger@^1.1.1, github-slugger@^1.4.0: version "1.4.0" @@ -6063,20 +6060,6 @@ globalyzer@0.1.0: resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== -globby@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.0.tgz#abfcd0630037ae174a88590132c2f6804e291072" - integrity sha512-3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw== - dependencies: - "@types/glob" "^7.1.1" - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.0.3" - glob "^7.1.3" - ignore "^5.1.1" - merge2 "^1.2.3" - slash "^3.0.0" - globby@^11.0.3, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" @@ -6089,7 +6072,7 @@ globby@^11.0.3, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -globby@^13.1.2: +globby@^13.1.1, globby@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515" integrity sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ== @@ -6845,11 +6828,6 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-plain-obj@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" @@ -8140,7 +8118,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: +merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== @@ -9818,6 +9796,13 @@ rehype-stringify@^9.0.0, rehype-stringify@^9.0.3: hast-util-to-html "^8.0.0" unified "^10.0.0" +rehype-toc@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rehype-toc/-/rehype-toc-3.0.2.tgz#0373e2abafddeb0606ee38229ff6714da6d86d68" + integrity sha512-DMt376+4i1KJGgHJL7Ezd65qKkJ7Eqp6JSB47BJ90ReBrohI9ufrornArM6f4oJjP2E2DVZZHufWucv/9t7GUQ== + dependencies: + "@jsdevtools/rehype-toc" "3.0.2" + rehype@^12.0.1: version "12.0.1" resolved "https://registry.yarnpkg.com/rehype/-/rehype-12.0.1.tgz#68a317662576dcaa2565a3952e149d6900096bf6" @@ -10066,6 +10051,15 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +rollup-plugin-visualizer@^5.8.2: + version "5.8.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.8.2.tgz#25a4cc6431aba2eba8ecb7c99d8c3623d493e4bd" + integrity sha512-Fh7KoAa7FVVOojmyyX9ro7fBSR7mPG2cgfDbA877HM4IeJJtSZO+I/R3h/u6TB8wVP5J4pXPpTaRMSREyqCS3g== + dependencies: + open "^8.4.0" + source-map "^0.7.4" + yargs "^17.5.1" + rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" @@ -10404,16 +10398,16 @@ sort-object-keys@^1.1.3: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== -sort-package-json@^1.57.0: - version "1.57.0" - resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.57.0.tgz#e95fb44af8ede0bb6147e3f39258102d4bb23fc4" - integrity sha512-FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q== +sort-package-json@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-2.0.0.tgz#3d772b370fa56e6f84ffb14a7e80b4273b61469a" + integrity sha512-71AZsHsf33oC8Pa0/4/6eo1IufgLfibqxTXTA3bfeicx8gba7kDc5Cofy2YHWrH/cV8nfXSQeMNpGliR07oEHA== dependencies: - detect-indent "^6.0.0" - detect-newline "3.1.0" - git-hooks-list "1.0.3" - globby "10.0.0" - is-plain-obj "2.1.0" + detect-indent "^7.0.0" + detect-newline "^4.0.0" + git-hooks-list "^3.0.0" + globby "^13.1.1" + is-plain-obj "^4.0.0" sort-object-keys "^1.1.3" "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: @@ -10434,7 +10428,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.0, source-map@^0.7.3: +source-map@^0.7.0, source-map@^0.7.3, source-map@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== @@ -11798,7 +11792,7 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.0.0, yargs@^17.3.1: +yargs@^17.0.0, yargs@^17.3.1, yargs@^17.5.1: version "17.6.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g==