Skip to content

TagSpaces is an offline, open source, document manager with tagging support

replace common imports add app config (#1807)

Stanimirf342c3fcb76f
diff --git a/app/AppConfig.ts b/app/AppConfig.ts
new file mode 100644
index 000000000..48fefaf77
--- /dev/null
+++ b/app/AppConfig.ts
@@ -0,0 +1,2 @@
+import * as AppConfig from '@tagspaces/tagspaces-common/AppConfig';
+export default AppConfig;
diff --git a/app/components/CustomLogo.tsx b/app/components/CustomLogo.tsx
index c056ac4bb..6f8543048 100644
--- a/app/components/CustomLogo.tsx
+++ b/app/components/CustomLogo.tsx
@@ -23,7 +23,7 @@ import IconButton from '@mui/material/IconButton';
import withStyles from '@mui/styles/withStyles';
import Badge from '@mui/material/Badge';
import Tooltip from '-/components/Tooltip';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import PlatformIO from '-/services/platform-facade';
import { Pro } from '../pro';
import TextLogoIcon from '../assets/images/text-logo.svg';
diff --git a/app/components/DirectoryTreeView.tsx b/app/components/DirectoryTreeView.tsx
index a43ba3858..1a1a7b320 100644
--- a/app/components/DirectoryTreeView.tsx
+++ b/app/components/DirectoryTreeView.tsx
@@ -19,8 +19,8 @@
import React, { useState, forwardRef, useImperativeHandle, Ref } from 'react';
import Table from 'rc-table';
import FolderIcon from '@mui/icons-material/FolderOpen';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import DragItemTypes from '-/components/DragItemTypes';
import PlatformIO from '-/services/platform-facade';
import TargetTableMoveFileBox from '-/components/TargetTableMoveFileBox';
diff --git a/app/components/EditDescription.tsx b/app/components/EditDescription.tsx
index 4c08f9f58..bcdc425f5 100644
--- a/app/components/EditDescription.tsx
+++ b/app/components/EditDescription.tsx
@@ -1,9 +1,7 @@
import React, { MutableRefObject, useRef, useState } from 'react';
import Button from '@mui/material/Button';
import Typography from '@mui/material/Typography';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
-import { extractContainingDirectoryPath } from '@tagspaces/tagspaces-platforms/paths';
-import PlatformIO from '-/services/platform-facade';
+import AppConfig from '-/AppConfig';
import { MilkdownEditor, MilkdownRef } from '@tagspaces/tagspaces-md';
import i18n from '-/services/i18n';
import { ProTooltip } from '-/components/HelperComponents';
diff --git a/app/components/EntryContainer.tsx b/app/components/EntryContainer.tsx
index 008be26d0..4e36488cd 100644
--- a/app/components/EntryContainer.tsx
+++ b/app/components/EntryContainer.tsx
@@ -51,8 +51,8 @@ import RefreshIcon from '@mui/icons-material/Refresh';
import Box from '@mui/material/Box';
import { ParentFolderIcon } from '-/components/CommonIcons';
import { Split } from 'ts-react-splitter';
-import { buffer } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { buffer } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import {
extractContainingDirectoryPath,
extractTitle,
@@ -61,7 +61,7 @@ import {
extractFileName,
extractDirectoryName,
generateSharingLink
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import { ProTooltip } from '-/components/HelperComponents';
import EntryProperties from '-/components/EntryProperties';
import TagsPreview from '-/components/TagsPreview';
@@ -69,7 +69,7 @@ import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import PlatformIO from '-/services/platform-facade';
import AddRemoveTagsDialog from '-/components/dialogs/AddRemoveTagsDialog';
import i18n from '-/services/i18n';
-// import { buffer } from '@tagspaces/tagspaces-platforms/misc';
+// import { buffer } from '@tagspaces/tagspaces-common/misc';
import {
actions as SettingsActions,
isDesktopMode,
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index 918b7ffcb..aacc948e3 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -18,7 +18,7 @@
import React, { ChangeEvent, useEffect, useRef, useState } from 'react';
import { useStateWithCallbackLazy } from 'use-state-with-callback';
-import { getBgndFileLocationForDirectory } from '@tagspaces/tagspaces-platforms/paths';
+import { getBgndFileLocationForDirectory } from '@tagspaces/tagspaces-common/paths';
import L from 'leaflet';
import { Theme } from '@mui/material/styles';
import withStyles from '@mui/styles/withStyles';
@@ -48,15 +48,15 @@ import {
withLeaflet
} from 'react-leaflet';
import { ButtonGroup, IconButton } from '@mui/material';
-import { formatFileSize } from '@tagspaces/tagspaces-platforms/misc';
+import { formatFileSize } from '@tagspaces/tagspaces-common/misc';
import {
extractContainingDirectoryPath,
getThumbFileLocationForFile,
getThumbFileLocationForDirectory,
extractFileName,
extractDirectoryName
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import TagDropContainer from './TagDropContainer';
import MoveCopyFilesDialog from './dialogs/MoveCopyFilesDialog';
import i18n from '../services/i18n';
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index afd21e266..83b44c9e1 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -30,7 +30,7 @@ import Badge from '@mui/material/Badge';
import withStyles from '@mui/styles/withStyles';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import LocationMenu from './menus/LocationMenu';
import i18n from '../services/i18n';
import {
diff --git a/app/components/HelpFeedbackPanel.tsx b/app/components/HelpFeedbackPanel.tsx
index 32eb24f64..09281f254 100644
--- a/app/components/HelpFeedbackPanel.tsx
+++ b/app/components/HelpFeedbackPanel.tsx
@@ -35,7 +35,7 @@ import TranslationIcon from '@mui/icons-material/Translate';
import NewFeatureIcon from '@mui/icons-material/Gesture';
import TwitterIcon from '@mui/icons-material/Twitter';
import ProTeaserIcon from '@mui/icons-material/FlightTakeoff';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import styles from '-/components/SidePanels.css';
import i18n from '-/services/i18n';
import { KeyShortcutsIcon, HelpIcon } from '-/components/CommonIcons';
diff --git a/app/components/LocationManager.tsx b/app/components/LocationManager.tsx
index 24d888770..19f4e3ac0 100644
--- a/app/components/LocationManager.tsx
+++ b/app/components/LocationManager.tsx
@@ -22,7 +22,7 @@ import { connect } from 'react-redux';
import withStyles from '@mui/styles/withStyles';
import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
import { List } from '@mui/material';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import styles from '-/components/SidePanels.css';
import LocationManagerMenu from '-/components/menus/LocationManagerMenu';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
diff --git a/app/components/LocationView.tsx b/app/components/LocationView.tsx
index 6d9f8d700..d9d86e125 100644
--- a/app/components/LocationView.tsx
+++ b/app/components/LocationView.tsx
@@ -31,8 +31,8 @@ import LocationIcon from '@mui/icons-material/WorkOutline';
import CloudLocationIcon from '@mui/icons-material/CloudQueue';
import DefaultLocationIcon from '@mui/icons-material/Highlight';
import { Progress } from 'aws-sdk/clients/s3';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import styles from './SidePanels.css';
import {
actions as AppActions,
diff --git a/app/components/PathBreadcrumbs.tsx b/app/components/PathBreadcrumbs.tsx
index cb7d653c9..d0066ad0f 100644
--- a/app/components/PathBreadcrumbs.tsx
+++ b/app/components/PathBreadcrumbs.tsx
@@ -27,7 +27,7 @@ import PlatformIO from '../services/platform-facade';
import {
normalizePath,
extractShortDirectoryName
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import i18n from '../services/i18n';
import DirectoryMenu from './menus/DirectoryMenu';
import { TS } from '-/tagspaces.namespace';
diff --git a/app/components/RenderHistory.tsx b/app/components/RenderHistory.tsx
index 863d0e7f0..70e6854b9 100644
--- a/app/components/RenderHistory.tsx
+++ b/app/components/RenderHistory.tsx
@@ -11,7 +11,7 @@ import BookmarkTwoToneIcon from '@mui/icons-material/BookmarkTwoTone';
import {
extractDirectoryName,
extractFileName
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import IconButton from '@mui/material/IconButton';
import { RemoveIcon, HistoryIcon } from '-/components/CommonIcons';
diff --git a/app/components/SearchInline.css.tsx b/app/components/SearchInline.css.tsx
index 03ab5c73a..ce4fca520 100644
--- a/app/components/SearchInline.css.tsx
+++ b/app/components/SearchInline.css.tsx
@@ -1,4 +1,4 @@
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import { BaseCSSProperties } from '@mui/styles';
export interface StyleProps {
diff --git a/app/components/SearchInline.tsx b/app/components/SearchInline.tsx
index c8e9e3926..d0791c854 100644
--- a/app/components/SearchInline.tsx
+++ b/app/components/SearchInline.tsx
@@ -32,7 +32,7 @@ import {
escapeRegExp,
parseTextQuery,
removeAllTagsFromSearchQuery
-} from '@tagspaces/tagspaces-platforms/misc';
+} from '@tagspaces/tagspaces-common/misc';
import { actions as AppActions, getDirectoryPath } from '../reducers/app';
import {
actions as LocationIndexActions,
@@ -53,7 +53,7 @@ import { Pro } from '../pro';
import useFirstRender from '-/utils/useFirstRender';
import MainSearchField from '-/components/MainSearchField';
import SavedSearchesMenu from '-/components/menus/SavedSearchesMenu';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
// type PropsClasses = Record<keyof StyleProps, string>;
diff --git a/app/components/SearchPopover.tsx b/app/components/SearchPopover.tsx
index 92cb2644a..c21b4b058 100644
--- a/app/components/SearchPopover.tsx
+++ b/app/components/SearchPopover.tsx
@@ -51,9 +51,9 @@ import FormControl from '@mui/material/FormControl';
import ButtonGroup from '@mui/material/ButtonGroup';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
-import { mergeWithExtractedTags } from '@tagspaces/tagspaces-platforms/misc';
+import { mergeWithExtractedTags } from '@tagspaces/tagspaces-common/misc';
import HelpIcon from '@mui/icons-material/Help';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import TagsSelect from './TagsSelect';
import { actions as AppActions, getDirectoryPath } from '../reducers/app';
import {
diff --git a/app/components/SidePanels.css.tsx b/app/components/SidePanels.css.tsx
index 70b405070..2ca7a387e 100644
--- a/app/components/SidePanels.css.tsx
+++ b/app/components/SidePanels.css.tsx
@@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
export default (theme: any) =>
({
diff --git a/app/components/StoredSearches.tsx b/app/components/StoredSearches.tsx
index 813f65537..9394f216f 100644
--- a/app/components/StoredSearches.tsx
+++ b/app/components/StoredSearches.tsx
@@ -35,8 +35,7 @@ import ArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
import ArrowRightIcon from '@mui/icons-material/KeyboardArrowRight';
import Typography from '@mui/material/Typography';
import ListItem from '@mui/material/ListItem';
-import List from '@mui/material/List';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import {
actions as LocationIndexActions,
getSearchQuery
@@ -62,7 +61,7 @@ import { Tooltip } from '@mui/material';
import {
extractFileName,
extractDirectoryName
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import PlatformIO from '-/services/platform-facade';
import HistoryMenu from '-/components/menus/HistoryMenu';
import BookmarksMenu from '-/components/menus/BookmarksMenu';
diff --git a/app/components/TagContainer.tsx b/app/components/TagContainer.tsx
index be217a6b2..51bcca108 100644
--- a/app/components/TagContainer.tsx
+++ b/app/components/TagContainer.tsx
@@ -24,7 +24,7 @@ import PlaceIcon from '@mui/icons-material/Place';
import DateIcon from '@mui/icons-material/DateRange';
import RemoveTagIcon from '@mui/icons-material/Close';
import Tooltip from '-/components/Tooltip';
-import { formatDateTime } from '@tagspaces/tagspaces-platforms/misc';
+import { formatDateTime } from '@tagspaces/tagspaces-common/misc';
import { getAllTags, getTagColors } from '-/reducers/taglibrary';
import { getTagColor, getTagTextColor } from '-/reducers/settings';
import { isGeoTag } from '-/utils/geo';
diff --git a/app/components/TagContainerDnd.tsx b/app/components/TagContainerDnd.tsx
index 5be12fac3..48b787eec 100644
--- a/app/components/TagContainerDnd.tsx
+++ b/app/components/TagContainerDnd.tsx
@@ -26,8 +26,8 @@ import {
} from 'react-dnd';
import { getEmptyImage } from 'react-dnd-html5-backend';
-import { extractTags } from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { extractTags } from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import DragItemTypes from './DragItemTypes';
import TagContainer from './TagContainer';
import { TS } from '-/tagspaces.namespace';
diff --git a/app/components/TagLibrary.tsx b/app/components/TagLibrary.tsx
index 6269679ce..0357e5940 100644
--- a/app/components/TagLibrary.tsx
+++ b/app/components/TagLibrary.tsx
@@ -25,7 +25,7 @@ import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import Collapse from '@mui/material/Collapse';
import MoreVertIcon from '@mui/icons-material/MoreVert';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import TagContainerDnd from './TagContainerDnd';
import TagContainer from './TagContainer';
import ConfirmDialog from './dialogs/ConfirmDialog';
diff --git a/app/components/dialogs/AddRemoveTagsDialog.tsx b/app/components/dialogs/AddRemoveTagsDialog.tsx
index 3bd61aeba..cccc8afc8 100644
--- a/app/components/dialogs/AddRemoveTagsDialog.tsx
+++ b/app/components/dialogs/AddRemoveTagsDialog.tsx
@@ -31,13 +31,13 @@ import FolderIcon from '@mui/icons-material/FolderOpen';
import FileIcon from '@mui/icons-material/InsertDriveFileOutlined';
import Typography from '@mui/material/Typography';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import TagsSelect from '../TagsSelect';
import i18n from '-/services/i18n';
import {
extractFileName,
extractDirectoryName
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import PlatformIO from '-/services/platform-facade';
import { TS } from '-/tagspaces.namespace';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
diff --git a/app/components/dialogs/CreateDialog.tsx b/app/components/dialogs/CreateDialog.tsx
index 79beef38b..48052969d 100644
--- a/app/components/dialogs/CreateDialog.tsx
+++ b/app/components/dialogs/CreateDialog.tsx
@@ -33,9 +33,8 @@ import Grid from '@mui/material/Grid';
import withStyles from '@mui/styles/withStyles';
import Dialog from '@mui/material/Dialog';
import { Progress } from 'aws-sdk/clients/s3';
-import { formatDateTime4Tag } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
-import { extractContainingDirectoryPath } from '@tagspaces/tagspaces-platforms/paths';
+import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { getKeyBindingObject } from '-/reducers/settings';
import {
diff --git a/app/components/dialogs/CreateDirectoryDialog.tsx b/app/components/dialogs/CreateDirectoryDialog.tsx
index 2de5ee773..151eda793 100644
--- a/app/components/dialogs/CreateDirectoryDialog.tsx
+++ b/app/components/dialogs/CreateDirectoryDialog.tsx
@@ -29,7 +29,7 @@ import FormHelperText from '@mui/material/FormHelperText';
import Dialog from '@mui/material/Dialog';
import i18n from '-/services/i18n';
import { actions as AppActions } from '-/reducers/app';
-import { joinPaths } from '@tagspaces/tagspaces-platforms/paths';
+import { joinPaths } from '@tagspaces/tagspaces-common/paths';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import PlatformIO from '-/services/platform-facade';
import useTheme from '@mui/styles/useTheme';
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index 3b1923e0e..7dc2b6527 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -41,8 +41,8 @@ import CheckIcon from '@mui/icons-material/Check';
import RemoveIcon from '@mui/icons-material/RemoveCircleOutline';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import {
Accordion,
AccordionDetails,
diff --git a/app/components/dialogs/CreateFileDialog.tsx b/app/components/dialogs/CreateFileDialog.tsx
index d96e4fe30..f3b6a3654 100644
--- a/app/components/dialogs/CreateFileDialog.tsx
+++ b/app/components/dialogs/CreateFileDialog.tsx
@@ -35,8 +35,8 @@ import Input from '@mui/material/Input';
import InputLabel from '@mui/material/InputLabel';
import InputAdornment from '@mui/material/InputAdornment';
import Dialog from '@mui/material/Dialog';
-import { formatDateTime4Tag } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import TaggingActions from '-/reducers/tagging-actions';
import { actions as AppActions } from '-/reducers/app';
diff --git a/app/components/dialogs/EditEntryTagDialog.tsx b/app/components/dialogs/EditEntryTagDialog.tsx
index c51994574..66f6817cb 100644
--- a/app/components/dialogs/EditEntryTagDialog.tsx
+++ b/app/components/dialogs/EditEntryTagDialog.tsx
@@ -35,7 +35,7 @@ import FormControl from '@mui/material/FormControl';
import FormHelperText from '@mui/material/FormHelperText';
import Dialog from '@mui/material/Dialog';
import EditIcon from '@mui/icons-material/Edit';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { isGeoTag } from '-/utils/geo';
import { Pro } from '-/pro';
diff --git a/app/components/dialogs/FileUploadDialog.tsx b/app/components/dialogs/FileUploadDialog.tsx
index b186e90af..0be02bca6 100644
--- a/app/components/dialogs/FileUploadDialog.tsx
+++ b/app/components/dialogs/FileUploadDialog.tsx
@@ -35,7 +35,7 @@ import {
getCurrentDirectoryPerspective,
getProgress
} from '-/reducers/app';
-import { extractFileName } from '@tagspaces/tagspaces-platforms/paths';
+import { extractFileName } from '@tagspaces/tagspaces-common/paths';
import i18n from '-/services/i18n';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import { PerspectiveIDs } from '-/perspectives';
diff --git a/app/components/dialogs/ImportExportTagGroupsDialog.tsx b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
index 363203cd8..d1b6baaec 100644
--- a/app/components/dialogs/ImportExportTagGroupsDialog.tsx
+++ b/app/components/dialogs/ImportExportTagGroupsDialog.tsx
@@ -27,8 +27,8 @@ import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Checkbox from '@mui/material/Checkbox';
import Dialog from '@mui/material/Dialog';
-import { isFunc } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { isFunc } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import TagGroupContainer from '../TagGroupContainer';
import TagContainer from '../TagContainer';
import i18n from '-/services/i18n';
diff --git a/app/components/dialogs/KeyboardDialog.tsx b/app/components/dialogs/KeyboardDialog.tsx
index 01b54c2dc..fc2af9469 100644
--- a/app/components/dialogs/KeyboardDialog.tsx
+++ b/app/components/dialogs/KeyboardDialog.tsx
@@ -28,7 +28,7 @@ import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction';
import ListItemText from '@mui/material/ListItemText';
import withStyles from '@mui/styles/withStyles';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { getKeyBindingObject } from '-/reducers/settings';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
diff --git a/app/components/dialogs/LicenseDialog.tsx b/app/components/dialogs/LicenseDialog.tsx
index 6cadbd8d0..1cce0a94d 100644
--- a/app/components/dialogs/LicenseDialog.tsx
+++ b/app/components/dialogs/LicenseDialog.tsx
@@ -22,7 +22,7 @@ import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { Pro } from '-/pro';
import LicenseContent from '-/LICENSE.txt';
diff --git a/app/components/dialogs/LocalForm.tsx b/app/components/dialogs/LocalForm.tsx
index acb33180d..7015878b8 100644
--- a/app/components/dialogs/LocalForm.tsx
+++ b/app/components/dialogs/LocalForm.tsx
@@ -25,8 +25,8 @@ import IconButton from '@mui/material/IconButton';
import FolderIcon from '@mui/icons-material/Folder';
import FormHelperText from '@mui/material/FormHelperText';
import Grid from '@mui/material/Grid';
-import { extractDirectoryName } from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { extractDirectoryName } from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import PlatformIO from '-/services/platform-facade';
diff --git a/app/components/dialogs/MoveCopyFilesDialog.tsx b/app/components/dialogs/MoveCopyFilesDialog.tsx
index 009e4eb75..61af93570 100644
--- a/app/components/dialogs/MoveCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveCopyFilesDialog.tsx
@@ -36,8 +36,8 @@ import FormHelperText from '@mui/material/FormHelperText';
import Typography from '@mui/material/Typography';
import Dialog from '@mui/material/Dialog';
import IconButton from '@mui/material/IconButton';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
-import { extractFileName } from '@tagspaces/tagspaces-platforms/paths';
+import AppConfig from '-/AppConfig';
+import { extractFileName } from '@tagspaces/tagspaces-common/paths';
import i18n from '-/services/i18n';
import PlatformIO from '-/services/platform-facade';
import IOActions from '-/reducers/io-actions';
diff --git a/app/components/dialogs/OnboardingDialog.tsx b/app/components/dialogs/OnboardingDialog.tsx
index 27cea26fe..b724c4553 100644
--- a/app/components/dialogs/OnboardingDialog.tsx
+++ b/app/components/dialogs/OnboardingDialog.tsx
@@ -33,7 +33,7 @@ import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import MobileStepper from '@mui/material/MobileStepper';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import BrowserExtension from '-/assets/images/collectcontent.svg';
import WizardFinished from '-/assets/images/computer-desk.svg';
import ChooseTagging from '-/assets/images/abacus.svg';
diff --git a/app/components/dialogs/ProTeaserDialog.tsx b/app/components/dialogs/ProTeaserDialog.tsx
index 4bde541c9..4a2cffda1 100644
--- a/app/components/dialogs/ProTeaserDialog.tsx
+++ b/app/components/dialogs/ProTeaserDialog.tsx
@@ -25,7 +25,7 @@ import DialogTitle from '@mui/material/DialogTitle';
import Typography from '@mui/material/Typography';
import MobileStepper from '@mui/material/MobileStepper';
import Dialog from '@mui/material/Dialog';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import useTheme from '@mui/styles/useTheme';
diff --git a/app/components/dialogs/RenameEntryDialog.tsx b/app/components/dialogs/RenameEntryDialog.tsx
index a658cb585..a4c6f5397 100644
--- a/app/components/dialogs/RenameEntryDialog.tsx
+++ b/app/components/dialogs/RenameEntryDialog.tsx
@@ -31,8 +31,8 @@ import {
extractContainingDirectoryPath,
extractDirectoryName,
extractFileName
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { actions as AppActions, getLastSelectedEntry } from '-/reducers/app';
import PlatformIO from '-/services/platform-facade';
diff --git a/app/components/dialogs/settings/SettingsAdvanced.tsx b/app/components/dialogs/settings/SettingsAdvanced.tsx
index be6f53469..5e871a03b 100644
--- a/app/components/dialogs/settings/SettingsAdvanced.tsx
+++ b/app/components/dialogs/settings/SettingsAdvanced.tsx
@@ -33,7 +33,7 @@ import Switch from '@mui/material/Switch';
import Select from '@mui/material/Select';
import Input from '@mui/material/Input';
import MenuItem from '@mui/material/MenuItem';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import {
actions as SettingsActions,
diff --git a/app/components/dialogs/settings/SettingsDialog.tsx b/app/components/dialogs/settings/SettingsDialog.tsx
index 1ee311ea9..17cc02ac8 100644
--- a/app/components/dialogs/settings/SettingsDialog.tsx
+++ b/app/components/dialogs/settings/SettingsDialog.tsx
@@ -30,8 +30,8 @@ import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogTitle from '@mui/material/DialogTitle';
import { useStateWithCallbackLazy } from 'use-state-with-callback';
-import { extend } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { extend } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import ConfirmDialog from '../ConfirmDialog';
import SettingsGeneral from '../settings/SettingsGeneral';
import SettingsKeyBindings from '../settings/SettingsKeyBindings';
diff --git a/app/components/dialogs/settings/SettingsGeneral.tsx b/app/components/dialogs/settings/SettingsGeneral.tsx
index 1fb15f91c..8e4cecc50 100644
--- a/app/components/dialogs/settings/SettingsGeneral.tsx
+++ b/app/components/dialogs/settings/SettingsGeneral.tsx
@@ -35,7 +35,7 @@ import InfoIcon from '-/components/InfoIcon';
import CheckIcon from '@mui/icons-material/Check';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import {
actions as SettingsActions,
diff --git a/app/components/dialogs/settings/SettingsKeyBindings.tsx b/app/components/dialogs/settings/SettingsKeyBindings.tsx
index 8c8de0f12..7d8c1a684 100644
--- a/app/components/dialogs/settings/SettingsKeyBindings.tsx
+++ b/app/components/dialogs/settings/SettingsKeyBindings.tsx
@@ -24,7 +24,7 @@ import TextField from '@mui/material/TextField';
import Switch from '@mui/material/Switch';
import ListItem from '@mui/material/ListItem';
import ListItemText from '@mui/material/ListItemText';
-import { isStr } from '@tagspaces/tagspaces-platforms/misc';
+import { isStr } from '@tagspaces/tagspaces-common/misc';
import PlatformIO from '-/services/platform-facade';
import i18n from '-/services/i18n';
import {
diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsx
index cf870d197..6eaaefd86 100644
--- a/app/components/menus/DirectoryMenu.tsx
+++ b/app/components/menus/DirectoryMenu.tsx
@@ -21,15 +21,15 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import Menu from '@mui/material/Menu';
import { Progress } from 'aws-sdk/clients/s3';
-import { formatDateTime4Tag } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import {
extractContainingDirectoryPath,
extractDirectoryName,
getThumbFileLocationForDirectory,
normalizePath,
generateSharingLink
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import { Pro } from '../../pro';
import CreateDirectoryDialog from '../dialogs/CreateDirectoryDialog';
import i18n from '-/services/i18n';
diff --git a/app/components/menus/FileMenu.tsx b/app/components/menus/FileMenu.tsx
index da7051746..2c9c6e547 100644
--- a/app/components/menus/FileMenu.tsx
+++ b/app/components/menus/FileMenu.tsx
@@ -35,15 +35,15 @@ import ImageIcon from '@mui/icons-material/Image';
import ShareIcon from '@mui/icons-material/Link';
import RenameFile from '@mui/icons-material/FormatTextdirectionLToR';
import DeleteForever from '@mui/icons-material/DeleteForever';
-import { formatDateTime4Tag } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import {
extractContainingDirectoryPath,
extractFileName,
extractParentDirectoryPath,
extractTags,
generateSharingLink
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import i18n from '-/services/i18n';
import PlatformIO from '-/services/platform-facade';
import {
diff --git a/app/components/menus/LocationContextMenu.tsx b/app/components/menus/LocationContextMenu.tsx
index 87617042e..b67e17003 100644
--- a/app/components/menus/LocationContextMenu.tsx
+++ b/app/components/menus/LocationContextMenu.tsx
@@ -30,8 +30,8 @@ import OpenFolderNativelyIcon from '@mui/icons-material/Launch';
import CloseIcon from '@mui/icons-material/Close';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import { actions as LocationActions } from '-/reducers/locations';
import { actions as LocationIndexActions } from '-/reducers/location-index';
import i18n from '-/services/i18n';
diff --git a/app/components/menus/LocationManagerMenu.tsx b/app/components/menus/LocationManagerMenu.tsx
index a1e03236f..65b5c81d6 100644
--- a/app/components/menus/LocationManagerMenu.tsx
+++ b/app/components/menus/LocationManagerMenu.tsx
@@ -31,7 +31,7 @@ import IconButton from '@mui/material/IconButton';
import MoreVertIcon from '@mui/icons-material/MoreVert';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { Pro } from '../../pro';
import { actions as AppActions } from '-/reducers/app';
diff --git a/app/components/menus/LocationMenu.tsx b/app/components/menus/LocationMenu.tsx
index db5e54525..c517ef142 100644
--- a/app/components/menus/LocationMenu.tsx
+++ b/app/components/menus/LocationMenu.tsx
@@ -30,7 +30,7 @@ import Tooltip from '-/components/Tooltip';
import withTheme from '@mui/styles/withTheme';
import IconButton from '@mui/material/IconButton';
import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
import i18n from '-/services/i18n';
import { getLocations } from '-/reducers/locations';
import { actions as AppActions, getCurrentLocationId } from '-/reducers/app';
diff --git a/app/components/menus/TagLibraryMenu.tsx b/app/components/menus/TagLibraryMenu.tsx
index 0bb8cc26c..b63e61917 100644
--- a/app/components/menus/TagLibraryMenu.tsx
+++ b/app/components/menus/TagLibraryMenu.tsx
@@ -25,7 +25,7 @@ import ImportExportIcon from '@mui/icons-material/SwapHoriz';
import HelpIcon from '@mui/icons-material/Help';
import AddIcon from '@mui/icons-material/Add';
import ReloadIcon from '@mui/icons-material/Sync';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import ImportExportTagGroupsDialog from '../dialogs/ImportExportTagGroupsDialog';
import i18n from '-/services/i18n';
import { TS } from '-/tagspaces.namespace';
diff --git a/app/containers/App.tsx b/app/containers/App.tsx
index 6e874f076..04c9fb7b1 100644
--- a/app/containers/App.tsx
+++ b/app/containers/App.tsx
@@ -26,7 +26,7 @@ import {
StyledEngineProvider
} from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '../services/i18n';
import {
getCurrentTheme,
diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsx
index c281e1569..b24ef610f 100644
--- a/app/containers/MainPage.tsx
+++ b/app/containers/MainPage.tsx
@@ -29,8 +29,8 @@ import { NativeTypes } from 'react-dnd-html5-backend';
import { Progress } from 'aws-sdk/clients/s3';
import { CognitoUserInterface } from '@aws-amplify/ui-components';
import { Split } from 'ts-react-splitter';
-import { buffer } from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import { buffer } from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import MobileNavigation from '../components/MobileNavigation';
import FolderContainer from '../components/FolderContainer';
import EntryContainer from '../components/EntryContainer';
diff --git a/app/containers/RendererListener.ts b/app/containers/RendererListener.ts
index 7b489081c..e17187c40 100644
--- a/app/containers/RendererListener.ts
+++ b/app/containers/RendererListener.ts
@@ -16,7 +16,7 @@
*
*/
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
export default function listen(props) {
let ipcRenderer;
diff --git a/app/containers/Root.tsx b/app/containers/Root.tsx
index f23d4171e..927c21fd6 100644
--- a/app/containers/Root.tsx
+++ b/app/containers/Root.tsx
@@ -20,7 +20,7 @@ import React from 'react';
import { Provider } from 'react-redux';
import { PersistGate } from 'redux-persist/integration/react';
import { Store } from 'redux';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import LoadingScreen from '../components/LoadingScreen';
import { actions as AppActions } from '../reducers/app';
import App from '-/containers/App';
diff --git a/app/package.json b/app/package.json
index f29336d21..e5684f81d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -16,7 +16,7 @@
"@tagspaces/extensions": "1.0.43"
},
"nodeDependencies": {
- "@tagspaces/tagspaces-ws": "2.0.53",
+ "@tagspaces/tagspaces-ws": "2.1.2",
"@tagspaces/extensions": "1.0.43",
"sharp": "^0.30.7"
}
diff --git a/app/perspectives/common/DirectoryMenuItems.tsx b/app/perspectives/common/DirectoryMenuItems.tsx
index e3d63bcf6..9b20715ca 100644
--- a/app/perspectives/common/DirectoryMenuItems.tsx
+++ b/app/perspectives/common/DirectoryMenuItems.tsx
@@ -7,7 +7,7 @@ import AutoRenew from '@mui/icons-material/Autorenew';
import RenameFolderIcon from '@mui/icons-material/FormatTextdirectionLToR';
import DeleteForeverIcon from '@mui/icons-material/DeleteForever';
import PlatformIO from '-/services/platform-facade';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import OpenFolderNativelyIcon from '@mui/icons-material/Launch';
import Divider from '@mui/material/Divider';
import NewFileIcon from '@mui/icons-material/InsertDriveFile';
diff --git a/app/perspectives/common/main-container.tsx b/app/perspectives/common/main-container.tsx
index 0f98f12ca..ab7de7154 100644
--- a/app/perspectives/common/main-container.tsx
+++ b/app/perspectives/common/main-container.tsx
@@ -3,9 +3,9 @@ import FileSourceDnd from '-/components/FileSourceDnd';
import TargetMoveFileBox from '-/components/TargetMoveFileBox';
import DragItemTypes from '-/components/DragItemTypes';
import React from 'react';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
import PlatformIO from '-/services/platform-facade';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
export const fileOperationsEnabled = selectedEntries => {
diff --git a/app/perspectives/grid-perspective/components/CellContent.tsx b/app/perspectives/grid-perspective/components/CellContent.tsx
index e6e11118c..61c9ceaf4 100644
--- a/app/perspectives/grid-perspective/components/CellContent.tsx
+++ b/app/perspectives/grid-perspective/components/CellContent.tsx
@@ -31,12 +31,12 @@ import { connect } from 'react-redux';
import {
formatFileSize,
formatDateTime
-} from '@tagspaces/tagspaces-platforms/misc';
+} from '@tagspaces/tagspaces-common/misc';
import {
extractTagsAsObjects,
extractTitle
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import {
findBackgroundColorForFolder,
findColorForEntry,
diff --git a/app/perspectives/grid-perspective/components/GridPagination.tsx b/app/perspectives/grid-perspective/components/GridPagination.tsx
index 8267561b8..342831064 100644
--- a/app/perspectives/grid-perspective/components/GridPagination.tsx
+++ b/app/perspectives/grid-perspective/components/GridPagination.tsx
@@ -25,14 +25,14 @@ import Box from '@mui/material/Box';
import ButtonBase from '@mui/material/ButtonBase';
import Pagination from '@mui/material/Pagination';
import { bindActionCreators } from 'redux';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import {
getMetaFileLocationForDir,
getMetaFileLocationForFile,
getThumbFileLocationForDirectory,
getThumbFileLocationForFile,
extractDirectoryName
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import i18n from '-/services/i18n';
import {
actions as AppActions,
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index f026aea32..2b1fc4143 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -25,8 +25,8 @@ import {
isObj,
locationType,
sortByCriteria
-} from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import { isVisibleOnScreen } from '-/utils/dom';
import { actions as TagLibraryActions } from '-/reducers/taglibrary';
import {
diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsx
index cb3d9cd48..13b289c3e 100644
--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx
+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx
@@ -34,7 +34,7 @@ import {
} from '-/components/CommonIcons';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import { Pro } from '-/pro';
import {
diff --git a/app/perspectives/grid-perspective/components/styles.css.tsx b/app/perspectives/grid-perspective/components/styles.css.tsx
index f731bb144..f03b861a3 100644
--- a/app/perspectives/grid-perspective/components/styles.css.tsx
+++ b/app/perspectives/grid-perspective/components/styles.css.tsx
@@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import { alpha } from '@mui/material/styles';
export default (theme: any): any => ({
diff --git a/app/perspectives/list/components/MainContainer.tsx b/app/perspectives/list/components/MainContainer.tsx
index b860a45e4..16c3ab238 100644
--- a/app/perspectives/list/components/MainContainer.tsx
+++ b/app/perspectives/list/components/MainContainer.tsx
@@ -25,8 +25,8 @@ import {
isObj,
locationType,
sortByCriteria
-} from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import { isVisibleOnScreen } from '-/utils/dom';
import { actions as TagLibraryActions } from '-/reducers/taglibrary';
import {
diff --git a/app/pro/index.ts b/app/pro/index.ts
index 3575af260..1db31cf4a 100644
--- a/app/pro/index.ts
+++ b/app/pro/index.ts
@@ -16,7 +16,7 @@
*
*/
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
let tsPro;
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index 2e25b1d51..bf91277a1 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -19,8 +19,8 @@
import {
formatDateTime4Tag,
locationType
-} from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import {
extractFileExtension,
extractDirectoryName,
@@ -33,7 +33,7 @@ import {
extractContainingDirectoryPath,
getMetaFileLocationForDir,
generateSharingLink
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import {
getURLParameter,
clearURLParam,
diff --git a/app/reducers/index.ts b/app/reducers/index.ts
index 5b5f768b6..2728cc048 100644
--- a/app/reducers/index.ts
+++ b/app/reducers/index.ts
@@ -19,7 +19,7 @@ import { persistCombineReducers, PersistConfig } from 'redux-persist';
import getStoredStateMigrateV4 from 'redux-persist/lib/integration/getStoredStateMigrateV4';
// import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2';
import storage from 'redux-persist/lib/storage';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import settings from './settings';
import app from './app';
import locations from './locations';
diff --git a/app/reducers/io-actions.ts b/app/reducers/io-actions.ts
index 8472acb12..aa30ffc7c 100644
--- a/app/reducers/io-actions.ts
+++ b/app/reducers/io-actions.ts
@@ -20,14 +20,14 @@ import { Progress } from 'aws-sdk/clients/s3';
import {
enhanceEntry,
loadJSONString
-} from '@tagspaces/tagspaces-platforms/utils-common';
+} from '@tagspaces/tagspaces-common/utils-io';
import {
extractFileName,
getMetaFileLocationForFile,
getThumbFileLocationForFile,
normalizePath
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import { actions as AppActions } from './app';
import { copyFilesPromise, renameFilesPromise } from '-/services/utils-io';
import i18n from '../services/i18n';
diff --git a/app/reducers/location-index.ts b/app/reducers/location-index.ts
index 4f6ad4ad1..483fda148 100644
--- a/app/reducers/location-index.ts
+++ b/app/reducers/location-index.ts
@@ -17,14 +17,14 @@
*/
import { loadIndex, hasIndex } from '@tagspaces/tagspaces-platforms/indexer';
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
import {
extractFileExtension,
extractFileName,
extractTagsAsObjects,
getThumbFileLocationForFile
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import { getLocation, getLocationByPath, getLocations } from './locations';
import { createDirectoryIndex } from '-/services/utils-io';
import Search from '../services/search';
diff --git a/app/reducers/locations.ts b/app/reducers/locations.ts
index 254b7816d..9fdf0fda4 100644
--- a/app/reducers/locations.ts
+++ b/app/reducers/locations.ts
@@ -19,7 +19,7 @@
import {
immutablySwapItems,
locationType
-} from '@tagspaces/tagspaces-platforms/misc';
+} from '@tagspaces/tagspaces-common/misc';
import { actions as AppActions } from '-/reducers/app';
import i18n from '-/services/i18n';
import PlatformIO from '-/services/platform-facade';
diff --git a/app/reducers/searches.ts b/app/reducers/searches.ts
index 375116288..05c641ec6 100644
--- a/app/reducers/searches.ts
+++ b/app/reducers/searches.ts
@@ -16,7 +16,7 @@
*
*/
-import { immutablySwapItems } from '@tagspaces/tagspaces-platforms/misc';
+import { immutablySwapItems } from '@tagspaces/tagspaces-common/misc';
import { TS } from '-/tagspaces.namespace';
export const initialState = [];
diff --git a/app/reducers/settings-default.ts b/app/reducers/settings-default.ts
index 99f73d2f3..65c1e11d0 100644
--- a/app/reducers/settings-default.ts
+++ b/app/reducers/settings-default.ts
@@ -16,7 +16,7 @@
*
*/
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import keyBindings from '-/reducers/keybindings-default';
import { PerspectiveIDs } from '-/perspectives';
diff --git a/app/reducers/settings.ts b/app/reducers/settings.ts
index c10edfea1..34299171b 100644
--- a/app/reducers/settings.ts
+++ b/app/reducers/settings.ts
@@ -17,7 +17,7 @@
*/
import semver from 'semver';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import i18n from '-/services/i18n';
import defaultSettings from './settings-default';
import PlatformIO from '-/services/platform-facade';
diff --git a/app/reducers/tagging-actions.ts b/app/reducers/tagging-actions.ts
index bd20b31cc..601015cb1 100644
--- a/app/reducers/tagging-actions.ts
+++ b/app/reducers/tagging-actions.ts
@@ -17,7 +17,7 @@
*/
import OpenLocationCode from 'open-location-code-typescript';
import mgrs from 'mgrs';
-import { formatDateTime4Tag } from '@tagspaces/tagspaces-platforms/misc';
+import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
import i18n from '../services/i18n';
import {
actions as AppActions,
@@ -30,7 +30,7 @@ import {
extractTags,
extractTitle,
extractContainingDirectoryPath
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import {
loadMetaDataPromise,
saveMetaDataPromise,
diff --git a/app/reducers/taglibrary.ts b/app/reducers/taglibrary.ts
index 212b8c521..469ed9e9e 100644
--- a/app/reducers/taglibrary.ts
+++ b/app/reducers/taglibrary.ts
@@ -20,8 +20,8 @@ import {
formatDateTime4Tag,
extend,
prepareTagGroupForExport
-} from '@tagspaces/tagspaces-platforms/misc';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/misc';
+import AppConfig from '-/AppConfig';
import { getUuid, parseNewTags, saveAsTextFile } from '-/services/utils-io';
import versionMeta from '../version.json';
import defaultTagLibrary from './taglibrary-default';
diff --git a/app/services/platform-facade.ts b/app/services/platform-facade.ts
index 5ae8d063b..171fe7ee9 100644
--- a/app/services/platform-facade.ts
+++ b/app/services/platform-facade.ts
@@ -71,7 +71,7 @@ import {
platformCheckFileExist,
platformCheckDirExist
} from '@tagspaces/tagspaces-platforms/platform-io';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '-/AppConfig';
import { Pro } from '../pro';
import { TS } from '-/tagspaces.namespace';
diff --git a/app/services/thumbsgenerator.ts b/app/services/thumbsgenerator.ts
index 6999df36c..56fc02f44 100644
--- a/app/services/thumbsgenerator.ts
+++ b/app/services/thumbsgenerator.ts
@@ -24,8 +24,8 @@ import {
normalizePath,
getMetaDirectoryPath,
encodeFileName
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import { base64ToArrayBuffer } from '-/utils/dom';
import PlatformIO from '../services/platform-facade';
import { Pro } from '../pro';
diff --git a/app/services/utils-io.ts b/app/services/utils-io.ts
index 2e52eddcf..e576864e7 100644
--- a/app/services/utils-io.ts
+++ b/app/services/utils-io.ts
@@ -27,12 +27,12 @@ import {
import {
enhanceEntry,
loadJSONString
-} from '@tagspaces/tagspaces-platforms/utils-common';
+} from '@tagspaces/tagspaces-common/utils-io';
import { saveAs } from 'file-saver';
import {
locationType,
prepareTagForExport
-} from '@tagspaces/tagspaces-platforms/misc';
+} from '@tagspaces/tagspaces-common/misc';
import {
extractTagsAsObjects,
extractFileExtension,
@@ -45,8 +45,8 @@ import {
getThumbFileLocationForFile,
getThumbFileLocationForDirectory,
getBgndFileLocationForDirectory
-} from '@tagspaces/tagspaces-platforms/paths';
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+} from '@tagspaces/tagspaces-common/paths';
+import AppConfig from '-/AppConfig';
import PlatformIO from './platform-facade';
import i18n from '../services/i18n';
import versionMeta from '../version.json';
diff --git a/app/services/webdav-io.ts b/app/services/webdav-io.ts
index 4f8eea145..0ccbea506 100644
--- a/app/services/webdav-io.ts
+++ b/app/services/webdav-io.ts
@@ -22,7 +22,7 @@ import {
getMetaFileLocationForDir,
extractFileName,
extractFileExtension
-} from '@tagspaces/tagspaces-platforms/paths';
+} from '@tagspaces/tagspaces-common/paths';
import AppConfig from '../config';
import { TS } from '-/tagspaces.namespace';
diff --git a/app/utils/dom.ts b/app/utils/dom.ts
index 832408f8b..6b8dfe9c5 100644
--- a/app/utils/dom.ts
+++ b/app/utils/dom.ts
@@ -1,4 +1,4 @@
-import { locationType } from '@tagspaces/tagspaces-platforms/misc';
+import { locationType } from '@tagspaces/tagspaces-common/misc';
import { TS } from '-/tagspaces.namespace';
import PlatformIO from '-/services/platform-facade';
diff --git a/package-lock.json b/package-lock.json
index 22b6e09ef..f359156d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@mui/styles": "5.10.15",
"@mui/x-date-pickers": "^5.0.8",
"@tagspaces/tagspaces-md": "2.0.53",
- "@tagspaces/tagspaces-platforms": "2.0.53",
+ "@tagspaces/tagspaces-platforms": "2.1.2",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"babel-polyfill": "^6.26.0",
@@ -13912,9 +13912,9 @@
}
},
"node_modules/@tagspaces/tagspaces-platforms": {
- "version": "2.0.53",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.0.53.tgz",
- "integrity": "sha512-fevd4Oyv2y7XUAExdk+ucjq2WwnHXnKWojqDGgsM+WlepCi9oYA26w5YKtbwpWq48nSmrdmXkqc534tw6qUMsQ==",
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.1.2.tgz",
+ "integrity": "sha512-C29O6H/FfWA6jK/Wd5PfnhKGcAWGoXW8IQVz9MDPbFsTl+ZsVI03HUn1KdVnXqdPaERxe11TubT5hB4hlsMABg==",
"hasInstallScript": true
},
"node_modules/@testim/chrome-version": {
@@ -59612,9 +59612,9 @@
}
},
"@tagspaces/tagspaces-platforms": {
- "version": "2.0.53",
- "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.0.53.tgz",
- "integrity": "sha512-fevd4Oyv2y7XUAExdk+ucjq2WwnHXnKWojqDGgsM+WlepCi9oYA26w5YKtbwpWq48nSmrdmXkqc534tw6qUMsQ=="
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-2.1.2.tgz",
+ "integrity": "sha512-C29O6H/FfWA6jK/Wd5PfnhKGcAWGoXW8IQVz9MDPbFsTl+ZsVI03HUn1KdVnXqdPaERxe11TubT5hB4hlsMABg=="
},
"@testim/chrome-version": {
"version": "1.1.3",
diff --git a/package.json b/package.json
index 27aa9601a..a0238e094 100644
--- a/package.json
+++ b/package.json
@@ -158,7 +158,7 @@
"@mui/styles": "5.10.15",
"@mui/x-date-pickers": "^5.0.8",
"@tagspaces/tagspaces-md": "2.0.53",
- "@tagspaces/tagspaces-platforms": "2.0.53",
+ "@tagspaces/tagspaces-platforms": "2.1.2",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"babel-polyfill": "^6.26.0",
diff --git a/tests/unit/paths.test.js b/tests/unit/paths.test.js
index b536a60a2..38ec15566 100644
--- a/tests/unit/paths.test.js
+++ b/tests/unit/paths.test.js
@@ -1,11 +1,11 @@
-import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import AppConfig from '@tagspaces/tagspaces-common/AppConfig';
const {
baseName,
extractFileExtension,
getMetaDirectoryPath,
getMetaFileLocationForFile
-} = require('@tagspaces/tagspaces-platforms/paths');
+} = require('@tagspaces/tagspaces-common/paths');
const dirSeparatorUnix = '/';
const dirSeparatorWin = '\\';