A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: move importer into web/desktop app (#7472)
Abdullah Attaa62d4b5d4b2f
diff --git a/apps/web/package-lock.json b/apps/web/package-lock.jsonindex 7284bcaba..6d8398292 100644--- a/apps/web/package-lock.json+++ b/apps/web/package-lock.json@@ -21,7 +21,7 @@"@lingui/react": "5.1.2","@mdi/js": "7.4.47","@mdi/react": "1.6.1",- "@notesnook-importer/core": "^2.1.1",+ "@notesnook-importer/core": "^2.1.2","@notesnook/common": "file:../../packages/common","@notesnook/core": "file:../../packages/core","@notesnook/crypto": "file:../../packages/crypto",@@ -499,7 +499,7 @@},"../desktop": {"name": "@notesnook/desktop",- "version": "3.1.0-beta.3",+ "version": "3.1.0","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {@@ -541,7 +541,6 @@"version": "2.3.0","resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz","integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",- "dev": true,"license": "Apache-2.0","dependencies": {"@jridgewell/gen-mapping": "^0.3.5",@@ -590,14 +589,14 @@}},"node_modules/@azure/msal-node-extensions": {- "version": "1.5.1",- "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.1.tgz",- "integrity": "sha512-6MM5UU9BY5A4+SQ8xVI6/PwgnWlwXDM8Oj9hebuwWr9+CQOp4RqgULpwhipemxCyNaiFvZL5WwVBDdGgz9FlOg==",+ "version": "1.5.4",+ "resolved": "https://registry.npmjs.org/@azure/msal-node-extensions/-/msal-node-extensions-1.5.4.tgz",+ "integrity": "sha512-gRdPMSo8g0N68rek/WoFVpsoAysHTwnAGrl+H7/XDSQ6l166JxQxZ/nG9CoQ4+xBaUURlgVd4IUHtaqE8RG8yA==","hasInstallScript": true,"license": "MIT","optional": true,"dependencies": {- "@azure/msal-common": "15.0.1",+ "@azure/msal-common": "15.1.1","@azure/msal-node-runtime": "^0.17.1","keytar": "^7.8.0"},@@ -606,9 +605,9 @@}},"node_modules/@azure/msal-node-extensions/node_modules/@azure/msal-common": {- "version": "15.0.1",- "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.0.1.tgz",- "integrity": "sha512-JELxEK3Pnc4Rq8u+mI9u6o37auSpSOPCB7jaq7QziOAKi9WliWEmZZORCFHPbwf2xKitpHBXTz/0uerj17NsSQ==",+ "version": "15.1.1",+ "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-15.1.1.tgz",+ "integrity": "sha512-bvLWYq9fleAcTJ6H+hfkG91On6vI/UhGyOB7Z6r0Bsa+KTL3zPtigmGCOJgdxrEklOYD88X9SehexLDH/5NRKQ==","license": "MIT","optional": true,"engines": {@@ -650,7 +649,6 @@"version": "7.22.5","resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz","integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",- "dev": true,"license": "MIT","dependencies": {"@ampproject/remapping": "^2.2.0",@@ -809,7 +807,6 @@"version": "7.26.0","resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz","integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",- "dev": true,"license": "MIT","dependencies": {"@babel/helper-module-imports": "^7.25.9",@@ -941,7 +938,6 @@"version": "7.26.0","resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz","integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",- "dev": true,"license": "MIT","dependencies": {"@babel/template": "^7.25.9",@@ -2208,6 +2204,28 @@"react": ">=16.8.0"}},+ "node_modules/@electron/get": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz",+ "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "debug": "^4.1.1",+ "env-paths": "^2.2.0",+ "fs-extra": "^8.1.0",+ "got": "^11.8.5",+ "progress": "^2.0.3",+ "semver": "^6.2.0",+ "sumchecker": "^3.0.1"+ },+ "engines": {+ "node": ">=12"+ },+ "optionalDependencies": {+ "global-agent": "^3.0.0"+ }+ },"node_modules/@emotion/babel-plugin": {"version": "11.13.5","resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",@@ -2956,17 +2974,16 @@}},"node_modules/@notesnook-importer/core": {- "version": "2.1.1",- "resolved": "https://registry.npmjs.org/@notesnook-importer/core/-/core-2.1.1.tgz",- "integrity": "sha512-aVCvRPLQCwCzhqJ9/MZ4HtT8xtRGPS+JY5/pJD27ggEhzyF9OOd+AT9ugf7w2lpbTIP8f/3Nsn/CXiCJgDO98w==",+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/@notesnook-importer/core/-/core-2.1.2.tgz",+ "integrity": "sha512-sJLqKBkRZGLt5TqF7w1Ki5OUmT5vBhI4R6RYsbGWJiRLOQxfjQrhoQS9qP2DONEhK/2wMn9m5oyXRgPlVknFJw==","hasInstallScript": true,"license": "GPL-3.0-or-later","dependencies": {- "@notesnook-importer/enex": "^1.8.1",- "@notesnook-importer/onenote": "^1.8.1",- "@notesnook-importer/storage": "^1.8.1",- "@notesnook-importer/znel": "^1.8.1",- "@skiff-org/skiff-crypto": "^1.0.3",+ "@notesnook-importer/enex": "^2.1.2",+ "@notesnook-importer/onenote": "^2.1.2",+ "@notesnook-importer/storage": "^2.1.2",+ "@notesnook-importer/znel": "^2.1.2","@stablelib/chacha20poly1305": "^1.0.1","@standardnotes/features": "1.58.0","@standardnotes/models": "1.42.0",@@ -2992,6 +3009,7 @@"spark-md5": "^3.0.2","unified": "^10.1.2","unist-util-visit": "^5.0.0",+ "varint": "^6.0.0","zod": "^3.22.4"}},@@ -3002,9 +3020,9 @@"license": "MIT"},"node_modules/@notesnook-importer/enex": {- "version": "1.8.1",- "resolved": "https://registry.npmjs.org/@notesnook-importer/enex/-/enex-1.8.1.tgz",- "integrity": "sha512-k+DzJQPr/79rKg0hnml/ZHS9PX/4vm/ndOfF6PLdTBJsoAVgYhEOkroSwm8oA6V1j9Bn1Ew/7jpssKoUGqebsg==",+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/@notesnook-importer/enex/-/enex-2.1.2.tgz",+ "integrity": "sha512-gxalXrl9t6f8/rkcqqbTb4ZokeqX5VqUOQUI32wSaqEsqT0+2UyJ4oUWVh6CL9ZGa03pWvstcxVkd3XL150wmQ==","license": "GPL-3.0-or-later","dependencies": {"base64-js": "^1.5.1",@@ -3017,9 +3035,9 @@}},"node_modules/@notesnook-importer/onenote": {- "version": "1.8.1",- "resolved": "https://registry.npmjs.org/@notesnook-importer/onenote/-/onenote-1.8.1.tgz",- "integrity": "sha512-4xTPNHn9E/Fb5BnpqLghNLporgyHNOJTitzdJwBvNWAfomfS/limFPYNyfwYRFbX/Uq1drSKzdv0uAvq8/dhiQ==",+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/@notesnook-importer/onenote/-/onenote-2.1.2.tgz",+ "integrity": "sha512-12gjGtW34RcpPMF8zyG/AVoXlBLquRu6Xzlzp/ZX9d158r5NbSY+H13+6R+MTmr+6yO4dXeDkckEeQ83FaL5HQ==","license": "GPL-3.0-or-later","dependencies": {"@microsoft/microsoft-graph-client": "^3.0.7",@@ -3038,15 +3056,15 @@}},"node_modules/@notesnook-importer/storage": {- "version": "1.8.1",- "resolved": "https://registry.npmjs.org/@notesnook-importer/storage/-/storage-1.8.1.tgz",- "integrity": "sha512-/IFBI+yZHQOvD+vPLcKvixhbS9TJ4pfQcCkl3WvWZWDwHDYhkSL2Yf2bIgayPxjXWL/U8089tJt8hzWGmsecfw==",+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/@notesnook-importer/storage/-/storage-2.1.2.tgz",+ "integrity": "sha512-F/YjeRwwRAlrlQWj5OIpr4MqshQESoP4NXkmb0OizbGmkqW1oqNntlKzaW9wc9luNezDBU8+pQ3G2itZg7KBcQ==","license": "GPL-3.0-or-later"},"node_modules/@notesnook-importer/znel": {- "version": "1.8.1",- "resolved": "https://registry.npmjs.org/@notesnook-importer/znel/-/znel-1.8.1.tgz",- "integrity": "sha512-YkbDfzWREN/HW/Cg6cnZk4eajVEyMdMpxbF3qn2R5YaLWl8Rffa5bm1d/QlGf8u2XL6dyT9Q1tQ5MJ4umKfJvQ==",+ "version": "2.1.2",+ "resolved": "https://registry.npmjs.org/@notesnook-importer/znel/-/znel-2.1.2.tgz",+ "integrity": "sha512-SsBJNi0tL20D7dDg1oKVQDe2umLQfUxSf/LXrIwPIuaEpouRfJgN/mEmKoc4qipOaQn6CWoG6lWxhpw3XxPLTg==","license": "GPL-3.0-or-later","dependencies": {"base64-js": "^1.5.1",@@ -3715,42 +3733,17 @@"win32"]},- "node_modules/@skiff-org/skiff-crypto": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/@skiff-org/skiff-crypto/-/skiff-crypto-1.0.3.tgz",- "integrity": "sha512-SGHUUo+hLqkyjirX1/ucJIZBVPloV3BYIntIIIKpIe8gfyAVi7rfQ3X6NDer/rf3yUA8YPHPxvedhh8/SWUHzg==",+ "node_modules/@sindresorhus/is": {+ "version": "4.6.0",+ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",+ "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==","license": "MIT",- "dependencies": {- "@stablelib/chacha20poly1305": "^1.0.1",- "argon2-browser": "^1.18.0",- "base64-js": "^1.5.1",- "buffer": "^6.0.3",- "fflate": "^0.7.3",- "futoin-hkdf": "^1.5.0",- "lodash": "^4.17.21",- "randombytes": "^2.1.0",- "semver": "^7.3.4",- "tslib": "^2.4.0",- "tweetnacl": "^1.0.3",- "varint": "^6.0.0"- }- },- "node_modules/@skiff-org/skiff-crypto/node_modules/fflate": {- "version": "0.7.4",- "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz",- "integrity": "sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==",- "license": "MIT"- },- "node_modules/@skiff-org/skiff-crypto/node_modules/semver": {- "version": "7.6.3",- "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",- "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",- "license": "ISC",- "bin": {- "semver": "bin/semver.js"- },+ "peer": true,"engines": {"node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sindresorhus/is?sponsor=1"}},"node_modules/@stablelib/aead": {@@ -4603,6 +4596,19 @@"@swc/counter": "^0.1.3"}},+ "node_modules/@szmarczak/http-timer": {+ "version": "4.0.6",+ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",+ "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "defer-to-connect": "^2.0.0"+ },+ "engines": {+ "node": ">=10"+ }+ },"node_modules/@tanstack/query-core": {"version": "4.36.1","resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-4.36.1.tgz",@@ -4677,6 +4683,37 @@"polished": "^4.0.5"}},+ "node_modules/@theme-ui/color-modes": {+ "version": "0.16.2",+ "resolved": "https://registry.npmjs.org/@theme-ui/color-modes/-/color-modes-0.16.2.tgz",+ "integrity": "sha512-jWEWx53lxNgWCT38i/kwLV2rsvJz8lVZgi5oImnVwYba9VejXD23q1ckbNFJHosQ8KKXY87ht0KPC6BQFIiHtQ==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@theme-ui/core": "^0.16.2",+ "@theme-ui/css": "^0.16.2",+ "deepmerge": "^4.2.2"+ },+ "peerDependencies": {+ "@emotion/react": "^11.11.1",+ "react": ">=18"+ }+ },+ "node_modules/@theme-ui/color-modes/node_modules/@theme-ui/core": {+ "version": "0.16.2",+ "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.16.2.tgz",+ "integrity": "sha512-bBd/ltbwO9vIUjF1jtlOX6XN0IIOdf1vzBp2JCKsSOqdfn84m+XL8OogIe/zOhQ+aM94Nrq4+32tFJc8sFav4Q==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@theme-ui/css": "^0.16.2",+ "deepmerge": "^4.2.2"+ },+ "peerDependencies": {+ "@emotion/react": "^11.11.1",+ "react": ">=18"+ }+ },"node_modules/@theme-ui/components": {"version": "0.16.1","resolved": "https://registry.npmjs.org/@theme-ui/components/-/components-0.16.1.tgz",@@ -4722,6 +4759,37 @@"@emotion/react": "^11.11.1"}},+ "node_modules/@theme-ui/theme-provider": {+ "version": "0.16.2",+ "resolved": "https://registry.npmjs.org/@theme-ui/theme-provider/-/theme-provider-0.16.2.tgz",+ "integrity": "sha512-LRnVevODcGqO0JyLJ3wht+PV3ZoZcJ7XXLJAJWDoGeII4vZcPQKwVy4Lpz/juHsZppQxKcB3U+sQDGBnP25irQ==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@theme-ui/color-modes": "^0.16.2",+ "@theme-ui/core": "^0.16.2",+ "@theme-ui/css": "^0.16.2"+ },+ "peerDependencies": {+ "@emotion/react": "^11.11.1",+ "react": ">=18"+ }+ },+ "node_modules/@theme-ui/theme-provider/node_modules/@theme-ui/core": {+ "version": "0.16.2",+ "resolved": "https://registry.npmjs.org/@theme-ui/core/-/core-0.16.2.tgz",+ "integrity": "sha512-bBd/ltbwO9vIUjF1jtlOX6XN0IIOdf1vzBp2JCKsSOqdfn84m+XL8OogIe/zOhQ+aM94Nrq4+32tFJc8sFav4Q==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@theme-ui/css": "^0.16.2",+ "deepmerge": "^4.2.2"+ },+ "peerDependencies": {+ "@emotion/react": "^11.11.1",+ "react": ">=18"+ }+ },"node_modules/@trpc/client": {"version": "10.45.2","resolved": "https://registry.npmjs.org/@trpc/client/-/client-10.45.2.tgz",@@ -4754,7 +4822,6 @@"version": "10.45.2","resolved": "https://registry.npmjs.org/@trpc/server/-/server-10.45.2.tgz","integrity": "sha512-wOrSThNNE4HUnuhJG6PfDRp4L2009KDVxsd+2VYH8ro6o/7/jwYZ8Uu5j+VaW+mOmc8EHerHzGcdbGNQSAUPgg==",- "dev": true,"funding": ["https://trpc.io/sponsor"],@@ -4805,6 +4872,19 @@"@babel/types": "^7.20.7"}},+ "node_modules/@types/cacheable-request": {+ "version": "6.0.3",+ "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",+ "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/http-cache-semantics": "*",+ "@types/keyv": "^3.1.4",+ "@types/node": "*",+ "@types/responselike": "^1.0.0"+ }+ },"node_modules/@types/debug": {"version": "4.1.12","resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",@@ -4814,6 +4894,30 @@"@types/ms": "*"}},+ "node_modules/@types/eslint": {+ "version": "9.6.1",+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",+ "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/estree": "*",+ "@types/json-schema": "*"+ }+ },+ "node_modules/@types/eslint-scope": {+ "version": "3.7.7",+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",+ "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/eslint": "*",+ "@types/estree": "*"+ }+ },"node_modules/@types/estree": {"version": "1.0.6","resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",@@ -4844,6 +4948,13 @@"@types/unist": "^2"}},+ "node_modules/@types/http-cache-semantics": {+ "version": "4.0.4",+ "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",+ "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==",+ "license": "MIT",+ "peer": true+ },"node_modules/@types/json-schema": {"version": "7.0.15","resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",@@ -4857,6 +4968,16 @@"integrity": "sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==","license": "MIT"},+ "node_modules/@types/keyv": {+ "version": "3.1.4",+ "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",+ "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/node": "*"+ }+ },"node_modules/@types/marked": {"version": "6.0.0","resolved": "https://registry.npmjs.org/@types/marked/-/marked-6.0.0.tgz",@@ -4884,13 +5005,12 @@"license": "MIT"},"node_modules/@types/node": {- "version": "22.10.7",- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",- "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",- "dev": true,+ "version": "22.14.1",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",+ "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==","license": "MIT","dependencies": {- "undici-types": "~6.20.0"+ "undici-types": "~6.21.0"}},"node_modules/@types/node-fetch": {@@ -4927,14 +5047,12 @@"version": "15.7.14","resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz","integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",- "dev": true,"license": "MIT"},"node_modules/@types/react": {"version": "18.3.5","resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz","integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",- "dev": true,"license": "MIT","dependencies": {"@types/prop-types": "*",@@ -4988,6 +5106,16 @@"dev": true,"license": "MIT"},+ "node_modules/@types/responselike": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz",+ "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/node": "*"+ }+ },"node_modules/@types/styled-system": {"version": "5.1.23","resolved": "https://registry.npmjs.org/@types/styled-system/-/styled-system-5.1.23.tgz",@@ -5017,6 +5145,17 @@"dev": true,"license": "MIT"},+ "node_modules/@types/yauzl": {+ "version": "2.10.3",+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",+ "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",+ "license": "MIT",+ "optional": true,+ "peer": true,+ "dependencies": {+ "@types/node": "*"+ }+ },"node_modules/@vitejs/plugin-react-swc": {"version": "3.7.2","resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.7.2.tgz",@@ -5153,6 +5292,198 @@"url": "https://opencollective.com/vitest"}},+ "node_modules/@webassemblyjs/ast": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",+ "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/helper-numbers": "1.13.2",+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2"+ }+ },+ "node_modules/@webassemblyjs/floating-point-hex-parser": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",+ "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },+ "node_modules/@webassemblyjs/helper-api-error": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",+ "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },+ "node_modules/@webassemblyjs/helper-buffer": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",+ "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },+ "node_modules/@webassemblyjs/helper-numbers": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",+ "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/floating-point-hex-parser": "1.13.2",+ "@webassemblyjs/helper-api-error": "1.13.2",+ "@xtuc/long": "4.2.2"+ }+ },+ "node_modules/@webassemblyjs/helper-wasm-bytecode": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",+ "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },+ "node_modules/@webassemblyjs/helper-wasm-section": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",+ "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/ast": "1.14.1",+ "@webassemblyjs/helper-buffer": "1.14.1",+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",+ "@webassemblyjs/wasm-gen": "1.14.1"+ }+ },+ "node_modules/@webassemblyjs/ieee754": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",+ "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@xtuc/ieee754": "^1.2.0"+ }+ },+ "node_modules/@webassemblyjs/leb128": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",+ "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",+ "dev": true,+ "license": "Apache-2.0",+ "peer": true,+ "dependencies": {+ "@xtuc/long": "4.2.2"+ }+ },+ "node_modules/@webassemblyjs/utf8": {+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",+ "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },+ "node_modules/@webassemblyjs/wasm-edit": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",+ "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/ast": "1.14.1",+ "@webassemblyjs/helper-buffer": "1.14.1",+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",+ "@webassemblyjs/helper-wasm-section": "1.14.1",+ "@webassemblyjs/wasm-gen": "1.14.1",+ "@webassemblyjs/wasm-opt": "1.14.1",+ "@webassemblyjs/wasm-parser": "1.14.1",+ "@webassemblyjs/wast-printer": "1.14.1"+ }+ },+ "node_modules/@webassemblyjs/wasm-gen": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",+ "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/ast": "1.14.1",+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",+ "@webassemblyjs/ieee754": "1.13.2",+ "@webassemblyjs/leb128": "1.13.2",+ "@webassemblyjs/utf8": "1.13.2"+ }+ },+ "node_modules/@webassemblyjs/wasm-opt": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",+ "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/ast": "1.14.1",+ "@webassemblyjs/helper-buffer": "1.14.1",+ "@webassemblyjs/wasm-gen": "1.14.1",+ "@webassemblyjs/wasm-parser": "1.14.1"+ }+ },+ "node_modules/@webassemblyjs/wasm-parser": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",+ "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/ast": "1.14.1",+ "@webassemblyjs/helper-api-error": "1.13.2",+ "@webassemblyjs/helper-wasm-bytecode": "1.13.2",+ "@webassemblyjs/ieee754": "1.13.2",+ "@webassemblyjs/leb128": "1.13.2",+ "@webassemblyjs/utf8": "1.13.2"+ }+ },+ "node_modules/@webassemblyjs/wast-printer": {+ "version": "1.14.1",+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",+ "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@webassemblyjs/ast": "1.14.1",+ "@xtuc/long": "4.2.2"+ }+ },+ "node_modules/@xtuc/ieee754": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",+ "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",+ "dev": true,+ "license": "BSD-3-Clause",+ "peer": true+ },+ "node_modules/@xtuc/long": {+ "version": "4.2.2",+ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",+ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",+ "dev": true,+ "license": "Apache-2.0",+ "peer": true+ },"node_modules/@zip.js/zip.js": {"version": "2.7.54","resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.54.tgz",@@ -5214,6 +5545,51 @@"url": "https://github.com/sponsors/epoberezkin"}},+ "node_modules/ajv-formats": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",+ "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "ajv": "^8.0.0"+ },+ "peerDependencies": {+ "ajv": "^8.0.0"+ },+ "peerDependenciesMeta": {+ "ajv": {+ "optional": true+ }+ }+ },+ "node_modules/ajv-formats/node_modules/ajv": {+ "version": "8.17.1",+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",+ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "fast-deep-equal": "^3.1.3",+ "fast-uri": "^3.0.1",+ "json-schema-traverse": "^1.0.0",+ "require-from-string": "^2.0.2"+ },+ "funding": {+ "type": "github",+ "url": "https://github.com/sponsors/epoberezkin"+ }+ },+ "node_modules/ajv-formats/node_modules/json-schema-traverse": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },"node_modules/ajv-keywords": {"version": "3.5.2","resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",@@ -5272,12 +5648,6 @@"node": ">=10"}},- "node_modules/argon2-browser": {- "version": "1.18.0",- "resolved": "https://registry.npmjs.org/argon2-browser/-/argon2-browser-1.18.0.tgz",- "integrity": "sha512-ImVAGIItnFnvET1exhsQB7apRztcoC5TnlSqernMJDUjbc/DLq3UEYeXFrLPrlaIl8cVfwnXb6wX2KpFf2zxHw==",- "license": "MIT"- },"node_modules/argparse": {"version": "1.0.10","resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",@@ -5608,6 +5978,15 @@"integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==","license": "ISC"},+ "node_modules/boolean": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",+ "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",+ "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",+ "license": "MIT",+ "optional": true,+ "peer": true+ },"node_modules/brace-expansion": {"version": "1.1.11","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",@@ -5655,6 +6034,7 @@"version": "6.0.3","resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz","integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",+ "dev": true,"funding": [{"type": "github",@@ -5675,6 +6055,16 @@"ieee754": "^1.2.1"}},+ "node_modules/buffer-crc32": {+ "version": "0.2.13",+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": "*"+ }+ },"node_modules/buffer-equal-constant-time": {"version": "1.0.1","resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",@@ -5698,6 +6088,35 @@"node": ">=8"}},+ "node_modules/cacheable-lookup": {+ "version": "5.0.4",+ "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",+ "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=10.6.0"+ }+ },+ "node_modules/cacheable-request": {+ "version": "7.0.4",+ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz",+ "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "clone-response": "^1.0.2",+ "get-stream": "^5.1.0",+ "http-cache-semantics": "^4.0.0",+ "keyv": "^4.0.0",+ "lowercase-keys": "^2.0.0",+ "normalize-url": "^6.0.1",+ "responselike": "^2.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/call-bind": {"version": "1.0.8","resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",@@ -5900,6 +6319,17 @@"node": ">=10"}},+ "node_modules/chrome-trace-event": {+ "version": "1.0.4",+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",+ "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=6.0"+ }+ },"node_modules/clipboard-polyfill": {"version": "4.1.0","resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-4.1.0.tgz",@@ -5921,6 +6351,19 @@"node": ">=12"}},+ "node_modules/clone-response": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",+ "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "mimic-response": "^1.0.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/color-convert": {"version": "2.0.1","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",@@ -6195,7 +6638,6 @@"version": "6.0.0","resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz","integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",- "devOptional": true,"license": "MIT","dependencies": {"mimic-response": "^3.1.0"@@ -6211,7 +6653,6 @@"version": "3.1.0","resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz","integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",- "devOptional": true,"license": "MIT","engines": {"node": ">=10"@@ -6249,11 +6690,21 @@"node": ">=0.10.0"}},+ "node_modules/defer-to-connect": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",+ "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=10"+ }+ },"node_modules/define-data-property": {"version": "1.1.4","resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz","integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",- "dev": true,+ "devOptional": true,"license": "MIT","dependencies": {"es-define-property": "^1.0.0",@@ -6281,7 +6732,7 @@"version": "1.2.1","resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz","integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",- "dev": true,+ "devOptional": true,"license": "MIT","dependencies": {"define-data-property": "^1.0.1",@@ -6330,6 +6781,14 @@"node": ">=8"}},+ "node_modules/detect-node": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",+ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",+ "license": "MIT",+ "optional": true,+ "peer": true+ },"node_modules/diff": {"version": "5.2.0","resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",@@ -6552,12 +7011,26 @@"version": "1.4.4","resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz","integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",- "devOptional": true,"license": "MIT","dependencies": {"once": "^1.4.0"}},+ "node_modules/enhanced-resolve": {+ "version": "5.18.1",+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",+ "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "graceful-fs": "^4.2.4",+ "tapable": "^2.2.0"+ },+ "engines": {+ "node": ">=10.13.0"+ }+ },"node_modules/entities": {"version": "4.5.0","resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",@@ -6570,6 +7043,16 @@"url": "https://github.com/fb55/entities?sponsor=1"}},+ "node_modules/env-paths": {+ "version": "2.2.1",+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=6"+ }+ },"node_modules/error-ex": {"version": "1.3.2","resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",@@ -6649,7 +7132,7 @@"version": "1.0.1","resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz","integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",- "dev": true,+ "devOptional": true,"license": "MIT","engines": {"node": ">= 0.4"@@ -6659,7 +7142,7 @@"version": "1.3.0","resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz","integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",- "dev": true,+ "devOptional": true,"license": "MIT","engines": {"node": ">= 0.4"@@ -6719,6 +7202,14 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/es6-error": {+ "version": "4.1.1",+ "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",+ "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",+ "license": "MIT",+ "optional": true,+ "peer": true+ },"node_modules/esbuild": {"version": "0.21.5","resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",@@ -6779,6 +7270,21 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/eslint-scope": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",+ "dev": true,+ "license": "BSD-2-Clause",+ "peer": true,+ "dependencies": {+ "esrecurse": "^4.3.0",+ "estraverse": "^4.1.1"+ },+ "engines": {+ "node": ">=8.0.0"+ }+ },"node_modules/esprima": {"version": "4.0.1","resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",@@ -6792,6 +7298,42 @@"node": ">=4"}},+ "node_modules/esrecurse": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",+ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",+ "dev": true,+ "license": "BSD-2-Clause",+ "peer": true,+ "dependencies": {+ "estraverse": "^5.2.0"+ },+ "engines": {+ "node": ">=4.0"+ }+ },+ "node_modules/esrecurse/node_modules/estraverse": {+ "version": "5.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",+ "dev": true,+ "license": "BSD-2-Clause",+ "peer": true,+ "engines": {+ "node": ">=4.0"+ }+ },+ "node_modules/estraverse": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",+ "dev": true,+ "license": "BSD-2-Clause",+ "peer": true,+ "engines": {+ "node": ">=4.0"+ }+ },"node_modules/estree-walker": {"version": "2.0.2","resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",@@ -6815,6 +7357,17 @@"integrity": "sha512-4IJSItgS/41IxN5UVAVuAyczwZF7ZIEsM1XAoUzIHA6A+xzusEZUutdXz2Nr+MQPLxfTiCvqE79/C8HT8fKFvA==","license": "MIT"},+ "node_modules/events": {+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=0.8.x"+ }+ },"node_modules/exenv": {"version": "1.2.2","resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",@@ -6859,6 +7412,27 @@"node": ">=0.10.0"}},+ "node_modules/extract-zip": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",+ "license": "BSD-2-Clause",+ "peer": true,+ "dependencies": {+ "debug": "^4.1.1",+ "get-stream": "^5.1.0",+ "yauzl": "^2.10.0"+ },+ "bin": {+ "extract-zip": "cli.js"+ },+ "engines": {+ "node": ">= 10.17.0"+ },+ "optionalDependencies": {+ "@types/yauzl": "^2.9.1"+ }+ },"node_modules/fast-deep-equal": {"version": "3.1.3","resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",@@ -6890,6 +7464,16 @@],"license": "BSD-3-Clause"},+ "node_modules/fd-slicer": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "pend": "~1.2.0"+ }+ },"node_modules/fdir": {"version": "6.4.3","resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",@@ -7076,6 +7660,21 @@"devOptional": true,"license": "MIT"},+ "node_modules/fs-extra": {+ "version": "8.1.0",+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "graceful-fs": "^4.2.0",+ "jsonfile": "^4.0.0",+ "universalify": "^0.1.0"+ },+ "engines": {+ "node": ">=6 <7 || >=8"+ }+ },"node_modules/fs-minipass": {"version": "2.1.0","resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",@@ -7171,15 +7770,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/futoin-hkdf": {- "version": "1.5.3",- "resolved": "https://registry.npmjs.org/futoin-hkdf/-/futoin-hkdf-1.5.3.tgz",- "integrity": "sha512-SewY5KdMpaoCeh7jachEWFsh1nNlaDjNHZXWqL5IGwtpEYHTgkr2+AMCgNwKWkcc0wpSYrZfR7he4WdmHFtDxQ==",- "license": "Apache-2.0",- "engines": {- "node": ">=8"- }- },"node_modules/gauge": {"version": "3.0.2","resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",@@ -7206,7 +7796,6 @@"version": "1.0.0-beta.2","resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz","integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",- "dev": true,"license": "MIT","engines": {"node": ">=6.9.0"@@ -7268,6 +7857,22 @@"node": ">= 0.4"}},+ "node_modules/get-stream": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "pump": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/get-symbol-description": {"version": "1.1.0","resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",@@ -7315,6 +7920,47 @@"url": "https://github.com/sponsors/isaacs"}},+ "node_modules/glob-to-regexp": {+ "version": "0.4.1",+ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",+ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",+ "dev": true,+ "license": "BSD-2-Clause",+ "peer": true+ },+ "node_modules/global-agent": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",+ "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",+ "license": "BSD-3-Clause",+ "optional": true,+ "peer": true,+ "dependencies": {+ "boolean": "^3.0.1",+ "es6-error": "^4.1.1",+ "matcher": "^3.0.0",+ "roarr": "^2.15.3",+ "semver": "^7.3.2",+ "serialize-error": "^7.0.1"+ },+ "engines": {+ "node": ">=10.0"+ }+ },+ "node_modules/global-agent/node_modules/semver": {+ "version": "7.7.1",+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",+ "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",+ "license": "ISC",+ "optional": true,+ "peer": true,+ "bin": {+ "semver": "bin/semver.js"+ },+ "engines": {+ "node": ">=10"+ }+ },"node_modules/globals": {"version": "11.12.0","resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",@@ -7328,7 +7974,7 @@"version": "1.0.4","resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz","integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",- "dev": true,+ "devOptional": true,"license": "MIT","dependencies": {"define-properties": "^1.2.1",@@ -7354,7 +8000,7 @@"version": "1.2.0","resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz","integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",- "dev": true,+ "devOptional": true,"license": "MIT","engines": {"node": ">= 0.4"@@ -7363,11 +8009,36 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/got": {+ "version": "11.8.6",+ "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",+ "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@sindresorhus/is": "^4.0.0",+ "@szmarczak/http-timer": "^4.0.5",+ "@types/cacheable-request": "^6.0.1",+ "@types/responselike": "^1.0.0",+ "cacheable-lookup": "^5.0.3",+ "cacheable-request": "^7.0.2",+ "decompress-response": "^6.0.0",+ "http2-wrapper": "^1.0.0-beta.5.2",+ "lowercase-keys": "^2.0.0",+ "p-cancelable": "^2.0.0",+ "responselike": "^2.0.0"+ },+ "engines": {+ "node": ">=10.19.0"+ },+ "funding": {+ "url": "https://github.com/sindresorhus/got?sponsor=1"+ }+ },"node_modules/graceful-fs": {"version": "4.2.11","resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz","integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",- "dev": true,"license": "ISC"},"node_modules/gray-matter": {@@ -7426,7 +8097,7 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz","integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",- "dev": true,+ "devOptional": true,"license": "MIT","dependencies": {"es-define-property": "^1.0.0"@@ -7698,10 +8369,31 @@],"license": "MIT","dependencies": {- "domelementtype": "^2.3.0",- "domhandler": "^5.0.3",- "domutils": "^3.0.1",- "entities": "^4.4.0"+ "domelementtype": "^2.3.0",+ "domhandler": "^5.0.3",+ "domutils": "^3.0.1",+ "entities": "^4.4.0"+ }+ },+ "node_modules/http-cache-semantics": {+ "version": "4.1.1",+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",+ "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",+ "license": "BSD-2-Clause",+ "peer": true+ },+ "node_modules/http2-wrapper": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",+ "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "quick-lru": "^5.1.1",+ "resolve-alpn": "^1.0.0"+ },+ "engines": {+ "node": ">=10.19.0"}},"node_modules/https-proxy-agent": {@@ -7729,6 +8421,7 @@"version": "1.2.1","resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz","integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",+ "devOptional": true,"funding": [{"type": "github",@@ -8317,6 +9010,39 @@"node": ">=10"}},+ "node_modules/jest-worker": {+ "version": "27.5.1",+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",+ "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/node": "*",+ "merge-stream": "^2.0.0",+ "supports-color": "^8.0.0"+ },+ "engines": {+ "node": ">= 10.13.0"+ }+ },+ "node_modules/jest-worker/node_modules/supports-color": {+ "version": "8.1.1",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",+ "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "has-flag": "^4.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/supports-color?sponsor=1"+ }+ },"node_modules/js-sha256": {"version": "0.10.1","resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",@@ -8354,6 +9080,13 @@"node": ">=6"}},+ "node_modules/json-buffer": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",+ "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",+ "license": "MIT",+ "peer": true+ },"node_modules/json-parse-even-better-errors": {"version": "2.3.1","resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",@@ -8374,11 +9107,18 @@"dev": true,"license": "MIT"},+ "node_modules/json-stringify-safe": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",+ "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",+ "license": "ISC",+ "optional": true,+ "peer": true+ },"node_modules/json5": {"version": "2.2.3","resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz","integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",- "dev": true,"license": "MIT","bin": {"json5": "lib/cli.js"@@ -8387,6 +9127,16 @@"node": ">=6"}},+ "node_modules/jsonfile": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",+ "license": "MIT",+ "peer": true,+ "optionalDependencies": {+ "graceful-fs": "^4.1.6"+ }+ },"node_modules/jsonpointer": {"version": "5.0.1","resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",@@ -8489,6 +9239,16 @@"prebuild-install": "^7.0.1"}},+ "node_modules/keyv": {+ "version": "4.5.4",+ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",+ "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "json-buffer": "3.0.1"+ }+ },"node_modules/kind-of": {"version": "6.0.3","resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",@@ -8523,6 +9283,17 @@"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==","license": "MIT"},+ "node_modules/loader-runner": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",+ "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=6.11.5"+ }+ },"node_modules/loader-utils": {"version": "2.0.4","resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",@@ -8542,6 +9313,7 @@"version": "4.17.21","resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz","integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",+ "dev": true,"license": "MIT"},"node_modules/lodash.debounce": {@@ -8685,6 +9457,16 @@"tslib": "^2.0.3"}},+ "node_modules/lowercase-keys": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",+ "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=8"+ }+ },"node_modules/lru-cache": {"version": "5.1.1","resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",@@ -8755,6 +9537,20 @@"node": ">= 18"}},+ "node_modules/matcher": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",+ "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",+ "license": "MIT",+ "optional": true,+ "peer": true,+ "dependencies": {+ "escape-string-regexp": "^4.0.0"+ },+ "engines": {+ "node": ">=10"+ }+ },"node_modules/math-intrinsics": {"version": "1.1.0","resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",@@ -9053,6 +9849,14 @@"url": "https://opencollective.com/unified"}},+ "node_modules/merge-stream": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },"node_modules/micromark": {"version": "3.2.0","resolved": "https://registry.npmjs.org/micromark/-/micromark-3.2.0.tgz",@@ -9656,6 +10460,16 @@"node": ">= 0.6"}},+ "node_modules/mimic-response": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",+ "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=4"+ }+ },"node_modules/minimatch": {"version": "3.1.2","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",@@ -9806,6 +10620,14 @@"devOptional": true,"license": "MIT"},+ "node_modules/neo-async": {+ "version": "2.6.2",+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",+ "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",+ "dev": true,+ "license": "MIT",+ "peer": true+ },"node_modules/no-case": {"version": "3.0.4","resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",@@ -9902,6 +10724,19 @@"node": ">=0.10.0"}},+ "node_modules/normalize-url": {+ "version": "6.1.0",+ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",+ "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/npmlog": {"version": "5.0.1","resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",@@ -9954,7 +10789,7 @@"version": "1.1.1","resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz","integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",- "dev": true,+ "devOptional": true,"license": "MIT","engines": {"node": ">= 0.4"@@ -9985,7 +10820,6 @@"version": "1.4.0","resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz","integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",- "devOptional": true,"license": "ISC","dependencies": {"wrappy": "1"@@ -10039,6 +10873,16 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/p-cancelable": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",+ "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=8"+ }+ },"node_modules/parent-module": {"version": "1.0.1","resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",@@ -10142,6 +10986,13 @@"canvas": "^2.11.2"}},+ "node_modules/pend": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",+ "license": "MIT",+ "peer": true+ },"node_modules/phone": {"version": "3.1.57","resolved": "https://registry.npmjs.org/phone/-/phone-3.1.57.tgz",@@ -10332,6 +11183,16 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/progress": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=0.4.0"+ }+ },"node_modules/prop-types": {"version": "15.8.1","resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",@@ -10363,7 +11224,6 @@"version": "3.0.2","resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz","integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",- "devOptional": true,"license": "MIT","dependencies": {"end-of-stream": "^1.1.0",@@ -10392,10 +11252,24 @@"integrity": "sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==","license": "MIT"},+ "node_modules/quick-lru": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",+ "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/randombytes": {"version": "2.1.0","resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz","integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",+ "dev": true,"license": "MIT","dependencies": {"safe-buffer": "^5.1.0"@@ -10923,6 +11797,13 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/resolve-alpn": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",+ "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",+ "license": "MIT",+ "peer": true+ },"node_modules/resolve-from": {"version": "4.0.0","resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",@@ -10932,6 +11813,19 @@"node": ">=4"}},+ "node_modules/responselike": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",+ "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "lowercase-keys": "^2.0.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/rimraf": {"version": "3.0.2","resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",@@ -10949,6 +11843,33 @@"url": "https://github.com/sponsors/isaacs"}},+ "node_modules/roarr": {+ "version": "2.15.4",+ "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",+ "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",+ "license": "BSD-3-Clause",+ "optional": true,+ "peer": true,+ "dependencies": {+ "boolean": "^3.0.1",+ "detect-node": "^2.0.4",+ "globalthis": "^1.0.1",+ "json-stringify-safe": "^5.0.1",+ "semver-compare": "^1.0.0",+ "sprintf-js": "^1.1.2"+ },+ "engines": {+ "node": ">=8.0"+ }+ },+ "node_modules/roarr/node_modules/sprintf-js": {+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",+ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",+ "license": "BSD-3-Clause",+ "optional": true,+ "peer": true+ },"node_modules/rollup": {"version": "4.31.0","resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",@@ -11166,6 +12087,31 @@"semver": "bin/semver.js"}},+ "node_modules/semver-compare": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",+ "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",+ "license": "MIT",+ "optional": true,+ "peer": true+ },+ "node_modules/serialize-error": {+ "version": "7.0.1",+ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",+ "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",+ "license": "MIT",+ "optional": true,+ "peer": true,+ "dependencies": {+ "type-fest": "^0.13.1"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/serialize-javascript": {"version": "6.0.2","resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",@@ -11699,6 +12645,19 @@"integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==","license": "MIT"},+ "node_modules/sumchecker": {+ "version": "3.0.1",+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",+ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",+ "license": "Apache-2.0",+ "peer": true,+ "dependencies": {+ "debug": "^4.1.0"+ },+ "engines": {+ "node": ">= 8.0"+ }+ },"node_modules/supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -11731,6 +12690,17 @@"dev": true,"license": "MIT"},+ "node_modules/tapable": {+ "version": "2.2.1",+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",+ "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=6"+ }+ },"node_modules/tar": {"version": "6.2.1","resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",@@ -12076,11 +13046,19 @@"node": "*"}},- "node_modules/tweetnacl": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",- "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",- "license": "Unlicense"+ "node_modules/type-fest": {+ "version": "0.13.1",+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",+ "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",+ "license": "(MIT OR CC0-1.0)",+ "optional": true,+ "peer": true,+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }},"node_modules/typed-array-buffer": {"version": "1.0.3",@@ -12180,10 +13158,9 @@}},"node_modules/undici-types": {- "version": "6.20.0",- "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",- "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",- "dev": true,+ "version": "6.21.0",+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",+ "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==","license": "MIT"},"node_modules/unicode-canonical-property-names-ecmascript": {@@ -12373,6 +13350,16 @@"url": "https://opencollective.com/unified"}},+ "node_modules/universalify": {+ "version": "0.1.2",+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">= 4.0.0"+ }+ },"node_modules/unraw": {"version": "3.0.0","resolved": "https://registry.npmjs.org/unraw/-/unraw-3.0.0.tgz",@@ -12770,6 +13757,21 @@"loose-envify": "^1.0.0"}},+ "node_modules/watchpack": {+ "version": "2.4.2",+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",+ "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "glob-to-regexp": "^0.4.1",+ "graceful-fs": "^4.1.2"+ },+ "engines": {+ "node": ">=10.13.0"+ }+ },"node_modules/web-namespaces": {"version": "2.0.1","resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz",@@ -12799,6 +13801,65 @@"node": ">=12"}},+ "node_modules/webpack": {+ "version": "5.97.1",+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",+ "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "@types/eslint-scope": "^3.7.7",+ "@types/estree": "^1.0.6",+ "@webassemblyjs/ast": "^1.14.1",+ "@webassemblyjs/wasm-edit": "^1.14.1",+ "@webassemblyjs/wasm-parser": "^1.14.1",+ "acorn": "^8.14.0",+ "browserslist": "^4.24.0",+ "chrome-trace-event": "^1.0.2",+ "enhanced-resolve": "^5.17.1",+ "es-module-lexer": "^1.2.1",+ "eslint-scope": "5.1.1",+ "events": "^3.2.0",+ "glob-to-regexp": "^0.4.1",+ "graceful-fs": "^4.2.11",+ "json-parse-even-better-errors": "^2.3.1",+ "loader-runner": "^4.2.0",+ "mime-types": "^2.1.27",+ "neo-async": "^2.6.2",+ "schema-utils": "^3.2.0",+ "tapable": "^2.1.1",+ "terser-webpack-plugin": "^5.3.10",+ "watchpack": "^2.4.1",+ "webpack-sources": "^3.2.3"+ },+ "bin": {+ "webpack": "bin/webpack.js"+ },+ "engines": {+ "node": ">=10.13.0"+ },+ "funding": {+ "type": "opencollective",+ "url": "https://opencollective.com/webpack"+ },+ "peerDependenciesMeta": {+ "webpack-cli": {+ "optional": true+ }+ }+ },+ "node_modules/webpack-sources": {+ "version": "3.2.3",+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",+ "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",+ "dev": true,+ "license": "MIT",+ "peer": true,+ "engines": {+ "node": ">=10.13.0"+ }+ },"node_modules/whatwg-fetch": {"version": "3.6.20","resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz",@@ -13470,7 +14531,6 @@"version": "1.0.2","resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz","integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",- "devOptional": true,"license": "ISC"},"node_modules/y18n": {@@ -13527,6 +14587,17 @@"node": ">=12"}},+ "node_modules/yauzl": {+ "version": "2.10.0",+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",+ "license": "MIT",+ "peer": true,+ "dependencies": {+ "buffer-crc32": "~0.2.3",+ "fd-slicer": "~1.1.0"+ }+ },"node_modules/zod": {"version": "3.24.1","resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",diff --git a/apps/web/package.json b/apps/web/package.jsonindex 5cc44afe4..dd9d9d6d8 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -19,7 +19,7 @@"@lingui/react": "5.1.2","@mdi/js": "7.4.47","@mdi/react": "1.6.1",- "@notesnook-importer/core": "^2.1.1",+ "@notesnook-importer/core": "^2.1.2","@notesnook/common": "file:../../packages/common","@notesnook/core": "file:../../packages/core","@notesnook/crypto": "file:../../packages/crypto",diff --git a/apps/web/src/components/accordion/index.tsx b/apps/web/src/components/accordion/index.tsxindex 0b9dfb0eb..bc376a4b9 100644--- a/apps/web/src/components/accordion/index.tsx+++ b/apps/web/src/components/accordion/index.tsx@@ -45,11 +45,7 @@ export default function Accordion(containerSx,...restProps} = props;- const [isContentHidden, setIsContentHidden] = useState(false);-- useEffect(() => {- setIsContentHidden(isClosed);- }, [isClosed]);+ const [isContentHidden, setIsContentHidden] = useState(isClosed);return (<Flex sx={{ flexDirection: "column", ...sx }} {...restProps}>diff --git a/apps/web/src/components/importer/components/file-provider-handler.tsx b/apps/web/src/components/importer/components/file-provider-handler.tsxnew file mode 100644index 000000000..f30f8e566--- /dev/null+++ b/apps/web/src/components/importer/components/file-provider-handler.tsx@@ -0,0 +1,314 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import {+ IFile,+ IFileProvider,+ ProviderSettings,+ transform+} from "@notesnook-importer/core";+import { formatBytes } from "@notesnook/common";+import { ScrollContainer } from "@notesnook/ui";+import { Button, Flex, Input, Text } from "@theme-ui/components";+import { xxhash64 } from "hash-wasm";+import { useCallback, useEffect, useRef, useState } from "react";+import { useDropzone } from "react-dropzone";+import { importNote } from "../../../utils/importer";+import Accordion from "../../accordion";+import { TransformResult } from "../types";++type FileProviderHandlerProps = {+ provider: IFileProvider;+ onTransformFinished: (result: TransformResult) => void;+};++type Progress = {+ total: number;+ done: number;+};++export function FileProviderHandler(props: FileProviderHandlerProps) {+ const { provider, onTransformFinished } = props;+ const [files, setFiles] = useState<File[]>([]);+ const [filesProgress, setFilesProgress] = useState<Progress>({+ done: 0,+ total: 0+ });+ const [totalNoteCount, setTotalNoteCount] = useState(0);+ const [_, setCounter] = useState<number>(0);+ const logs = useRef<string[]>([]);++ const onDrop = useCallback((acceptedFiles: File[]) => {+ setFiles((files) => {+ const newFiles = [...acceptedFiles, ...files];+ return newFiles;+ });+ }, []);++ const { getRootProps, getInputProps, isDragActive } = useDropzone({+ onDrop,+ accept: {+ file: provider?.supportedExtensions?.concat([".zip"])+ }+ });++ useEffect(() => {+ setFiles([]);+ }, [provider]);++ async function onStartImport() {+ let totalNotes = 0;+ const errors: Error[] = [];+ const settings: ProviderSettings = {+ clientType: "browser",+ hasher: { type: "xxh64", hash: xxhash64 },+ storage: {+ clear: async () => undefined,+ get: async () => [],+ write: async (data) => {+ logs.current.push(+ `[${new Date().toLocaleString()}] Pushing ${+ data.title+ } into database`+ );++ await importNote(data);+ },+ iterate: async function* () {+ return null;+ }+ },+ log: (message) => {+ logs.current.push(+ `[${new Date(message.date).toLocaleString()}] ${message.text}`+ );+ setCounter((s) => ++s);+ },+ reporter: () => {+ setTotalNoteCount(++totalNotes);+ }+ };++ setTotalNoteCount(0);+ setFilesProgress({+ total: files.length,+ done: 0+ });++ for (const file of files) {+ setFilesProgress((p) => ({+ ...p,+ done: p.done + 1+ }));++ const providerFile: IFile = {+ name: file.name,+ modifiedAt: file.lastModified,+ size: file.size,+ data: file+ };+ errors.push(...(await transform(provider, [providerFile], settings)));+ }+ console.log("DONE", totalNotes);+ onTransformFinished({+ totalNotes,+ errors+ });+ }++ if (filesProgress.done) {+ return (+ <Flex sx={{ flexDirection: "column", alignItems: "stretch" }}>+ <Text variant="subtitle">+ Processing {filesProgress.done} of {filesProgress.total} file(s)+ </Text>+ <Text variant="body" sx={{ mt: 4, textAlign: "center" }}>+ Found {totalNoteCount} notes+ </Text>+ {logs.current.length > 0 && (+ <Accordion+ title="Logs"+ isClosed={false}+ sx={{+ border: "1px solid var(--border)",+ mt: 2+ }}+ >+ <ScrollContainer>+ <Text+ as="pre"+ variant="body"+ sx={{+ fontFamily: "monospace",+ maxHeight: 250,+ p: 2+ }}+ >+ {logs.current.map((c, index) => (+ <>+ <span key={index.toString()}>{c}</span>+ <br />+ </>+ ))}+ </Text>+ </ScrollContainer>+ </Accordion>+ )}+ </Flex>+ );+ }++ return (+ <Flex sx={{ flexDirection: "column", alignItems: "stretch" }}>+ <Text variant="subtitle">Select {provider.name} files</Text>+ <Text+ variant="body"+ as={"div"}+ sx={{ mt: 1, color: "paragraph", whiteSpace: "pre-wrap" }}+ >+ Check out our step-by-step guide on{" "}+ <a href={provider.helpLink} target="_blank" rel="noreferrer">+ how to import from {provider?.name}.+ </a>+ </Text>+ <Flex+ {...getRootProps()}+ sx={{+ justifyContent: "center",+ alignItems: "center",+ height: 100,+ border: "2px dashed var(--border)",+ borderRadius: "default",+ mt: 2,+ cursor: "pointer",+ ":hover": {+ bg: "background-secondary"+ }+ }}+ >+ <Input {...getInputProps()} />+ <Text variant="body" sx={{ textAlign: "center" }}>+ {isDragActive+ ? "Drop the files here"+ : "Drag & drop files here, or click to select files"}+ <br />+ <Text variant="subBody">+ Only {provider?.supportedExtensions.join(", ")} files are supported.{" "}+ {provider?.supportedExtensions.includes(".zip") ? null : (+ <>+ You can also select .zip files containing{" "}+ {provider?.supportedExtensions.join(", ")} files.+ </>+ )}+ <br />+ {provider.examples ? (+ <>For example, {provider.examples.join(", ")}</>+ ) : null}+ </Text>+ </Text>+ </Flex>+ {files.length > 0 ? (+ <Accordion+ isClosed+ title={`${files.length} ${+ files.length > 1 ? "files" : "file"+ } selected`}+ sx={{+ border: "1px solid var(--border)",+ mt: 2,+ borderRadius: "default"+ }}+ >+ <Flex+ sx={{ flexDirection: "column", overflowY: "auto", maxHeight: 400 }}+ >+ {files.map((file, index) => (+ <Flex+ key={file.name}+ sx={{+ p: 2,+ bg: index % 2 ? "transparent" : "background-secondary",+ alignItems: "center",+ justifyContent: "space-between",+ cursor: "pointer",+ ":hover": {+ bg: "hover"+ }+ }}+ onClick={() => {+ setFiles((files) => {+ const _files = files.slice();+ _files.splice(index, 1);+ return _files;+ });+ }}+ title="Click to remove"+ >+ <Text variant="body">{file.name}</Text>+ <Text variant="body">{formatBytes(file.size)}</Text>+ </Flex>+ ))}+ </Flex>+ </Accordion>+ ) : null}++ {!!files.length && (+ <>+ <Text+ variant="body"+ sx={{+ bg: "primary",+ color: "static",+ mt: 2,+ borderRadius: 5,+ p: 1+ }}+ >+ Please make sure you have at least{" "}+ {formatBytes(files.reduce((prev, file) => prev + file.size, 0))} of+ free space before proceeding.+ </Text>+ {provider.requiresNetwork ? (+ <Text+ variant="body"+ sx={{+ bg: "background-error",+ color: "paragraph-error",+ mt: 2,+ borderRadius: 5,+ p: 1+ }}+ >+ Please make sure you have good Internet access before proceeding.+ The importer may send network requests in order to download media+ resources such as images, files, and other attachments.+ </Text>+ ) : null}+ <Button+ variant="accent"+ sx={{ alignSelf: "center", mt: 2, px: 4 }}+ onClick={onStartImport}+ >+ Start importing+ </Button>+ </>+ )}+ </Flex>+ );+}diff --git a/apps/web/src/components/importer/components/import-errors.tsx b/apps/web/src/components/importer/components/import-errors.tsxnew file mode 100644index 000000000..111f656d8--- /dev/null+++ b/apps/web/src/components/importer/components/import-errors.tsx@@ -0,0 +1,60 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import { Button, Flex, Text } from "@theme-ui/components";+import Accordion from "../../accordion";++type ImportErrorsProps = {+ errors: Error[];+};++export function ImportErrors(props: ImportErrorsProps) {+ return (+ <Accordion+ isClosed={false}+ title={`${props.errors.length} errors occured`}+ sx={{ bg: "background-error", borderRadius: "default", mt: 2 }}+ color="paragraph-error"+ >+ <Flex sx={{ flexDirection: "column", px: 2, pb: 2, overflowX: "auto" }}>+ {props.errors.map((error, index) => (+ <Text+ variant="body"+ sx={{ color: "paragraph-error", my: 1, fontFamily: "monospace" }}+ >+ {index + 1}. {error.message}+ <br />+ </Text>+ ))}+ <Button+ variant="error"+ sx={{ alignSelf: "start", mt: 2 }}+ onClick={() =>+ window.open(+ "https://github.com/streetwriters/notesnook-importer/issues/new",+ "_blank"+ )+ }+ >+ Send us a bug report+ </Button>+ </Flex>+ </Accordion>+ );+}diff --git a/apps/web/src/components/importer/components/import-result.tsx b/apps/web/src/components/importer/components/import-result.tsxnew file mode 100644index 000000000..2b9b1882e--- /dev/null+++ b/apps/web/src/components/importer/components/import-result.tsx@@ -0,0 +1,94 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import { IProvider } from "@notesnook-importer/core";+import { strings } from "@notesnook/intl";+import { Button, Flex, Text } from "@theme-ui/components";+import { CheckCircleOutline } from "../../icons";+import { TransformResult } from "../types";+import { ImportErrors } from "./import-errors";++type ImportResultProps = {+ result: TransformResult;+ provider: IProvider;+ onReset: () => void;+};++export function ImportResult(props: ImportResultProps) {+ const { result, onReset } = props;++ if (result.totalNotes <= 0) {+ return (+ <Flex sx={{ flexDirection: "column", alignItems: "stretch" }}>+ <Text variant="title">Import unsuccessful</Text>+ <Text variant="body" sx={{ mt: 2 }}>+ We failed to import the selected files. Please try again.+ </Text>+ {result.errors.length > 0 && <ImportErrors errors={result.errors} />}+ <Button+ variant="accent"+ onClick={onReset}+ sx={{ alignSelf: "center", mt: 2, px: 4 }}+ >+ Start over+ </Button>+ </Flex>+ );+ }++ return (+ <>+ <CheckCircleOutline color="accent" />+ <Text variant="body" my={2} sx={{ textAlign: "center" }}>+ {strings.importCompleted()}. {props.result.totalNotes} notes+ successfully imported.+ {strings.errorsOccured(result.errors.length)}+ </Text>+ <Button+ variant="secondary"+ sx={{ alignSelf: "center" }}+ onClick={async () => {+ onReset();+ }}+ >+ {strings.startOver()}+ </Button>+ {result.errors.length > 0 && (+ <Flex+ my={1}+ bg="var(--background-error)"+ p={1}+ sx={{ flexDirection: "column" }}+ >+ {result.errors.map((error) => (+ <Text+ key={error.message}+ variant="body"+ sx={{+ color: "var(--paragraph-error)"+ }}+ >+ {error.message}+ </Text>+ ))}+ </Flex>+ )}+ </>+ );+}diff --git a/apps/web/src/components/importer/components/network-provider-handler.tsx b/apps/web/src/components/importer/components/network-provider-handler.tsxnew file mode 100644index 000000000..18080c8c7--- /dev/null+++ b/apps/web/src/components/importer/components/network-provider-handler.tsx@@ -0,0 +1,174 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import {+ INetworkProvider,+ OneNote,+ OneNoteSettings,+ ProviderSettings,+ transform+} from "@notesnook-importer/core";+import { ScrollContainer } from "@notesnook/ui";+import { Button, Flex, Text } from "@theme-ui/components";+import { xxhash64 } from "hash-wasm";+import { useRef, useState } from "react";+import { importNote } from "../../../utils/importer";+import Accordion from "../../accordion";+import { TransformResult } from "../types";++type NetworkProviderHandlerProps = {+ provider: INetworkProvider<ProviderSettings>;+ onTransformFinished: (result: TransformResult) => void;+};++type Progress = {+ total: number;+ done: number;+};++function getProviderSettings(+ provider: INetworkProvider<ProviderSettings>,+ settings: ProviderSettings+) {+ if (provider instanceof OneNote) {+ return {+ ...settings,+ cache: false,+ clientId: "6c32bdbd-c6c6-4cda-bcf0-0c8ec17e5804",+ redirectUri:+ process.env.NODE_ENV === "development"+ ? "http://localhost:3000"+ : "https://importer.notesnook.com"+ } as OneNoteSettings;+ }+}++export function NetworkProviderHandler(props: NetworkProviderHandlerProps) {+ const { provider, onTransformFinished } = props;+ const [totalNoteCount, setTotalNoteCount] = useState(0);+ const [_, setCounter] = useState<number>(0);+ const logs = useRef<string[]>([]);++ async function onStartImport() {+ let totalNotes = 0;+ const settings = getProviderSettings(provider, {+ clientType: "browser",+ hasher: { type: "xxh64", hash: xxhash64 },+ storage: {+ clear: async () => undefined,+ get: async () => [],+ write: async (data) => {+ logs.current.push(+ `[${new Date().toLocaleString()}] Pushing ${+ data.title+ } into database`+ );++ await importNote(data);+ },+ iterate: async function* () {+ return null;+ }+ },+ log: (message) => {+ logs.current.push(+ `[${new Date(message.date).toLocaleString()}] ${message.text}`+ );+ setCounter((s) => ++s);+ },+ reporter: () => {+ setTotalNoteCount(++totalNotes);+ }+ });+ if (!settings) return;++ setTotalNoteCount(0);++ const errors = await transform(provider, settings);+ console.log(errors);+ onTransformFinished({+ totalNotes,+ errors+ });+ }++ return (+ <Flex+ sx={{+ flexDirection: "column",+ alignItems: "stretch"+ }}+ >+ {totalNoteCount ? (+ <>+ <Text variant="title">Importing your notes from {provider.name}</Text>+ <Text variant="body" sx={{ mt: 4 }}>+ Found {totalNoteCount} notes+ </Text>+ {logs.current.length > 0 && (+ <Accordion+ isClosed={false}+ title="Logs"+ sx={{+ border: "1px solid var(--border)",+ mt: 2+ }}+ >+ <ScrollContainer>+ <Text+ as="pre"+ variant="body"+ sx={{+ fontFamily: "monospace",+ maxHeight: 250,+ p: 2+ }}+ >+ {logs.current.map((c, index) => (+ <>+ <span key={index.toString()}>{c}</span>+ <br />+ </>+ ))}+ </Text>+ </ScrollContainer>+ </Accordion>+ )}+ </>+ ) : (+ <>+ <Text variant="title">Connect your {provider.name} account</Text>+ <Text variant="body" sx={{ color: "fontTertiary", mt: [2, 0] }}>+ Check out our step-by-step guide on{" "}+ <a href={provider.helpLink} target="_blank" rel="noreferrer">+ how to import from {provider.name}.+ </a>+ </Text>+ <Button+ variant="accent"+ onClick={onStartImport}+ sx={{ my: 4, alignSelf: "center" }}+ >+ Start importing+ </Button>+ </>+ )}+ </Flex>+ );+}diff --git a/apps/web/src/components/importer/components/provider-selector.tsx b/apps/web/src/components/importer/components/provider-selector.tsxnew file mode 100644index 000000000..c46630146--- /dev/null+++ b/apps/web/src/components/importer/components/provider-selector.tsx@@ -0,0 +1,79 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import {+ IProvider,+ ProviderFactory,+ Providers+} from "@notesnook-importer/core";+import { Flex, Text } from "@theme-ui/components";++type ProviderSelectorProps = {+ onProviderChanged: (provider: IProvider) => void;+};++export function ProviderSelector(props: ProviderSelectorProps) {+ return (+ <Flex+ sx={{+ flexDirection: "row",+ justifyContent: "space-between",+ alignItems: "start",+ gap: 4+ }}+ >+ <Flex sx={{ flexDirection: "column", flex: 1 }}>+ <Text variant="subtitle">Select a notes app to import from</Text>+ <Text+ variant="body"+ as="div"+ sx={{ mt: 1, color: "paragraph", whiteSpace: "pre-wrap" }}+ >+ Can't find your notes app in the list?{" "}+ <a href="https://github.com/streetwriters/notesnook-importer/issues/new">+ Send us a request.+ </a>+ </Text>+ </Flex>+ <select+ style={{+ backgroundColor: "var(--background-secondary)",+ outline: "none",+ border: "1px solid var(--border-secondary)",+ borderRadius: "5px",+ color: "var(--paragraph)",+ padding: "5px",+ overflow: "hidden"+ }}+ onChange={(e) => {+ if (e.target.value === "") return;+ const providerName: Providers = e.target.value as Providers;+ props.onProviderChanged(ProviderFactory.getProvider(providerName));+ }}+ >+ <option value="">Select notes app</option>+ {ProviderFactory.getAvailableProviders().map((provider) => (+ <option key={provider} value={provider}>+ {ProviderFactory.getProvider(provider as Providers).name}+ </option>+ ))}+ </select>+ </Flex>+ );+}diff --git a/apps/web/src/components/importer/importer.tsx b/apps/web/src/components/importer/importer.tsxnew file mode 100644index 000000000..8e63a5e35--- /dev/null+++ b/apps/web/src/components/importer/importer.tsx@@ -0,0 +1,82 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++import { Flex } from "@theme-ui/components";+import { useState } from "react";+import { ProviderSelector } from "./components/provider-selector";+import { FileProviderHandler } from "./components/file-provider-handler";+import { ImportResult } from "./components/import-result";+import { IProvider } from "@notesnook-importer/core";+import { NetworkProviderHandler } from "./components/network-provider-handler";+import { TransformResult } from "./types";++export function Importer() {+ const [selectedProvider, setSelectedProvider] = useState<IProvider>();+ const [transformResult, setTransformResult] = useState<TransformResult>();+ const [instanceKey, setInstanceKey] = useState<string>(`${Math.random()}`);++ return (+ <Flex sx={{ flexDirection: "column" }}>+ <Flex+ sx={{+ flexDirection: "column",+ alignItems: "stretch",+ gap: 4+ }}+ >+ <ProviderSelector+ onProviderChanged={(provider) => {+ setInstanceKey(`${Math.random()}`);+ setSelectedProvider(provider);+ setTransformResult(undefined);+ }}+ />+ {selectedProvider ? (+ <>+ {selectedProvider.type === "file" ? (+ <FileProviderHandler+ key={instanceKey}+ provider={selectedProvider}+ onTransformFinished={setTransformResult}+ />+ ) : selectedProvider.type === "network" ? (+ <NetworkProviderHandler+ key={instanceKey}+ provider={selectedProvider}+ onTransformFinished={setTransformResult}+ />+ ) : null}+ </>+ ) : null}+ {transformResult && selectedProvider ? (+ <>+ <ImportResult+ result={transformResult}+ provider={selectedProvider}+ onReset={() => {+ setTransformResult(undefined);+ setInstanceKey(`${Math.random()}`);+ }}+ />+ </>+ ) : null}+ </Flex>+ </Flex>+ );+}diff --git a/apps/web/src/components/importer/index.ts b/apps/web/src/components/importer/index.tsnew file mode 100644index 000000000..ea10c0317--- /dev/null+++ b/apps/web/src/components/importer/index.ts@@ -0,0 +1,20 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++export * from "./importer";diff --git a/apps/web/src/components/importer/types.ts b/apps/web/src/components/importer/types.tsnew file mode 100644index 000000000..5c69332e3--- /dev/null+++ b/apps/web/src/components/importer/types.ts@@ -0,0 +1,23 @@+/*+This file is part of the Notesnook project (https://notesnook.com/)++Copyright (C) 2023 Streetwriters (Private) Limited++This program is free software: you can redistribute it and/or modify+it under the terms of the GNU General Public License as published by+the Free Software Foundation, either version 3 of the License, or+(at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program. If not, see <http://www.gnu.org/licenses/>.+*/++export type TransformResult = {+ totalNotes: number;+ errors: Error[];+};diff --git a/apps/web/src/dialogs/settings/components/importer.tsx b/apps/web/src/dialogs/settings/components/importer.tsxdeleted file mode 100644index 5f81a28f6..000000000--- a/apps/web/src/dialogs/settings/components/importer.tsx+++ /dev/null@@ -1,318 +0,0 @@-/*-This file is part of the Notesnook project (https://notesnook.com/)--Copyright (C) 2023 Streetwriters (Private) Limited--This program is free software: you can redistribute it and/or modify-it under the terms of the GNU General Public License as published by-the Free Software Foundation, either version 3 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.--You should have received a copy of the GNU General Public License-along with this program. If not, see <http://www.gnu.org/licenses/>.-*/--import { strings } from "@notesnook/intl";-import { Button, Flex, Input, Link, Text, Box } from "@theme-ui/components";-import { useCallback, useRef, useState } from "react";-import { useDropzone } from "react-dropzone";-import { db } from "../../../common/db";-import { CheckCircleOutline } from "../../../components/icons";-import Accordion from "../../../components/accordion";-import { importFiles } from "../../../utils/importer";-import { useStore as useAppStore } from "../../../stores/app-store";--type Provider = { title: string; link: string };-const POPULAR_PROVIDERS: Provider[] = [- {- title: "Evernote",- link: "https://help.notesnook.com/importing-notes/import-notes-from-evernote"- },- {- title: "Simplenote",- link: "https://help.notesnook.com/importing-notes/import-notes-from-simplenote"- },- {- title: "Google Keep",- link: "https://help.notesnook.com/importing-notes/import-notes-from-googlekeep"- },- {- title: "Obsidian",- link: "https://help.notesnook.com/importing-notes/import-notes-from-obsidian"- },- {- title: "Joplin",- link: "https://help.notesnook.com/importing-notes/import-notes-from-joplin"- },- {- title: "Markdown files",- link: "https://help.notesnook.com/importing-notes/import-notes-from-markdown-files"- },- {- title: "other apps",- link: "https://help.notesnook.com/importing-notes/"- }-];--export function Importer() {- const [isDone, setIsDone] = useState(false);- const [isImporting, setIsImporting] = useState(false);- const [files, setFiles] = useState<File[]>([]);- const [errors, setErrors] = useState<Error[]>([]);- const notesCounter = useRef<HTMLSpanElement>(null);- const importProgress = useRef<HTMLDivElement>(null);-- const onDrop = useCallback((acceptedFiles: File[]) => {- setFiles((files) => {- const newFiles = [...acceptedFiles, ...files];- return newFiles;- });- }, []);-- const { getRootProps, getInputProps, isDragActive } = useDropzone({- onDrop,- accept: {- "application/zip": [".zip"]- }- });-- return (- <Flex- sx={{- flexDirection: "column",- // justifyContent: "center",- overflow: "hidden"- }}- >- {isImporting ? (- <>- <Text variant="title" sx={{ textAlign: "center", mb: 4, mt: 150 }}>- <span ref={notesCounter}>0</span> {strings.notesImported()}.- </Text>-- <Flex- ref={importProgress}- sx={{- alignSelf: "start",- borderRadius: "default",- height: "5px",- bg: "accent",- width: `0%`- }}- />- </>- ) : isDone ? (- <>- <CheckCircleOutline color="accent" sx={{ mt: 150 }} />- <Text variant="body" my={2} sx={{ textAlign: "center" }}>- {strings.importCompleted()}. {strings.errorsOccured(errors.length)}- </Text>- <Button- variant="secondary"- sx={{ alignSelf: "center" }}- onClick={async () => {- setErrors([]);- setFiles([]);- setIsDone(false);- setIsImporting(false);- }}- >- {strings.startOver()}- </Button>- {errors.length > 0 && (- <Flex- my={1}- bg="var(--background-error)"- p={1}- sx={{ flexDirection: "column" }}- >- {errors.map((error) => (- <Text- key={error.message}- variant="body"- sx={{- color: "var(--paragraph-error)"- }}- >- {error.message}- </Text>- ))}- </Flex>- )}- </>- ) : (- <>- <Accordion- isClosed={false}- title="How to import your notes from other apps?"- containerSx={{- px: 2,- pb: 2,- border: "1px solid var(--border)",- borderTopWidth: 0,- borderRadius: "default",- borderTopLeftRadius: 0,- borderTopRightRadius: 0- }}- >- <Text variant="subtitle" sx={{ mt: 2 }}>- Quick start guide:- </Text>- <Box as="ol" sx={{ my: 1 }}>- <Text as="li" variant="body">- Go to{" "}- <Link- href="https://importer.notesnook.com/"- target="_blank"- sx={{ color: "accent" }}- >- https://importer.notesnook.com/- </Link>- </Text>- <Text as="li" variant="body">- Select the app you want to import from.- </Text>- <Text as="li" variant="body">- Drag drop or select the files you exported from the other app.- </Text>- <Text as="li" variant="body">- Start the importer and wait for it to complete processing.- </Text>- <Text as="li" variant="body">- Download the .zip file from the Importer.- </Text>- <Text as="li" variant="body">- Drop the .zip file below to complete your import.- </Text>- </Box>-- <Text variant={"body"} sx={{ fontWeight: "bold" }}>- For detailed steps with screenshots, refer to the help article for- each app:- </Text>- <Box- sx={{- display: "grid",- gridTemplateColumns: "1fr 1fr 1fr",- gap: 1,- mt: 1- }}- >- {POPULAR_PROVIDERS.map((provider) => (- <Button- key={provider.link}- variant="icon"- sx={{- borderRadius: "default",- border: "1px solid var(--border)",- textAlign: "left"- }}- onClick={() => window.open(provider.link, "_blank")}- >- Import from {provider.title}- </Button>- ))}- </Box>- </Accordion>- <Flex- {...getRootProps()}- data-test-id="import-dialog-select-files"- sx={{- justifyContent: "center",- alignItems: "center",- minHeight: 200,- flexShrink: 0,- width: "full",- border: "2px dashed var(--border)",- borderRadius: "default",- mt: 2,- flexDirection: "column"- }}- >- <Input {...getInputProps()} />- <Text variant="body" sx={{ textAlign: "center" }}>- {isDragActive- ? strings.dropFilesHere()- : strings.dragAndDropFiles()}- <br />- <Text variant="subBody">{strings.onlyZipSupported()}</Text>- </Text>- <Box sx={{ display: "flex", flexWrap: "wrap", mt: 2 }}>- {files.map((file, i) => (- <Text- key={file.name}- p={1}- sx={{- ":hover": { bg: "hover" },- cursor: "pointer",- borderRadius: "default"- }}- onClick={() => {- setFiles((files) => {- const cloned = files.slice();- cloned.splice(i, 1);- return cloned;- });- }}- variant="body"- title="Click to remove"- >- {file.name}- </Text>- ))}- </Box>- </Flex>- {/* <Flex my={1} sx={{ flexDirection: "column" }}>-- </Flex> */}- <Button- variant="accent"- sx={{ alignSelf: "end", mt: 1 }}- onClick={async () => {- setIsDone(false);- setIsImporting(true);-- await db.syncer?.acquireLock(async () => {- try {- for await (const message of importFiles(files)) {- switch (message.type) {- case "error":- setErrors((errors) => [...errors, message.error]);- break;- case "progress": {- const { count } = message;- if (notesCounter.current)- notesCounter.current.innerText = `${count}`;- break;- }- }- }- } catch (e) {- console.error(e);- if (e instanceof Error) {- setErrors((errors) => [...errors, e as Error]);- }- }- });-- await useAppStore.getState().refresh();-- setIsDone(true);- setIsImporting(false);- }}- disabled={!files.length}- >- {files.length > 0- ? "Start import"- : "Select files to start importing"}- </Button>- </>- )}- </Flex>- );-}diff --git a/apps/web/src/dialogs/settings/importer-settings.ts b/apps/web/src/dialogs/settings/importer-settings.tsindex 44c2d74f6..46ed2bc3c 100644--- a/apps/web/src/dialogs/settings/importer-settings.ts+++ b/apps/web/src/dialogs/settings/importer-settings.ts@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { SettingsGroup } from "./types";-import { Importer } from "./components/importer";+import { Importer } from "../../components/importer";export const ImporterSettings: SettingsGroup[] = [{diff --git a/apps/web/src/utils/importer.ts b/apps/web/src/utils/importer.tsindex 0263eb0ee..4a962e19a 100644--- a/apps/web/src/utils/importer.ts+++ b/apps/web/src/utils/importer.ts@@ -17,80 +17,22 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { db } from "../common/db";import {- Note,- Notebook,ContentType,- LegacyNotebook+ LegacyNotebook,+ Note,+ Notebook} from "@notesnook-importer/core/dist/src/models";-import {- ATTACHMENTS_DIRECTORY_NAME,- NOTE_DATA_FILENAME-} from "@notesnook-importer/core/dist/src/utils/note-stream";-import { path } from "@notesnook-importer/core/dist/src/utils/path";-import { type ZipEntry } from "./streams/unzip-stream";-import { hashBuffer, writeEncryptedFile } from "../interfaces/fs";import { Notebook as NotebookType } from "@notesnook/core";+import { SerializedKey } from "@notesnook/crypto";+import { db } from "../common/db";+import { writeEncryptedFile } from "../interfaces/fs";-export async function* importFiles(zipFiles: File[]) {- const { createUnzipIterator } = await import("./streams/unzip-stream");-- for (const zip of zipFiles) {- let count = 0;- let filesRead = 0;-- const attachments: Record<string, any> = {};-- for await (const entry of createUnzipIterator(zip)) {- ++filesRead;-- const isAttachment = entry.name.includes(- `/${ATTACHMENTS_DIRECTORY_NAME}/`- );- const isNote = !isAttachment && entry.name.endsWith(NOTE_DATA_FILENAME);-- try {- if (isAttachment) {- await processAttachment(entry, attachments);- } else if (isNote) {- await processNote(entry, attachments);- ++count;- }- } catch (e) {- if (e instanceof Error) yield { type: "error" as const, error: e };- }-- yield {- type: "progress" as const,- count,- filesRead- };- }- }-}--async function processAttachment(- entry: ZipEntry,- attachments: Record<string, any>-) {- const name = path.basename(entry.name);- if (!name || attachments[name] || (await db.attachments?.exists(name)))- return;-- const data = await entry.arrayBuffer();- const { hash } = await hashBuffer(new Uint8Array(data));- if (hash !== name) {- throw new Error(`integrity check failed: ${name} !== ${hash}`);- }-- const file = new File([data], name, {- type: "application/octet-stream"- });- const key = await db.attachments?.generateKey();- const cipherData = await writeEncryptedFile(file, key, name);- attachments[name] = { ...cipherData, key };-}+type EncryptedAttachmentFields = Awaited<+ ReturnType<typeof writeEncryptedFile>+> & {+ key: SerializedKey;+};const colorMap: Record<string, string | undefined> = {default: undefined,@@ -107,18 +49,50 @@ const colorMap: Record<string, string | undefined> = {yellow: "#FFC107"};-async function processNote(entry: ZipEntry, attachments: Record<string, any>) {- const note = await fileToJson<Note>(entry);+export async function importNote(note: Note) {+ const encryptedAttachmentFieldsMap = await processAttachments(+ note.attachments+ );+ await processNote(note, encryptedAttachmentFieldsMap);+}++async function processAttachments(attachments: Note["attachments"]) {+ if (!attachments) return {};++ const map: Record<string, EncryptedAttachmentFields | undefined> = {};+ for (const { hash, filename, data } of attachments) {+ if (!data || !hash || map[hash]) {+ continue;+ }+ const exists = await db.attachments?.exists(hash);+ if (exists) continue;++ const file = new File([data], filename, {+ type: "application/octet-stream"+ });+ const key = await db.attachments?.generateKey();+ const cipherData = await writeEncryptedFile(file, key, hash);+ map[hash] = { ...cipherData, key };+ }+ return map;+}++async function processNote(+ note: Note,+ map: Record<string, EncryptedAttachmentFields | undefined>+) {for (const attachment of note.attachments || []) {- const cipherData = attachments[attachment.hash];- if (!cipherData || (await db.attachments?.exists(attachment.hash)))+ const cipherData = map[attachment.hash];+ if (!cipherData || (await db.attachments?.exists(attachment.hash))) {continue;+ }await db.attachments?.add({...cipherData,hash: attachment.hash,hashType: attachment.hashType,filename: attachment.filename,+ // todo: figure out typescript errortype: attachment.mime});}@@ -198,11 +172,6 @@ async function processNote(entry: ZipEntry, attachments: Record<string, any>) {}}-async function fileToJson<T>(file: ZipEntry) {- const text = await file.text();- return JSON.parse(text) as T;-}-/*** @deprecated*/