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
mobile: take backup before logout
Ammar Ahmedb6206e2ca7c8
diff --git a/apps/mobile/app/components/dialog/dialog-container.tsx b/apps/mobile/app/components/dialog/dialog-container.tsxindex ab9c0a2c3..fcd5fe932 100644--- a/apps/mobile/app/components/dialog/dialog-container.tsx+++ b/apps/mobile/app/components/dialog/dialog-container.tsx@@ -32,6 +32,7 @@ const DialogContainer = ({}: ViewProps & {width?: any;height?: any;+ noBorder?: boolean;}) => {const { colors } = useThemeColors();@@ -41,14 +42,18 @@ const DialogContainer = ({style={[style,{- ...getElevationStyle(5),width: width || DDS.isTab ? 500 : "85%",maxHeight: height || 450,borderRadius: 10,backgroundColor: colors.primary.background,- paddingTop: 12,- ...getContainerBorder(colors.secondary.background, 0.8, 0.05)- }+ paddingTop: 12+ },+ restProps?.noBorder+ ? {}+ : {+ ...getElevationStyle(5),+ ...getContainerBorder(colors.secondary.background, 0.8, 0.05)+ }]}/>);diff --git a/apps/mobile/app/components/dialog/functions.ts b/apps/mobile/app/components/dialog/functions.tsindex d3e39d169..a662de6a4 100644--- a/apps/mobile/app/components/dialog/functions.ts+++ b/apps/mobile/app/components/dialog/functions.ts@@ -47,7 +47,12 @@ type DialogInfo = {keyboardType?: string;check?: {info: string;- type: string;+ type?: string;+ defaultValue?: boolean;+ };+ notice: {+ text: string;+ type: "alert" | "information";};};diff --git a/apps/mobile/app/components/dialog/index.js b/apps/mobile/app/components/dialog/index.jsindex 3ad8d84a7..b786a8a1f 100644--- a/apps/mobile/app/components/dialog/index.js+++ b/apps/mobile/app/components/dialog/index.js@@ -37,6 +37,7 @@ import DialogHeader from "./dialog-header";import { useCallback } from "react";import { Button } from "../ui/button";import { getContainerBorder } from "../../utils/colors";+import { Notice } from "../ui/notice";export const Dialog = ({ context = "global" }) => {const { colors } = useThemeColors();@@ -62,7 +63,8 @@ export const Dialog = ({ context = "global" }) => {disableBackdropClosing: false,check: {info: "Check",- type: "transparent"+ type: "transparent",+ defaultValue: false}});@@ -86,7 +88,7 @@ export const Dialog = ({ context = "global" }) => {if (!data.context) data.context = "global";if (data.context !== context) return;setDialogInfo(data);- setChecked(false);+ setChecked(data.check?.defaultValue);values.current.inputValue = data.defaultValue;setVisible(true);},@@ -180,6 +182,19 @@ export const Dialog = ({ context = "global" }) => {</View>) : null}+ {dialogInfo?.notice ? (+ <View+ style={{+ paddingHorizontal: 12+ }}+ >+ <Notice+ type={dialogInfo.notice.type || "information"}+ text={dialogInfo.notice.text}+ />+ </View>+ ) : null}+{dialogInfo.check ? (<><Button@@ -198,7 +213,7 @@ export const Dialog = ({ context = "global" }) => {iconSize={20}width="100%"title={dialogInfo.check.info}- type={checked ? dialogInfo.check.type || "selected" : "plain"}+ type={checked ? dialogInfo.check.type || "plain" : "plain"}/></>) : null}diff --git a/apps/mobile/app/components/dialogs/progress/index.tsx b/apps/mobile/app/components/dialogs/progress/index.tsxindex 1a5434d4a..1afa063b0 100644--- a/apps/mobile/app/components/dialogs/progress/index.tsx+++ b/apps/mobile/app/components/dialogs/progress/index.tsx@@ -35,6 +35,8 @@ export type ProgressOptions = {cancelCallback?: () => void;title?: string;paragraph?: string;+ fillBackground?: boolean;+ canHideProgress?: boolean;};export const PROGRESS_EVENTS = {@@ -51,18 +53,23 @@ export default function Progress() {const [data, setData] = React.useState<{title?: string;paragraph?: string;+ fillBackground?: boolean;+ canHideProgress?: boolean;}>();useEffect(() => {const events = [eSubscribeEvent(PROGRESS_EVENTS.start, (options: ProgressOptions) => {setProgress(options.progress);- setVisible(true);cancelCallback.current = options.cancelCallback;+ console.log("options", options.fillBackground);setData({title: options.title,- paragraph: options.paragraph+ paragraph: options.paragraph,+ fillBackground: options.fillBackground,+ canHideProgress: options.canHideProgress});+ setVisible(true);}),eSubscribeEvent(PROGRESS_EVENTS.end, () => {setProgress(undefined);@@ -76,16 +83,19 @@ export default function Progress() {if (options.cancelCallback) {cancelCallback.current = options.cancelCallback;}- if (options.title) {- setData({- title: options.title- });- }- if (options.paragraph) {- setData({- paragraph: options.paragraph- });- }++ const data: ProgressOptions = {};+ if (options.title) data.title = options.title;+ if (options.paragraph) data.paragraph = options.paragraph;+ if (options.fillBackground)+ data.fillBackground = options.fillBackground;++ setData((current) => {+ return {+ ...current,+ ...data+ };+ });})];return () => {@@ -95,12 +105,16 @@ export default function Progress() {}, []);return !visible ? null : (- <BaseDialog visible>+ <BaseDialog+ background={data?.fillBackground ? colors.primary.background : undefined}+ visible+ ><DialogContainerstyle={{paddingHorizontal: 12,paddingBottom: 10}}+ noBorder={data?.fillBackground ? true : false}><Dialog context="local" /><View@@ -112,26 +126,6 @@ export default function Progress() {paddingBottom: 20}}>- <View- style={{- flexDirection: "row",- width: 100,- paddingTop: 20- }}- >- <ProgressBarComponent- height={5}- width={100}- animated={true}- useNativeDriver- indeterminate- indeterminateAnimationDuration={2000}- unfilledColor={colors.secondary.background}- color={colors.primary.accent}- borderWidth={0}- />- </View>-<Headingstyle={{textAlign: "center"@@ -150,19 +144,41 @@ export default function Progress() {{progress ? progress : data?.paragraph}</Paragraph>- <Button- title={cancelCallback.current ? "Cancel" : "Hide"}- type="secondaryAccented"- onPress={() => {- if (cancelCallback.current) {- cancelCallback.current?.();- }- setVisible(false);- setProgress(undefined);- setData(undefined);+ <View+ style={{+ flexDirection: "row",+ width: 100,+ paddingVertical: 12}}- width="100%"- />+ >+ <ProgressBarComponent+ height={5}+ width={100}+ animated={true}+ useNativeDriver+ indeterminate+ indeterminateAnimationDuration={2000}+ unfilledColor={colors.secondary.background}+ color={colors.primary.accent}+ borderWidth={0}+ />+ </View>++ {data?.canHideProgress ? null : (+ <Button+ title={cancelCallback.current ? "Cancel" : "Hide"}+ type="secondaryAccented"+ onPress={() => {+ if (cancelCallback.current) {+ cancelCallback.current?.();+ }+ setVisible(false);+ setProgress(undefined);+ setData(undefined);+ }}+ width="100%"+ />+ )}</View></DialogContainer></BaseDialog>diff --git a/apps/mobile/app/screens/settings/home.tsx b/apps/mobile/app/screens/settings/home.tsxindex 511b6487c..9581bd735 100644--- a/apps/mobile/app/screens/settings/home.tsx+++ b/apps/mobile/app/screens/settings/home.tsx@@ -18,35 +18,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.*/import { NativeStackScreenProps } from "@react-navigation/native-stack";-import React, { useEffect, useState } from "react";+import React from "react";import { View } from "react-native";import Animated, { FadeInDown } from "react-native-reanimated";import DelayLayout from "../../components/delay-layout";-import BaseDialog from "../../components/dialog/base-dialog";-import { ProgressBarComponent } from "../../components/ui/svg/lazy";-import Heading from "../../components/ui/typography/heading";-import Paragraph from "../../components/ui/typography/paragraph";+import { Header } from "../../components/header";import { useNavigationFocus } from "../../hooks/use-navigation-focus";-import {- eSubscribeEvent,- eUnSubscribeEvent-} from "../../services/event-manager";import useNavigationStore from "../../stores/use-navigation-store";-import { useThemeColors } from "@notesnook/theme";-import { SIZE } from "../../utils/size";import { SectionGroup } from "./section-group";import { settingsGroups } from "./settings-data";import { RouteParams, SettingSection } from "./types";import SettingsUserSection from "./user-section";-import { Header } from "../../components/header";const keyExtractor = (item: SettingSection) => item.id;const Home = ({navigation}: NativeStackScreenProps<RouteParams, "SettingsHome">) => {- const { colors } = useThemeColors();- const [loading, setLoading] = useState(false);-useNavigationFocus(navigation, {onFocus: () => {useNavigationStore.getState().setFocusedRouteId("Settings");@@ -62,16 +49,6 @@ const Home = ({<SectionGroup item={item} />);- useEffect(() => {- function settingsLoading(state: boolean) {- setLoading(state || true);- }- eSubscribeEvent("settings-loading", settingsLoading);- return () => {- eUnSubscribeEvent("settings-loading", settingsLoading);- };- }, []);-return (<><Header@@ -81,57 +58,6 @@ const Home = ({id="Settings"/><DelayLayout delay={300} type="settings">- {loading && (- //@ts-ignore // Migrate to typescript required.- <BaseDialog animated={false} bounce={false} visible={true}>- <View- style={{- width: "100%",- height: "100%",- backgroundColor: colors.primary.background,- justifyContent: "center",- alignItems: "center"- }}- >- <View- style={{- width: "100%",- height: "100%",- backgroundColor: colors.primary.background,- justifyContent: "center",- alignItems: "center"- }}- >- <Heading color={colors.primary.paragraph} size={SIZE.lg}>- Logging out- </Heading>- <Paragraph color={colors.secondary.paragraph}>- Please wait while we log out and clear app data.- </Paragraph>- <View- style={{- flexDirection: "row",- width: 100,- marginTop: 15- }}- >- <ProgressBarComponent- height={5}- width={100}- animated={true}- useNativeDriver- indeterminate- indeterminateAnimationDuration={2000}- unfilledColor={colors.secondary.background}- color={colors.primary.accent}- borderWidth={0}- />- </View>- </View>- </View>- </BaseDialog>- )}-<Animated.FlatListentering={FadeInDown}data={settingsGroups}diff --git a/apps/mobile/app/screens/settings/settings-data.tsx b/apps/mobile/app/screens/settings/settings-data.tsxindex dc4efbf4c..90258f6b2 100644--- a/apps/mobile/app/screens/settings/settings-data.tsx+++ b/apps/mobile/app/screens/settings/settings-data.tsx@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/+import { formatBytes } from "@notesnook/common";import notifee from "@notifee/react-native";import dayjs from "dayjs";import React from "react";@@ -25,12 +26,18 @@ import { getVersion } from "react-native-device-info";import * as RNIap from "react-native-iap";import { enabled } from "react-native-privacy-snapshot";import ScreenGuardModule from "react-native-screenguard";-import { db } from "../../common/database";+import { DatabaseLogger, db } from "../../common/database";import { MMKV } from "../../common/database/mmkv";+import filesystem from "../../common/filesystem";import { AttachmentDialog } from "../../components/attachments";import { ChangePassword } from "../../components/auth/change-password";import { presentDialog } from "../../components/dialog/functions";import { AppLockPassword } from "../../components/dialogs/applock-password";+import {+ endProgress,+ startProgress,+ updateProgress+} from "../../components/dialogs/progress";import { ChangeEmail } from "../../components/sheets/change-email";import ExportNotesSheet from "../../components/sheets/export-notes";import { Issue } from "../../components/sheets/github/issue";@@ -71,8 +78,6 @@ import { useDragState } from "./editor/state";import { verifyUser, verifyUserWithApplock } from "./functions";import { SettingSection } from "./types";import { getTimeLeft } from "./user-section";-import filesystem from "../../common/filesystem";-import { formatBytes } from "@notesnook/common";type User = any;@@ -333,49 +338,6 @@ export const settingsGroups: SettingSection[] = [},description: "Verify your subscription to Notesnook Pro"},- {- id: "logout",- name: "Log out",- description:- "Logging out will clear all data stored on THIS DEVICE.",- icon: "logout",- modifer: () => {- presentDialog({- title: "Logout",- paragraph:- "Logging out will clear all data stored on THIS DEVICE. Make sure you have synced all your changes before logging out.",- positiveText: "Logout",- positivePress: async () => {- try {- eSendEvent(eCloseSimpleDialog);- setTimeout(async () => {- eSendEvent("settings-loading", true);- Navigation.popToTop();- await db.user?.logout();- setLoginMessage();- await PremiumService.setPremiumStatus();- await BiometricService.resetCredentials();- MMKV.clearStore();- clearAllStores();- refreshAllStores();- Navigation.queueRoutesForUpdate();- SettingsService.resetSettings();- useUserStore.getState().setUser(null);- useUserStore.getState().setSyncing(false);- Navigation.goBack();- Navigation.popToTop();- setTimeout(() => {- eSendEvent("settings-loading", false);- }, 3000);- }, 300);- } catch (e) {- ToastManager.error(e as Error, "Error logging out");- eSendEvent("settings-loading", false);- }- }- });- }- },{id: "clear-cache",name: "Clear cache",@@ -414,6 +376,105 @@ export const settingsGroups: SettingSection[] = [return formatBytes(cacheSize);}},++ {+ id: "logout",+ name: "Logout",+ description:+ "Logging out will clear all data stored on this device.",+ icon: "logout",+ modifer: async () => {+ const hasUnsyncedChanges = await db.hasUnsyncedChanges();+ presentDialog({+ title: "Logout",+ paragraph:+ "Are you sure you want to logout and clear all data stored on this device?",+ positiveText: "Logout",+ check: {+ info: "Take a backup before logging out",+ defaultValue: true+ },+ notice: hasUnsyncedChanges+ ? {+ text: "You have unsynced notes. Take a backup or sync your notes to avoid losing your critical data.",+ type: "alert"+ }+ : undefined,+ positivePress: async (_, takeBackup) => {+ eSendEvent(eCloseSimpleDialog);+ setTimeout(async () => {+ try {+ startProgress({+ fillBackground: true,+ title: "Logging out",+ canHideProgress: true,+ paragraph:+ "Please wait while we log out and clear app data."+ });++ Navigation.navigate("Notes");++ if (takeBackup) {+ updateProgress({+ progress: "Taking a backup of your notes"+ });++ try {+ await BackupService.run(false, "local", "partial");+ } catch (e) {+ DatabaseLogger.error(e);+ const error = e;+ const canLogout = await new Promise((resolve) => {+ presentDialog({+ context: "local",+ title: "Backup failed",+ paragraph: `${+ (error as Error).message+ }. Do you want to continue logging out?`,+ positiveText: "Continue",+ positivePress: () => {+ resolve(true);+ },+ onClose: () => {+ resolve(false);+ }+ });+ });+ if (!canLogout) {+ endProgress();+ return;+ }+ }+ }++ updateProgress({+ progress: "Logging out... please wait"+ });++ await db.user?.logout();+ setLoginMessage();+ await PremiumService.setPremiumStatus();+ await BiometricService.resetCredentials();+ MMKV.clearStore();+ clearAllStores();+ setImmediate(() => {+ refreshAllStores();+ });+ Navigation.queueRoutesForUpdate();+ SettingsService.resetSettings();+ useUserStore.getState().setUser(null);+ useUserStore.getState().setSyncing(false);+ endProgress();+ } catch (e) {+ DatabaseLogger.error(e);+ ToastManager.error(e as Error, "Error logging out");+ endProgress();+ }+ }, 300);+ }+ });+ }+ },{id: "delete-account",type: "danger",@@ -435,12 +496,18 @@ export const settingsGroups: SettingSection[] = [try {const verified = await db.user?.verifyPassword(value);if (verified) {- eSendEvent("settings-loading", true);- await db.user?.deleteUser(value);- await BiometricService.resetCredentials();- SettingsService.set({- introCompleted: true- });+ setTimeout(async () => {+ startProgress({+ title: "Deleting account",+ paragraph: "Please wait while we delete your account"+ });+ Navigation.navigate("Notes");+ await db.user?.deleteUser(value);+ await BiometricService.resetCredentials();+ SettingsService.set({+ introCompleted: true+ });+ }, 300);} else {ToastManager.show({heading: "Incorrect password",@@ -451,9 +518,9 @@ export const settingsGroups: SettingSection[] = [});}- eSendEvent("settings-loading", false);+ endProgress();} catch (e) {- eSendEvent("settings-loading", false);+ endProgress();console.log(e);ToastManager.error(e as Error,diff --git a/apps/mobile/app/services/backup.ts b/apps/mobile/app/services/backup.tsindex 6001c1db2..bfd92d958 100644--- a/apps/mobile/app/services/backup.ts+++ b/apps/mobile/app/services/backup.ts@@ -267,14 +267,15 @@ async function run(}RNFetchBlob.fs.unlink(zipSourceFolder).catch(console.log);-if (Platform.OS === "android") {RNFetchBlob.fs.unlink(zipOutputFile).catch(console.log);}updateNextBackupTime();- endProgress();+ if (progress) {+ endProgress();+ }const canShowCompletionStatus =progress && SettingsService.get().showBackupCompleteSheet;@@ -318,7 +319,9 @@ async function run(DatabaseLogger.error(e);await sleep(300);- endProgress();+ if (progress) {+ endProgress();+ }return {error: e,report: truediff --git a/apps/mobile/package-lock.json b/apps/mobile/package-lock.jsonindex 2c41125fe..67d7e6c03 100644--- a/apps/mobile/package-lock.json+++ b/apps/mobile/package-lock.json@@ -7166,7 +7166,7 @@},"../../packages/editor-mobile/node_modules/@types/prop-types": {"version": "15.7.11",- "devOptional": true,+ "dev": true,"license": "MIT"},"../../packages/editor-mobile/node_modules/@types/q": {@@ -7186,7 +7186,7 @@},"../../packages/editor-mobile/node_modules/@types/react": {"version": "18.2.39",- "devOptional": true,+ "dev": true,"license": "MIT","dependencies": {"@types/prop-types": "*",@@ -7217,7 +7217,7 @@},"../../packages/editor-mobile/node_modules/@types/scheduler": {"version": "0.16.8",- "devOptional": true,+ "dev": true,"license": "MIT"},"../../packages/editor-mobile/node_modules/@types/semver": {@@ -12075,7 +12075,7 @@},"../../packages/editor-mobile/node_modules/immer": {"version": "9.0.21",- "devOptional": true,+ "dev": true,"license": "MIT","funding": {"type": "opencollective",@@ -22464,6 +22464,7 @@},"../../packages/editor/node_modules/js-tokens": {"version": "4.0.0",+ "dev": true,"license": "MIT"},"../../packages/editor/node_modules/json-parse-even-better-errors": {@@ -22519,6 +22520,7 @@},"../../packages/editor/node_modules/loose-envify": {"version": "1.4.0",+ "dev": true,"license": "MIT","dependencies": {"js-tokens": "^3.0.0 || ^4.0.0"@@ -23040,6 +23042,7 @@},"../../packages/editor/node_modules/react": {"version": "18.2.0",+ "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0"@@ -23058,6 +23061,7 @@},"../../packages/editor/node_modules/react-dom": {"version": "18.2.0",+ "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0",@@ -23177,6 +23181,7 @@},"../../packages/editor/node_modules/scheduler": {"version": "0.23.0",+ "dev": true,"license": "MIT","dependencies": {"loose-envify": "^1.1.0"@@ -28713,6 +28718,7 @@},"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/types": "^7.22.5"@@ -28836,6 +28842,7 @@},"node_modules/@babel/helper-hoist-variables": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/types": "^7.22.5"@@ -29106,6 +29113,7 @@},"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29119,6 +29127,7 @@},"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -29268,6 +29277,7 @@},"node_modules/@babel/plugin-proposal-private-property-in-object": {"version": "7.21.0-placeholder-for-preset-env.2",+ "dev": true,"license": "MIT","engines": {"node": ">=6.9.0"@@ -29278,6 +29288,7 @@},"node_modules/@babel/plugin-proposal-unicode-property-regex": {"version": "7.18.6",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.18.6",@@ -29313,6 +29324,7 @@},"node_modules/@babel/plugin-syntax-class-properties": {"version": "7.12.13",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.12.13"@@ -29323,6 +29335,7 @@},"node_modules/@babel/plugin-syntax-class-static-block": {"version": "7.14.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.14.5"@@ -29359,6 +29372,7 @@},"node_modules/@babel/plugin-syntax-export-namespace-from": {"version": "7.8.3",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.8.3"@@ -29383,6 +29397,7 @@},"node_modules/@babel/plugin-syntax-import-assertions": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29396,6 +29411,7 @@},"node_modules/@babel/plugin-syntax-import-attributes": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29409,6 +29425,7 @@},"node_modules/@babel/plugin-syntax-import-meta": {"version": "7.10.4",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.10.4"@@ -29419,6 +29436,7 @@},"node_modules/@babel/plugin-syntax-json-strings": {"version": "7.8.3",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.8.0"@@ -29515,6 +29533,7 @@},"node_modules/@babel/plugin-syntax-top-level-await": {"version": "7.14.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.14.5"@@ -29541,6 +29560,7 @@},"node_modules/@babel/plugin-syntax-unicode-sets-regex": {"version": "7.18.6",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.18.6",@@ -29568,6 +29588,7 @@},"node_modules/@babel/plugin-transform-async-generator-functions": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-environment-visitor": "^7.22.5",@@ -29599,6 +29620,7 @@},"node_modules/@babel/plugin-transform-block-scoped-functions": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29625,6 +29647,7 @@},"node_modules/@babel/plugin-transform-class-properties": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-class-features-plugin": "^7.22.5",@@ -29639,6 +29662,7 @@},"node_modules/@babel/plugin-transform-class-static-block": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-class-features-plugin": "^7.22.5",@@ -29702,6 +29726,7 @@},"node_modules/@babel/plugin-transform-dotall-regex": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.22.5",@@ -29716,6 +29741,7 @@},"node_modules/@babel/plugin-transform-duplicate-keys": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29729,6 +29755,7 @@},"node_modules/@babel/plugin-transform-dynamic-import": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -29743,6 +29770,7 @@},"node_modules/@babel/plugin-transform-exponentiation-operator": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",@@ -29757,6 +29785,7 @@},"node_modules/@babel/plugin-transform-export-namespace-from": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -29786,6 +29815,7 @@},"node_modules/@babel/plugin-transform-for-of": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29814,6 +29844,7 @@},"node_modules/@babel/plugin-transform-json-strings": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -29841,6 +29872,7 @@},"node_modules/@babel/plugin-transform-logical-assignment-operators": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -29855,6 +29887,7 @@},"node_modules/@babel/plugin-transform-member-expression-literals": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29868,6 +29901,7 @@},"node_modules/@babel/plugin-transform-modules-amd": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-module-transforms": "^7.22.5",@@ -29897,6 +29931,7 @@},"node_modules/@babel/plugin-transform-modules-systemjs": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-hoist-variables": "^7.22.5",@@ -29913,6 +29948,7 @@},"node_modules/@babel/plugin-transform-modules-umd": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-module-transforms": "^7.22.5",@@ -29941,6 +29977,7 @@},"node_modules/@babel/plugin-transform-new-target": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -29968,6 +30005,7 @@},"node_modules/@babel/plugin-transform-numeric-separator": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -29982,6 +30020,7 @@},"node_modules/@babel/plugin-transform-object-rest-spread": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/compat-data": "^7.22.5",@@ -29999,6 +30038,7 @@},"node_modules/@babel/plugin-transform-object-super": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30013,6 +30053,7 @@},"node_modules/@babel/plugin-transform-optional-catch-binding": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30087,6 +30128,7 @@},"node_modules/@babel/plugin-transform-property-literals": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30156,6 +30198,7 @@},"node_modules/@babel/plugin-transform-regenerator": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5",@@ -30170,6 +30213,7 @@},"node_modules/@babel/plugin-transform-reserved-words": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30261,6 +30305,7 @@},"node_modules/@babel/plugin-transform-typeof-symbol": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30290,6 +30335,7 @@},"node_modules/@babel/plugin-transform-unicode-escapes": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.22.5"@@ -30303,6 +30349,7 @@},"node_modules/@babel/plugin-transform-unicode-property-regex": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.22.5",@@ -30331,6 +30378,7 @@},"node_modules/@babel/plugin-transform-unicode-sets-regex": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-create-regexp-features-plugin": "^7.22.5",@@ -30345,6 +30393,7 @@},"node_modules/@babel/preset-env": {"version": "7.22.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/compat-data": "^7.22.5",@@ -30437,6 +30486,7 @@},"node_modules/@babel/preset-env/node_modules/semver": {"version": "6.3.0",+ "dev": true,"license": "ISC","bin": {"semver": "bin/semver.js"@@ -30460,6 +30510,7 @@},"node_modules/@babel/preset-modules": {"version": "0.1.5",+ "dev": true,"license": "MIT","dependencies": {"@babel/helper-plugin-utils": "^7.0.0",@@ -33767,6 +33818,7 @@},"node_modules/@types/eslint": {"version": "8.40.2",+ "dev": true,"license": "MIT","dependencies": {"@types/estree": "*",@@ -33775,6 +33827,7 @@},"node_modules/@types/eslint-scope": {"version": "3.7.4",+ "dev": true,"license": "MIT","dependencies": {"@types/eslint": "*",@@ -33783,6 +33836,7 @@},"node_modules/@types/estree": {"version": "1.0.1",+ "dev": true,"license": "MIT"},"node_modules/@types/graceful-fs": {@@ -33885,12 +33939,12 @@},"node_modules/@types/prop-types": {"version": "15.7.5",- "devOptional": true,+ "dev": true,"license": "MIT"},"node_modules/@types/react": {"version": "18.2.13",- "devOptional": true,+ "dev": true,"license": "MIT","dependencies": {"@types/prop-types": "*",@@ -33933,7 +33987,7 @@},"node_modules/@types/scheduler": {"version": "0.16.3",- "devOptional": true,+ "dev": true,"license": "MIT"},"node_modules/@types/semver": {@@ -34245,6 +34299,7 @@},"node_modules/@webassemblyjs/ast": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/helper-numbers": "1.11.6",@@ -34253,18 +34308,22 @@},"node_modules/@webassemblyjs/floating-point-hex-parser": {"version": "1.11.6",+ "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-api-error": {"version": "1.11.6",+ "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-buffer": {"version": "1.11.6",+ "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-numbers": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/floating-point-hex-parser": "1.11.6",@@ -34274,10 +34333,12 @@},"node_modules/@webassemblyjs/helper-wasm-bytecode": {"version": "1.11.6",+ "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/helper-wasm-section": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34288,6 +34349,7 @@},"node_modules/@webassemblyjs/ieee754": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@xtuc/ieee754": "^1.2.0"@@ -34295,6 +34357,7 @@},"node_modules/@webassemblyjs/leb128": {"version": "1.11.6",+ "dev": true,"license": "Apache-2.0","dependencies": {"@xtuc/long": "4.2.2"@@ -34302,10 +34365,12 @@},"node_modules/@webassemblyjs/utf8": {"version": "1.11.6",+ "dev": true,"license": "MIT"},"node_modules/@webassemblyjs/wasm-edit": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34320,6 +34385,7 @@},"node_modules/@webassemblyjs/wasm-gen": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34331,6 +34397,7 @@},"node_modules/@webassemblyjs/wasm-opt": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34341,6 +34408,7 @@},"node_modules/@webassemblyjs/wasm-parser": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34353,6 +34421,7 @@},"node_modules/@webassemblyjs/wast-printer": {"version": "1.11.6",+ "dev": true,"license": "MIT","dependencies": {"@webassemblyjs/ast": "1.11.6",@@ -34410,10 +34479,12 @@},"node_modules/@xtuc/ieee754": {"version": "1.2.0",+ "dev": true,"license": "BSD-3-Clause"},"node_modules/@xtuc/long": {"version": "4.2.2",+ "dev": true,"license": "Apache-2.0"},"node_modules/@yarnpkg/lockfile": {@@ -34466,6 +34537,7 @@},"node_modules/acorn-import-assertions": {"version": "1.9.0",+ "dev": true,"license": "MIT","peerDependencies": {"acorn": "^8"@@ -35379,6 +35451,7 @@},"node_modules/chrome-trace-event": {"version": "1.0.3",+ "dev": true,"license": "MIT","engines": {"node": ">=6.0"@@ -35825,7 +35898,7 @@},"node_modules/csstype": {"version": "3.1.2",- "devOptional": true,+ "dev": true,"license": "MIT"},"node_modules/date-fns": {@@ -36402,29 +36475,9 @@"node": ">= 0.8"}},- "node_modules/encoding": {- "version": "0.1.13",- "license": "MIT",- "optional": true,- "peer": true,- "dependencies": {- "iconv-lite": "^0.6.2"- }- },- "node_modules/encoding/node_modules/iconv-lite": {- "version": "0.6.3",- "license": "MIT",- "optional": true,- "peer": true,- "dependencies": {- "safer-buffer": ">= 2.1.2 < 3.0.0"- },- "engines": {- "node": ">=0.10.0"- }- },"node_modules/enhanced-resolve": {"version": "5.15.0",+ "dev": true,"license": "MIT","dependencies": {"graceful-fs": "^4.2.4",@@ -36529,6 +36582,7 @@},"node_modules/es-module-lexer": {"version": "1.3.0",+ "dev": true,"license": "MIT"},"node_modules/es-set-tostringtag": {@@ -36864,6 +36918,7 @@},"node_modules/eslint-scope": {"version": "5.1.1",+ "dev": true,"license": "BSD-2-Clause","dependencies": {"esrecurse": "^4.3.0",@@ -36875,6 +36930,7 @@},"node_modules/eslint-scope/node_modules/estraverse": {"version": "4.3.0",+ "dev": true,"license": "BSD-2-Clause","engines": {"node": ">=4.0"@@ -37041,6 +37097,7 @@},"node_modules/esrecurse": {"version": "4.3.0",+ "dev": true,"license": "BSD-2-Clause","dependencies": {"estraverse": "^5.2.0"@@ -37051,6 +37108,7 @@},"node_modules/estraverse": {"version": "5.3.0",+ "dev": true,"license": "BSD-2-Clause","engines": {"node": ">=4.0"@@ -37058,6 +37116,7 @@},"node_modules/esutils": {"version": "2.0.3",+ "dev": true,"license": "BSD-2-Clause","engines": {"node": ">=0.10.0"@@ -37821,6 +37880,7 @@},"node_modules/glob-to-regexp": {"version": "0.4.1",+ "dev": true,"license": "BSD-2-Clause"},"node_modules/global": {@@ -39867,6 +39927,7 @@},"node_modules/json-parse-even-better-errors": {"version": "2.3.1",+ "dev": true,"license": "MIT"},"node_modules/json-schema-ref-resolver": {@@ -40400,6 +40461,7 @@},"node_modules/loader-runner": {"version": "4.3.0",+ "dev": true,"license": "MIT","engines": {"node": ">=6.11.5"@@ -42630,6 +42692,7 @@},"node_modules/randombytes": {"version": "2.1.0",+ "dev": true,"license": "MIT","dependencies": {"safe-buffer": "^5.1.0"@@ -43599,6 +43662,7 @@},"node_modules/regenerator-transform": {"version": "0.15.1",+ "dev": true,"license": "MIT","dependencies": {"@babel/runtime": "^7.8.4"@@ -43846,12 +43910,6 @@"node": ">=10"}},- "node_modules/safer-buffer": {- "version": "2.1.2",- "license": "MIT",- "optional": true,- "peer": true- },"node_modules/sanitize-filename": {"version": "1.6.3","dev": true,@@ -43966,6 +44024,7 @@},"node_modules/serialize-javascript": {"version": "6.0.1",+ "dev": true,"license": "BSD-3-Clause","dependencies": {"randombytes": "^2.1.0"@@ -44618,6 +44677,7 @@},"node_modules/tapable": {"version": "2.2.1",+ "dev": true,"license": "MIT","engines": {"node": ">=6"@@ -44696,6 +44756,7 @@},"node_modules/terser-webpack-plugin": {"version": "5.3.9",+ "dev": true,"license": "MIT","dependencies": {"@jridgewell/trace-mapping": "^0.3.17",@@ -44728,6 +44789,7 @@},"node_modules/terser-webpack-plugin/node_modules/jest-worker": {"version": "27.5.1",+ "dev": true,"license": "MIT","dependencies": {"@types/node": "*",@@ -44740,6 +44802,7 @@},"node_modules/terser-webpack-plugin/node_modules/supports-color": {"version": "8.1.1",+ "dev": true,"license": "MIT","dependencies": {"has-flag": "^4.0.0"@@ -45333,6 +45396,7 @@},"node_modules/watchpack": {"version": "2.4.0",+ "dev": true,"license": "MIT","dependencies": {"glob-to-regexp": "^0.4.1",@@ -45355,6 +45419,7 @@},"node_modules/webpack": {"version": "5.88.2",+ "dev": true,"license": "MIT","dependencies": {"@types/eslint-scope": "^3.7.3",@@ -45469,6 +45534,7 @@},"node_modules/webpack-sources": {"version": "3.2.3",+ "dev": true,"license": "MIT","engines": {"node": ">=10.13.0"diff --git a/apps/theme-builder/package-lock.json b/apps/theme-builder/package-lock.jsonindex 99f96c7f7..ade433447 100644--- a/apps/theme-builder/package-lock.json+++ b/apps/theme-builder/package-lock.json@@ -990,6 +990,7 @@"@dnd-kit/sortable": "^8.0.0","@emotion/react": "11.11.1","@hazae41/foras": "^2.1.4",+ "@henrygd/queue": "^1.0.6","@mdi/js": "^7.2.96","@mdi/react": "^1.6.1","@notesnook-importer/core": "^2.0.0",