From 04bfbec96bf713bc5db4e1125e235bd5129bf44b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Sat, 7 Nov 2020 15:59:37 +0000 Subject: [PATCH] Tools: Renamed package namespace from @joplinapp to @joplin --- BUILD.md | 2 +- packages/app-cli/README.md | 4 +- packages/app-cli/app/ResourceServer.js | 4 +- packages/app-cli/app/app-gui.js | 30 +++--- packages/app-cli/app/app.js | 30 +++--- packages/app-cli/app/autocompletion.js | 6 +- packages/app-cli/app/base-command.js | 4 +- packages/app-cli/app/build-doc.js | 4 +- packages/app-cli/app/cli-integration-tests.js | 16 +-- packages/app-cli/app/cli-utils.js | 6 +- packages/app-cli/app/command-apidoc.js | 14 +-- packages/app-cli/app/command-attach.js | 6 +- packages/app-cli/app/command-cat.js | 8 +- packages/app-cli/app/command-config.js | 4 +- packages/app-cli/app/command-cp.js | 6 +- packages/app-cli/app/command-done.js | 8 +- packages/app-cli/app/command-dump.js | 6 +- packages/app-cli/app/command-e2ee.js | 14 +-- packages/app-cli/app/command-edit.js | 12 +-- packages/app-cli/app/command-exit.js | 2 +- .../app-cli/app/command-export-sync-status.js | 4 +- packages/app-cli/app/command-export.js | 6 +- packages/app-cli/app/command-geoloc.js | 6 +- packages/app-cli/app/command-help.js | 2 +- packages/app-cli/app/command-import.js | 6 +- packages/app-cli/app/command-ls.js | 12 +-- packages/app-cli/app/command-mkbook.js | 4 +- packages/app-cli/app/command-mknote.js | 4 +- packages/app-cli/app/command-mktodo.js | 4 +- packages/app-cli/app/command-mv.js | 8 +- packages/app-cli/app/command-ren.js | 8 +- packages/app-cli/app/command-rmbook.js | 6 +- packages/app-cli/app/command-rmnote.js | 6 +- packages/app-cli/app/command-search.js | 8 +- packages/app-cli/app/command-server.js | 10 +- packages/app-cli/app/command-set.js | 8 +- packages/app-cli/app/command-status.js | 6 +- packages/app-cli/app/command-sync.js | 16 +-- packages/app-cli/app/command-tag.js | 8 +- packages/app-cli/app/command-todo.js | 8 +- packages/app-cli/app/command-undone.js | 2 +- packages/app-cli/app/command-use.js | 4 +- packages/app-cli/app/command-version.js | 4 +- packages/app-cli/app/fuzzing.js | 10 +- packages/app-cli/app/gui/FolderListWidget.js | 8 +- packages/app-cli/app/gui/NoteListWidget.js | 2 +- .../app-cli/app/gui/NoteMetadataWidget.js | 2 +- packages/app-cli/app/gui/NoteWidget.js | 4 +- packages/app-cli/app/help-utils.js | 6 +- packages/app-cli/app/main.js | 34 +++---- .../app/services/plugins/PluginRunner.ts | 12 +-- packages/app-cli/gulpfile.js | 2 +- packages/app-cli/package-lock.json | 2 +- packages/app-cli/package.json | 6 +- packages/app-cli/tests/ArrayUtils.js | 4 +- packages/app-cli/tests/EnexToHtml.js | 4 +- packages/app-cli/tests/EnexToMd.js | 14 +-- packages/app-cli/tests/HtmlToHtml.js | 16 +-- packages/app-cli/tests/HtmlToMd.js | 16 +-- packages/app-cli/tests/InMemoryCache.ts | 4 +- packages/app-cli/tests/MarkupToHtml.js | 2 +- packages/app-cli/tests/MdToHtml.ts | 8 +- packages/app-cli/tests/MdToMd.js | 4 +- packages/app-cli/tests/StringUtils.js | 2 +- packages/app-cli/tests/TaskQueue.js | 2 +- packages/app-cli/tests/database.js | 14 +-- packages/app-cli/tests/eventManager.js | 2 +- packages/app-cli/tests/feature_NoteHistory.js | 10 +- packages/app-cli/tests/feature_NoteList.js | 10 +- .../app-cli/tests/feature_ShowAllNotes.js | 12 +-- packages/app-cli/tests/feature_TagList.js | 10 +- packages/app-cli/tests/file_api_driver.js | 8 +- packages/app-cli/tests/filterParser.js | 4 +- packages/app-cli/tests/fsDriver.ts | 4 +- packages/app-cli/tests/htmlUtils.js | 2 +- packages/app-cli/tests/markdownUtils.js | 2 +- packages/app-cli/tests/mimeUtils.js | 4 +- packages/app-cli/tests/models_BaseItem.js | 14 +-- packages/app-cli/tests/models_Folder.js | 10 +- packages/app-cli/tests/models_ItemChange.js | 14 +-- packages/app-cli/tests/models_Note.js | 14 +-- .../tests/models_Note_CustomSortOrder.js | 14 +-- packages/app-cli/tests/models_Resource.js | 12 +-- packages/app-cli/tests/models_Revision.js | 16 +-- packages/app-cli/tests/models_Setting.ts | 2 +- packages/app-cli/tests/models_Tag.js | 14 +-- packages/app-cli/tests/pathUtils.js | 2 +- packages/app-cli/tests/reducer.js | 10 +- .../services/plugins/api/JoplinSetting.ts | 2 +- .../tests/services/plugins/sandboxProxy.ts | 2 +- .../app-cli/tests/services_CommandService.ts | 6 +- .../tests/services_EncryptionService.js | 22 ++--- .../app-cli/tests/services_InteropService.ts | 16 +-- .../services_InteropService_Exporter_Md.js | 12 +-- .../app-cli/tests/services_KeymapService.js | 2 +- packages/app-cli/tests/services_KvStore.js | 2 +- .../app-cli/tests/services_PluginService.ts | 12 +-- .../app-cli/tests/services_ResourceService.js | 28 +++--- packages/app-cli/tests/services_Revision.js | 22 ++--- .../app-cli/tests/services_SearchEngine.js | 10 +- .../app-cli/tests/services_SearchFilter.js | 20 ++-- .../app-cli/tests/services_SearchFuzzy.js | 20 ++-- .../app-cli/tests/services_keychainService.ts | 6 +- packages/app-cli/tests/services_rest_Api.ts | 16 +-- .../app-cli/tests/support/syncTargetUtils.js | 14 +-- packages/app-cli/tests/synchronizer.js | 30 +++--- .../app-cli/tests/synchronizer_LockHandler.ts | 2 +- .../tests/synchronizer_MigrationHandler.ts | 10 +- packages/app-cli/tests/test-utils.js | 98 +++++++++---------- packages/app-cli/tests/timeUtils.js | 4 +- packages/app-cli/tests/urlUtils.js | 2 +- packages/app-clipper/package.json | 2 +- packages/app-desktop/ElectronAppWrapper.ts | 6 +- packages/app-desktop/InteropServiceHelper.ts | 18 ++-- packages/app-desktop/README.md | 4 +- packages/app-desktop/app.ts | 66 ++++++------- packages/app-desktop/bridge.ts | 6 +- packages/app-desktop/checkForUpdates.js | 8 +- .../app-desktop/commands/copyDevCommand.ts | 4 +- packages/app-desktop/commands/focusElement.ts | 2 +- .../commands/openProfileDirectory.ts | 6 +- .../commands/startExternalEditing.ts | 10 +- .../commands/stopExternalEditing.ts | 8 +- .../commands/toggleExternalEditing.ts | 6 +- .../app-desktop/gui/ClipperConfigScreen.jsx | 8 +- .../gui/ConfigScreen/ButtonBar.tsx | 2 +- .../gui/ConfigScreen/ConfigScreen.tsx | 12 +-- .../app-desktop/gui/ConfigScreen/SideBar.tsx | 2 +- packages/app-desktop/gui/DialogButtonRow.jsx | 4 +- .../app-desktop/gui/DropboxLoginScreen.tsx | 6 +- .../gui/EncryptionConfigScreen.jsx | 14 +-- packages/app-desktop/gui/ErrorBoundary.tsx | 2 +- packages/app-desktop/gui/ExtensionBadge.jsx | 2 +- packages/app-desktop/gui/HelpButton.jsx | 2 +- packages/app-desktop/gui/IconButton.jsx | 2 +- packages/app-desktop/gui/ImportScreen.jsx | 10 +- .../gui/KeymapConfig/KeymapConfigScreen.tsx | 6 +- .../gui/KeymapConfig/ShortcutRecorder.tsx | 4 +- .../gui/KeymapConfig/styles/index.ts | 2 +- .../gui/KeymapConfig/utils/getLabel.ts | 6 +- .../KeymapConfig/utils/useCommandStatus.ts | 2 +- .../gui/KeymapConfig/utils/useKeymap.ts | 2 +- .../app-desktop/gui/MainScreen/MainScreen.tsx | 24 ++--- .../gui/MainScreen/commands/editAlarm.ts | 12 +-- .../gui/MainScreen/commands/exportPdf.ts | 8 +- .../MainScreen/commands/hideModalMessage.ts | 2 +- .../gui/MainScreen/commands/moveToFolder.ts | 8 +- .../gui/MainScreen/commands/newFolder.ts | 6 +- .../gui/MainScreen/commands/newNote.ts | 10 +- .../gui/MainScreen/commands/newSubFolder.ts | 4 +- .../gui/MainScreen/commands/newTodo.ts | 4 +- .../gui/MainScreen/commands/openFolder.ts | 2 +- .../gui/MainScreen/commands/openNote.ts | 6 +- .../gui/MainScreen/commands/openTag.ts | 2 +- .../gui/MainScreen/commands/print.ts | 4 +- .../gui/MainScreen/commands/renameFolder.ts | 6 +- .../gui/MainScreen/commands/renameTag.ts | 6 +- .../gui/MainScreen/commands/search.ts | 6 +- .../gui/MainScreen/commands/selectTemplate.ts | 6 +- .../gui/MainScreen/commands/setTags.ts | 6 +- .../MainScreen/commands/showModalMessage.tsx | 2 +- .../commands/showNoteContentProperties.ts | 8 +- .../MainScreen/commands/showNoteProperties.ts | 6 +- .../commands/showShareNoteDialog.ts | 4 +- .../gui/MainScreen/commands/toggleEditors.ts | 8 +- .../gui/MainScreen/commands/toggleNoteList.ts | 4 +- .../gui/MainScreen/commands/toggleSideBar.ts | 4 +- .../MainScreen/commands/toggleVisiblePanes.ts | 4 +- packages/app-desktop/gui/MenuBar.tsx | 34 +++---- packages/app-desktop/gui/MultiNoteActions.tsx | 4 +- packages/app-desktop/gui/Navigator.jsx | 2 +- .../gui/NoteContentPropertiesDialog.tsx | 6 +- .../NoteBody/CodeMirror/CodeMirror.tsx | 16 +-- .../NoteEditor/NoteBody/CodeMirror/Editor.tsx | 4 +- .../NoteBody/CodeMirror/Toolbar.tsx | 10 +- .../NoteBody/CodeMirror/styles/index.ts | 2 +- .../NoteBody/CodeMirror/utils/index.ts | 2 +- .../CodeMirror/utils/useEditorSearch.ts | 2 +- .../CodeMirror/utils/useJoplinMode.ts | 2 +- .../NoteBody/CodeMirror/utils/useKeymap.ts | 4 +- .../NoteBody/CodeMirror/utils/useListIdent.ts | 2 +- .../NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx | 18 ++-- .../NoteBody/TinyMCE/styles/index.ts | 2 +- .../TinyMCE/utils/setupContextMenu.ts | 4 +- .../NoteBody/TinyMCE/utils/useScroll.ts | 2 +- .../app-desktop/gui/NoteEditor/NoteEditor.tsx | 26 ++--- .../gui/NoteEditor/NoteTitle/NoteTitleBar.tsx | 8 +- .../commands/editorCommandDeclarations.ts | 4 +- .../commands/focusElementNoteBody.ts | 4 +- .../commands/focusElementNoteTitle.ts | 4 +- .../NoteEditor/commands/showLocalSearch.ts | 4 +- .../gui/NoteEditor/commands/showRevisions.ts | 2 +- .../gui/NoteEditor/styles/index.ts | 2 +- .../gui/NoteEditor/utils/contextMenu.ts | 8 +- .../app-desktop/gui/NoteEditor/utils/index.ts | 6 +- .../gui/NoteEditor/utils/resourceHandling.ts | 18 ++-- .../app-desktop/gui/NoteEditor/utils/types.ts | 6 +- .../gui/NoteEditor/utils/useDropHandler.ts | 2 +- .../gui/NoteEditor/utils/useFolder.ts | 2 +- .../gui/NoteEditor/utils/useFormNote.ts | 18 ++-- .../gui/NoteEditor/utils/useMarkupToHtml.ts | 12 +-- .../gui/NoteEditor/utils/useMessageHandler.ts | 18 ++-- .../utils/useWindowCommandHandler.ts | 6 +- .../app-desktop/gui/NoteList/NoteList.tsx | 18 ++-- .../NoteList/commands/focusElementNoteList.ts | 6 +- .../gui/NoteListControls/NoteListControls.tsx | 2 +- .../NoteListControls/commands/focusSearch.ts | 4 +- packages/app-desktop/gui/NoteListItem.tsx | 8 +- .../app-desktop/gui/NotePropertiesDialog.jsx | 10 +- .../app-desktop/gui/NoteRevisionViewer.jsx | 24 ++--- packages/app-desktop/gui/NoteSearchBar.jsx | 4 +- packages/app-desktop/gui/NoteStatusBar.jsx | 4 +- packages/app-desktop/gui/NoteTextViewer.tsx | 2 +- .../gui/NoteToolbar/NoteToolbar.tsx | 10 +- .../app-desktop/gui/OneDriveLoginScreen.tsx | 10 +- packages/app-desktop/gui/PromptDialog.jsx | 6 +- packages/app-desktop/gui/ResourceScreen.tsx | 6 +- packages/app-desktop/gui/Root.tsx | 10 +- .../gui/Root_UpgradeSyncTarget.tsx | 4 +- .../app-desktop/gui/SearchBar/SearchBar.tsx | 4 +- .../gui/SearchBar/hooks/useSearch.ts | 2 +- packages/app-desktop/gui/ShareNoteDialog.tsx | 14 +-- packages/app-desktop/gui/SideBar/SideBar.tsx | 28 +++--- .../SideBar/commands/focusElementSideBar.ts | 4 +- .../gui/StatusScreen/StatusScreen.tsx | 8 +- packages/app-desktop/gui/TagItem.jsx | 2 +- packages/app-desktop/gui/TagList.tsx | 2 +- .../ToggleEditorsButton.tsx | 2 +- .../gui/ToggleEditorsButton/styles/index.ts | 2 +- packages/app-desktop/gui/ToolbarBase.tsx | 2 +- .../gui/ToolbarButton/ToolbarButton.tsx | 2 +- packages/app-desktop/gui/ToolbarSpace.jsx | 2 +- .../app-desktop/gui/style/ConfigMenuBar.js | 2 +- .../app-desktop/gui/style/ExtensionBadge.js | 2 +- .../app-desktop/gui/utils/NoteListUtils.ts | 20 ++-- packages/app-desktop/gulpfile.js | 10 +- packages/app-desktop/main-html.js | 30 +++--- packages/app-desktop/main.js | 6 +- packages/app-desktop/package-lock.json | 2 +- packages/app-desktop/package.json | 8 +- packages/app-desktop/plugins/GotoAnything.tsx | 26 ++--- .../plugins/PlatformImplementation.ts | 2 +- .../services/plugins/PluginRunner.ts | 14 +-- .../services/plugins/UserWebviewDialog.tsx | 6 +- .../plugins/UserWebviewDialogButtonBar.tsx | 4 +- .../services/plugins/hooks/useThemeCss.ts | 8 +- .../services/plugins/plugin_index.js | 2 +- .../SpellCheckerServiceDriverNative.ts | 2 +- packages/app-desktop/tools/compileScripts.js | 2 +- .../app-desktop/tools/copyPluginAssets.js | 4 +- .../app-desktop/tools/copyTinyMceLangs.js | 2 +- .../MarkdownEditor/MarkdownEditor.js | 2 +- .../MarkdownEditor/applyListFormat.js | 2 +- .../MarkdownEditor/applyWebLinkFormat.js | 2 +- .../MarkdownEditor/applyWrapFormat.js | 2 +- .../MarkdownEditor/applyWrapFormatNewLines.js | 2 +- packages/app-mobile/PluginAssetsLoader.ts | 8 +- packages/app-mobile/components/CameraView.tsx | 6 +- packages/app-mobile/components/ModalDialog.js | 2 +- .../NoteBodyViewer/NoteBodyViewer.tsx | 4 +- .../NoteBodyViewer/hooks/useOnMessage.ts | 2 +- .../hooks/useOnResourceLongPress.ts | 10 +- .../NoteBodyViewer/hooks/useSource.ts | 8 +- .../components/SelectDateTimeDialog.tsx | 6 +- .../app-mobile/components/action-button.js | 4 +- .../app-mobile/components/global-style.js | 4 +- packages/app-mobile/components/note-item.js | 4 +- packages/app-mobile/components/note-list.js | 4 +- .../app-mobile/components/screen-header.js | 10 +- .../app-mobile/components/screens/Note.tsx | 40 ++++---- .../components/screens/NoteTagsDialog.js | 4 +- .../screens/UpgradeSyncTargetScreen.tsx | 4 +- .../app-mobile/components/screens/config.js | 20 ++-- .../components/screens/dropbox-login.js | 4 +- .../components/screens/encryption-config.js | 8 +- .../app-mobile/components/screens/folder.js | 6 +- packages/app-mobile/components/screens/log.js | 8 +- .../app-mobile/components/screens/notes.js | 12 +-- .../components/screens/onedrive-login.js | 8 +- .../app-mobile/components/screens/search.js | 8 +- .../app-mobile/components/screens/status.js | 6 +- .../app-mobile/components/screens/tags.js | 4 +- .../components/side-menu-content.js | 10 +- packages/app-mobile/gulpfile.js | 2 +- packages/app-mobile/metro.config.js | 8 +- packages/app-mobile/package-lock.json | 2 +- packages/app-mobile/package.json | 8 +- packages/app-mobile/root.js | 96 +++++++++--------- .../services/AlarmServiceDriver.android.ts | 4 +- .../services/AlarmServiceDriver.ios.ts | 4 +- packages/app-mobile/setUpQuickActions.ts | 6 +- .../tools/buildReactNativeInjectedJs.js | 2 +- packages/app-mobile/tools/encodeAssets.js | 4 +- packages/app-mobile/tools/prepareRelease.js | 6 +- packages/app-mobile/utils/fs-driver-rn.js | 2 +- .../app-mobile/utils/geolocation-react.js | 2 +- packages/app-mobile/utils/shareHandler.ts | 4 +- packages/app-mobile/utils/shim-init-react.js | 16 +-- packages/fork-htmlparser2/package-lock.json | 2 +- packages/fork-htmlparser2/package.json | 2 +- packages/fork-sax/package-lock.json | 2 +- packages/fork-sax/package.json | 2 +- packages/lib/README.md | 2 +- packages/lib/htmlUtils.js | 2 +- packages/lib/import-enex-html-gen.js | 2 +- packages/lib/import-enex-md-gen.js | 2 +- packages/lib/import-enex.js | 4 +- packages/lib/markdownUtils.ts | 2 +- packages/lib/markupLanguageUtils.ts | 2 +- packages/lib/models/Note.js | 2 +- packages/lib/package-lock.json | 2 +- packages/lib/package.json | 8 +- .../commands/stateToWhenClauseContext.ts | 2 +- .../interop/InteropService_Exporter_Html.ts | 2 +- .../interop/InteropService_Importer_Md.ts | 2 +- .../utils/contentScriptsToRendererRules.ts | 2 +- packages/lib/services/rest/routes/notes.ts | 2 +- packages/renderer/HtmlToHtml.js | 4 +- packages/renderer/htmlUtils.js | 4 +- packages/renderer/package-lock.json | 2 +- packages/renderer/package.json | 4 +- packages/tools/README.md | 2 +- packages/tools/build-release-stats.js | 4 +- packages/tools/build-translation.js | 4 +- packages/tools/build-welcome.js | 4 +- packages/tools/fetchPatreonPosts.js | 16 +-- packages/tools/generate-images.js | 2 +- packages/tools/package-lock.json | 2 +- packages/tools/package.json | 4 +- packages/tools/update-readme-download.js | 2 +- 330 files changed, 1284 insertions(+), 1284 deletions(-) diff --git a/BUILD.md b/BUILD.md index bf0014f64..6c6937004 100644 --- a/BUILD.md +++ b/BUILD.md @@ -85,7 +85,7 @@ You can specify additional parameters when running the desktop or CLI applicatio Since Joplin uses Lerna, adding a new dependency should not be done using `npm i -s ...`. Instead you should use the `lerna add` command, which will take care of adding the package while handling the linked packages correctly. For example, to add the package "leftpad" to the "app-desktop" sub-package, you would run: - npx lerna add leftpad --scope=@joplinapp/app-desktop + npx lerna add leftpad --scope=@joplin/app-desktop Note that you should most likely always specify a scope because otherwise it will add the package to all the sub-packages. diff --git a/packages/app-cli/README.md b/packages/app-cli/README.md index 5ad559199..f168109fe 100644 --- a/packages/app-cli/README.md +++ b/packages/app-cli/README.md @@ -1,11 +1,11 @@ -# `@joplinapp/cli` +# `@joplin/cli` > TODO: description ## Usage ``` -const cli = require('@joplinapp/cli'); +const cli = require('@joplin/cli'); // TODO: DEMONSTRATE API ``` diff --git a/packages/app-cli/app/ResourceServer.js b/packages/app-cli/app/ResourceServer.js index 297994e0d..90eb7ad11 100644 --- a/packages/app-cli/app/ResourceServer.js +++ b/packages/app-cli/app/ResourceServer.js @@ -1,5 +1,5 @@ -const Logger = require('@joplinapp/lib/Logger').default; -const { netUtils } = require('@joplinapp/lib/net-utils.js'); +const Logger = require('@joplin/lib/Logger').default; +const { netUtils } = require('@joplin/lib/net-utils.js'); const http = require('http'); const urlParser = require('url'); diff --git a/packages/app-cli/app/app-gui.js b/packages/app-cli/app/app-gui.js index cbf8b5669..91af6d618 100644 --- a/packages/app-cli/app/app-gui.js +++ b/packages/app-cli/app/app-gui.js @@ -1,17 +1,17 @@ -const Logger = require('@joplinapp/lib/Logger').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const reducer = require('@joplinapp/lib/reducer').default; -const { defaultState } = require('@joplinapp/lib/reducer'); -const { splitCommandString } = require('@joplinapp/lib/string-utils.js'); -const { reg } = require('@joplinapp/lib/registry.js'); -const { _ } = require('@joplinapp/lib/locale'); -const shim = require('@joplinapp/lib/shim').default; +const Logger = require('@joplin/lib/Logger').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Note = require('@joplin/lib/models/Note.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const reducer = require('@joplin/lib/reducer').default; +const { defaultState } = require('@joplin/lib/reducer'); +const { splitCommandString } = require('@joplin/lib/string-utils.js'); +const { reg } = require('@joplin/lib/registry.js'); +const { _ } = require('@joplin/lib/locale'); +const shim = require('@joplin/lib/shim').default; const Entities = require('html-entities').AllHtmlEntities; const htmlentities = new Entities().encode; @@ -19,7 +19,7 @@ const chalk = require('chalk'); const tk = require('terminal-kit'); const TermWrapper = require('tkwidgets/framework/TermWrapper.js'); const Renderer = require('tkwidgets/framework/Renderer.js'); -const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker'); +const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker'); const BaseWidget = require('tkwidgets/BaseWidget.js'); const TextWidget = require('tkwidgets/TextWidget.js'); diff --git a/packages/app-cli/app/app.js b/packages/app-cli/app/app.js index 5a70afd46..946572d36 100644 --- a/packages/app-cli/app/app.js +++ b/packages/app-cli/app/app.js @@ -1,20 +1,20 @@ -const BaseApplication = require('@joplinapp/lib/BaseApplication').default; -const { FoldersScreenUtils } = require('@joplinapp/lib/folders-screen-utils.js'); -const ResourceService = require('@joplinapp/lib/services/ResourceService'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { reg } = require('@joplinapp/lib/registry.js'); -const { fileExtension } = require('@joplinapp/lib/path-utils'); -const { _ } = require('@joplinapp/lib/locale'); +const BaseApplication = require('@joplin/lib/BaseApplication').default; +const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js'); +const ResourceService = require('@joplin/lib/services/ResourceService'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const { reg } = require('@joplin/lib/registry.js'); +const { fileExtension } = require('@joplin/lib/path-utils'); +const { _ } = require('@joplin/lib/locale'); const fs = require('fs-extra'); const { cliUtils } = require('./cli-utils.js'); -const Cache = require('@joplinapp/lib/Cache'); -const RevisionService = require('@joplinapp/lib/services/RevisionService'); -const shim = require('@joplinapp/lib/shim').default; +const Cache = require('@joplin/lib/Cache'); +const RevisionService = require('@joplin/lib/services/RevisionService'); +const shim = require('@joplin/lib/shim').default; class Application extends BaseApplication { constructor() { diff --git a/packages/app-cli/app/autocompletion.js b/packages/app-cli/app/autocompletion.js index 4e6b2d09f..eb255480f 100644 --- a/packages/app-cli/app/autocompletion.js +++ b/packages/app-cli/app/autocompletion.js @@ -1,7 +1,7 @@ const { app } = require('./app.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Tag = require('@joplin/lib/models/Tag.js'); const { cliUtils } = require('./cli-utils.js'); const yargParser = require('yargs-parser'); const fs = require('fs-extra'); diff --git a/packages/app-cli/app/base-command.js b/packages/app-cli/app/base-command.js index ee10c7739..63cf4f1c1 100644 --- a/packages/app-cli/app/base-command.js +++ b/packages/app-cli/app/base-command.js @@ -1,5 +1,5 @@ -const { _ } = require('@joplinapp/lib/locale'); -const { reg } = require('@joplinapp/lib/registry.js'); +const { _ } = require('@joplin/lib/locale'); +const { reg } = require('@joplin/lib/registry.js'); class BaseCommand { constructor() { diff --git a/packages/app-cli/app/build-doc.js b/packages/app-cli/app/build-doc.js index 064fa3639..bcc0a84d9 100644 --- a/packages/app-cli/app/build-doc.js +++ b/packages/app-cli/app/build-doc.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); -const { fileExtension, dirname } = require('@joplinapp/lib/path-utils'); +const { fileExtension, dirname } = require('@joplin/lib/path-utils'); const wrap_ = require('word-wrap'); -const { languageCode } = require('@joplinapp/lib/locale'); +const { languageCode } = require('@joplin/lib/locale'); const rootDir = dirname(dirname(__dirname)); const MAX_WIDTH = 78; diff --git a/packages/app-cli/app/cli-integration-tests.js b/packages/app-cli/app/cli-integration-tests.js index 02661abfb..81c93e97c 100644 --- a/packages/app-cli/app/cli-integration-tests.js +++ b/packages/app-cli/app/cli-integration-tests.js @@ -1,14 +1,14 @@ 'use strict'; const fs = require('fs-extra'); -const Logger = require('@joplinapp/lib/Logger').default; -const { dirname } = require('@joplinapp/lib/path-utils'); -const { DatabaseDriverNode } = require('@joplinapp/lib/database-driver-node.js'); -const { JoplinDatabase } = require('@joplinapp/lib/joplin-database.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Logger = require('@joplin/lib/Logger').default; +const { dirname } = require('@joplin/lib/path-utils'); +const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js'); +const { JoplinDatabase } = require('@joplin/lib/joplin-database.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Setting = require('@joplin/lib/models/Setting').default; const { sprintf } = require('sprintf-js'); const exec = require('child_process').exec; diff --git a/packages/app-cli/app/cli-utils.js b/packages/app-cli/app/cli-utils.js index dbac772eb..e19ca6d7a 100644 --- a/packages/app-cli/app/cli-utils.js +++ b/packages/app-cli/app/cli-utils.js @@ -1,8 +1,8 @@ const yargParser = require('yargs-parser'); -const { _ } = require('@joplinapp/lib/locale'); -const time = require('@joplinapp/lib/time').default; +const { _ } = require('@joplin/lib/locale'); +const time = require('@joplin/lib/time').default; const stringPadding = require('string-padding'); -const Logger = require('@joplinapp/lib/Logger').default; +const Logger = require('@joplin/lib/Logger').default; const cliUtils = {}; diff --git a/packages/app-cli/app/command-apidoc.js b/packages/app-cli/app/command-apidoc.js index 360c7cf8f..876f8e049 100644 --- a/packages/app-cli/app/command-apidoc.js +++ b/packages/app-cli/app/command-apidoc.js @@ -1,11 +1,11 @@ const { BaseCommand } = require('./base-command.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const { toTitleCase } = require('@joplinapp/lib/string-utils.js'); -const { reg } = require('@joplinapp/lib/registry.js'); -const markdownUtils = require('@joplinapp/lib/markdownUtils').default; -const { Database } = require('@joplinapp/lib/database.js'); -const shim = require('@joplinapp/lib/shim').default; +const BaseItem = require('@joplin/lib/models/BaseItem'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const { toTitleCase } = require('@joplin/lib/string-utils.js'); +const { reg } = require('@joplin/lib/registry.js'); +const markdownUtils = require('@joplin/lib/markdownUtils').default; +const { Database } = require('@joplin/lib/database.js'); +const shim = require('@joplin/lib/shim').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-attach.js b/packages/app-cli/app/command-attach.js index 8e6a18088..8cc621305 100644 --- a/packages/app-cli/app/command-attach.js +++ b/packages/app-cli/app/command-attach.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-cat.js b/packages/app-cli/app/command-cat.js index 3f36c8dc0..1ce8ba806 100644 --- a/packages/app-cli/app/command-cat.js +++ b/packages/app-cli/app/command-cat.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-config.js b/packages/app-cli/app/command-config.js index e53522569..e16379f6a 100644 --- a/packages/app-cli/app/command-config.js +++ b/packages/app-cli/app/command-config.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); -const { _, setLocale } = require('@joplinapp/lib/locale'); +const { _, setLocale } = require('@joplin/lib/locale'); const { app } = require('./app.js'); const fs = require('fs-extra'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-cp.js b/packages/app-cli/app/command-cp.js index fb2922ec2..72e253cc5 100644 --- a/packages/app-cli/app/command-cp.js +++ b/packages/app-cli/app/command-cp.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-done.js b/packages/app-cli/app/command-done.js index 91e3e5b77..16b8ad180 100644 --- a/packages/app-cli/app/command-done.js +++ b/packages/app-cli/app/command-done.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const time = require('@joplinapp/lib/time').default; +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Note = require('@joplin/lib/models/Note.js'); +const time = require('@joplin/lib/time').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-dump.js b/packages/app-cli/app/command-dump.js index c720b05be..0f1a72264 100644 --- a/packages/app-cli/app/command-dump.js +++ b/packages/app-cli/app/command-dump.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-e2ee.js b/packages/app-cli/app/command-e2ee.js index 8d96926ef..d566690bb 100644 --- a/packages/app-cli/app/command-e2ee.js +++ b/packages/app-cli/app/command-e2ee.js @@ -1,11 +1,11 @@ const { BaseCommand } = require('./base-command.js'); -const { _ } = require('@joplinapp/lib/locale'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); -const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker'); -const BaseItem = require('@joplinapp/lib/models/BaseItem'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const shim = require('@joplinapp/lib/shim').default; -const pathUtils = require('@joplinapp/lib/path-utils'); +const { _ } = require('@joplin/lib/locale'); +const EncryptionService = require('@joplin/lib/services/EncryptionService'); +const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker'); +const BaseItem = require('@joplin/lib/models/BaseItem'); +const Setting = require('@joplin/lib/models/Setting').default; +const shim = require('@joplin/lib/shim').default; +const pathUtils = require('@joplin/lib/path-utils'); const imageType = require('image-type'); const readChunk = require('read-chunk'); diff --git a/packages/app-cli/app/command-edit.js b/packages/app-cli/app/command-edit.js index df58f8437..d2807bf5e 100644 --- a/packages/app-cli/app/command-edit.js +++ b/packages/app-cli/app/command-edit.js @@ -1,12 +1,12 @@ const fs = require('fs-extra'); const { BaseCommand } = require('./base-command.js'); -const { splitCommandString } = require('@joplinapp/lib/string-utils.js'); -const uuid = require('@joplinapp/lib/uuid').default; +const { splitCommandString } = require('@joplin/lib/string-utils.js'); +const uuid = require('@joplin/lib/uuid').default; const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const { _ } = require('@joplin/lib/locale'); +const Note = require('@joplin/lib/models/Note.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const BaseModel = require('@joplin/lib/BaseModel').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-exit.js b/packages/app-cli/app/command-exit.js index c2e98087c..8c7d2ebda 100644 --- a/packages/app-cli/app/command-exit.js +++ b/packages/app-cli/app/command-exit.js @@ -1,6 +1,6 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-export-sync-status.js b/packages/app-cli/app/command-export-sync-status.js index b459010f0..44f258bfc 100644 --- a/packages/app-cli/app/command-export-sync-status.js +++ b/packages/app-cli/app/command-export-sync-status.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { ReportService } = require('@joplinapp/lib/services/report.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const { ReportService } = require('@joplin/lib/services/report.js'); const fs = require('fs-extra'); class Command extends BaseCommand { diff --git a/packages/app-cli/app/command-export.js b/packages/app-cli/app/command-export.js index 39552f779..16fc37f3f 100644 --- a/packages/app-cli/app/command-export.js +++ b/packages/app-cli/app/command-export.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); -const InteropService = require('@joplinapp/lib/services/interop/InteropService').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const InteropService = require('@joplin/lib/services/interop/InteropService').default; +const BaseModel = require('@joplin/lib/BaseModel').default; const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-geoloc.js b/packages/app-cli/app/command-geoloc.js index a92f96468..e97000124 100644 --- a/packages/app-cli/app/command-geoloc.js +++ b/packages/app-cli/app/command-geoloc.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-help.js b/packages/app-cli/app/command-help.js index 96134d9e1..258b7321d 100644 --- a/packages/app-cli/app/command-help.js +++ b/packages/app-cli/app/command-help.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); const { renderCommandHelp } = require('./help-utils.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { cliUtils } = require('./cli-utils.js'); class Command extends BaseCommand { diff --git a/packages/app-cli/app/command-import.js b/packages/app-cli/app/command-import.js index f42592d85..24834f77f 100644 --- a/packages/app-cli/app/command-import.js +++ b/packages/app-cli/app/command-import.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); -const InteropService = require('@joplinapp/lib/services/interop/InteropService').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const InteropService = require('@joplin/lib/services/interop/InteropService').default; +const BaseModel = require('@joplin/lib/BaseModel').default; const { cliUtils } = require('./cli-utils.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-ls.js b/packages/app-cli/app/command-ls.js index 111a51751..d7dd75f6a 100644 --- a/packages/app-cli/app/command-ls.js +++ b/packages/app-cli/app/command-ls.js @@ -1,12 +1,12 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note.js'); const { sprintf } = require('sprintf-js'); -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { cliUtils } = require('./cli-utils.js'); class Command extends BaseCommand { diff --git a/packages/app-cli/app/command-mkbook.js b/packages/app-cli/app/command-mkbook.js index 56351f628..790822cc7 100644 --- a/packages/app-cli/app/command-mkbook.js +++ b/packages/app-cli/app/command-mkbook.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Folder = require('@joplinapp/lib/models/Folder.js'); +const { _ } = require('@joplin/lib/locale'); +const Folder = require('@joplin/lib/models/Folder.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-mknote.js b/packages/app-cli/app/command-mknote.js index a96e47a03..496693de1 100644 --- a/packages/app-cli/app/command-mknote.js +++ b/packages/app-cli/app/command-mknote.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-mktodo.js b/packages/app-cli/app/command-mktodo.js index 4f402a2cd..fc010b6c4 100644 --- a/packages/app-cli/app/command-mktodo.js +++ b/packages/app-cli/app/command-mktodo.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-mv.js b/packages/app-cli/app/command-mv.js index b94b12199..4bbd42f14 100644 --- a/packages/app-cli/app/command-mv.js +++ b/packages/app-cli/app/command-mv.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-ren.js b/packages/app-cli/app/command-ren.js index 147afc53f..87beee797 100644 --- a/packages/app-cli/app/command-ren.js +++ b/packages/app-cli/app/command-ren.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-rmbook.js b/packages/app-cli/app/command-rmbook.js index ac4fd1029..9ac7a02b4 100644 --- a/packages/app-cli/app/command-rmbook.js +++ b/packages/app-cli/app/command-rmbook.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const { _ } = require('@joplin/lib/locale'); +const Folder = require('@joplin/lib/models/Folder.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-rmnote.js b/packages/app-cli/app/command-rmnote.js index b34bedcdf..803a6eecb 100644 --- a/packages/app-cli/app/command-rmnote.js +++ b/packages/app-cli/app/command-rmnote.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const { _ } = require('@joplin/lib/locale'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-search.js b/packages/app-cli/app/command-search.js index af7af20b3..69be13be0 100644 --- a/packages/app-cli/app/command-search.js +++ b/packages/app-cli/app/command-search.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const uuid = require('@joplinapp/lib/uuid').default; +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const uuid = require('@joplin/lib/uuid').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-server.js b/packages/app-cli/app/command-server.js index bf023095b..93635cede 100644 --- a/packages/app-cli/app/command-server.js +++ b/packages/app-cli/app/command-server.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Logger = require('@joplinapp/lib/Logger').default; -const shim = require('@joplinapp/lib/shim').default; +const { _ } = require('@joplin/lib/locale'); +const Setting = require('@joplin/lib/models/Setting').default; +const Logger = require('@joplin/lib/Logger').default; +const shim = require('@joplin/lib/shim').default; class Command extends BaseCommand { @@ -17,7 +17,7 @@ class Command extends BaseCommand { async action(args) { const command = args.command; - const ClipperServer = require('@joplinapp/lib/ClipperServer'); + const ClipperServer = require('@joplin/lib/ClipperServer'); ClipperServer.instance().initialize(); const stdoutFn = (...s) => this.stdout(s.join(' ')); const clipperLogger = new Logger(); diff --git a/packages/app-cli/app/command-set.js b/packages/app-cli/app/command-set.js index 0da6c8211..976b7258e 100644 --- a/packages/app-cli/app/command-set.js +++ b/packages/app-cli/app/command-set.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const { Database } = require('@joplinapp/lib/database.js'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const { Database } = require('@joplin/lib/database.js'); +const Note = require('@joplin/lib/models/Note.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-status.js b/packages/app-cli/app/command-status.js index ea67932b9..f40e2dd72 100644 --- a/packages/app-cli/app/command-status.js +++ b/packages/app-cli/app/command-status.js @@ -1,8 +1,8 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { _ } = require('@joplinapp/lib/locale'); -const { ReportService } = require('@joplinapp/lib/services/report.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const { _ } = require('@joplin/lib/locale'); +const { ReportService } = require('@joplin/lib/services/report.js'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-sync.js b/packages/app-cli/app/command-sync.js index c940531de..2a97ae4fb 100644 --- a/packages/app-cli/app/command-sync.js +++ b/packages/app-cli/app/command-sync.js @@ -1,17 +1,17 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const { OneDriveApiNodeUtils } = require('@joplinapp/lib/onedrive-api-node-utils.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher'); -const Synchronizer = require('@joplinapp/lib/Synchronizer').default; -const { reg } = require('@joplinapp/lib/registry.js'); +const { _ } = require('@joplin/lib/locale'); +const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher'); +const Synchronizer = require('@joplin/lib/Synchronizer').default; +const { reg } = require('@joplin/lib/registry.js'); const { cliUtils } = require('./cli-utils.js'); const md5 = require('md5'); const locker = require('proper-lockfile'); const fs = require('fs-extra'); -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry'); -const MigrationHandler = require('@joplinapp/lib/services/synchronizer/MigrationHandler').default; +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry'); +const MigrationHandler = require('@joplin/lib/services/synchronizer/MigrationHandler').default; class Command extends BaseCommand { constructor() { diff --git a/packages/app-cli/app/command-tag.js b/packages/app-cli/app/command-tag.js index 44f6ac7bd..1a5b1c807 100644 --- a/packages/app-cli/app/command-tag.js +++ b/packages/app-cli/app/command-tag.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const time = require('@joplinapp/lib/time').default; +const { _ } = require('@joplin/lib/locale'); +const Tag = require('@joplin/lib/models/Tag.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const time = require('@joplin/lib/time').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-todo.js b/packages/app-cli/app/command-todo.js index 106e18549..cf3793bdd 100644 --- a/packages/app-cli/app/command-todo.js +++ b/packages/app-cli/app/command-todo.js @@ -1,9 +1,9 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const time = require('@joplinapp/lib/time').default; +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Note = require('@joplin/lib/models/Note.js'); +const time = require('@joplin/lib/time').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-undone.js b/packages/app-cli/app/command-undone.js index 69ced7cb4..aa28cdd67 100644 --- a/packages/app-cli/app/command-undone.js +++ b/packages/app-cli/app/command-undone.js @@ -1,5 +1,5 @@ const { BaseCommand } = require('./base-command.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const CommandDone = require('./command-done.js'); diff --git a/packages/app-cli/app/command-use.js b/packages/app-cli/app/command-use.js index 4ed0a7a0a..9a699aa7b 100644 --- a/packages/app-cli/app/command-use.js +++ b/packages/app-cli/app/command-use.js @@ -1,7 +1,7 @@ const { BaseCommand } = require('./base-command.js'); const { app } = require('./app.js'); -const { _ } = require('@joplinapp/lib/locale'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const { _ } = require('@joplin/lib/locale'); +const BaseModel = require('@joplin/lib/BaseModel').default; class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/command-version.js b/packages/app-cli/app/command-version.js index 061a285a1..7f5d3df1d 100644 --- a/packages/app-cli/app/command-version.js +++ b/packages/app-cli/app/command-version.js @@ -1,6 +1,6 @@ const { BaseCommand } = require('./base-command.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { _ } = require('@joplinapp/lib/locale'); +const Setting = require('@joplin/lib/models/Setting').default; +const { _ } = require('@joplin/lib/locale'); class Command extends BaseCommand { usage() { diff --git a/packages/app-cli/app/fuzzing.js b/packages/app-cli/app/fuzzing.js index c81eac786..ed998f40e 100644 --- a/packages/app-cli/app/fuzzing.js +++ b/packages/app-cli/app/fuzzing.js @@ -1,10 +1,10 @@ 'use strict'; -const time = require('@joplinapp/lib/time').default; -const Logger = require('@joplinapp/lib/Logger').default; -const Resource = require('@joplinapp/lib/models/Resource.js'); -const { dirname } = require('@joplinapp/lib/path-utils'); -const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default; +const time = require('@joplin/lib/time').default; +const Logger = require('@joplin/lib/Logger').default; +const Resource = require('@joplin/lib/models/Resource.js'); +const { dirname } = require('@joplin/lib/path-utils'); +const FsDriverNode = require('@joplin/lib/fs-driver-node').default; const lodash = require('lodash'); const exec = require('child_process').exec; const fs = require('fs-extra'); diff --git a/packages/app-cli/app/gui/FolderListWidget.js b/packages/app-cli/app/gui/FolderListWidget.js index 5ee4f44f2..6e0e8276a 100644 --- a/packages/app-cli/app/gui/FolderListWidget.js +++ b/packages/app-cli/app/gui/FolderListWidget.js @@ -1,8 +1,8 @@ -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; const ListWidget = require('tkwidgets/ListWidget.js'); -const _ = require('@joplinapp/lib/locale')._; +const _ = require('@joplin/lib/locale')._; class FolderListWidget extends ListWidget { constructor() { diff --git a/packages/app-cli/app/gui/NoteListWidget.js b/packages/app-cli/app/gui/NoteListWidget.js index d1310e978..62d9cf444 100644 --- a/packages/app-cli/app/gui/NoteListWidget.js +++ b/packages/app-cli/app/gui/NoteListWidget.js @@ -1,4 +1,4 @@ -const Note = require('@joplinapp/lib/models/Note.js'); +const Note = require('@joplin/lib/models/Note.js'); const ListWidget = require('tkwidgets/ListWidget.js'); class NoteListWidget extends ListWidget { diff --git a/packages/app-cli/app/gui/NoteMetadataWidget.js b/packages/app-cli/app/gui/NoteMetadataWidget.js index efb5d5633..29d44e340 100644 --- a/packages/app-cli/app/gui/NoteMetadataWidget.js +++ b/packages/app-cli/app/gui/NoteMetadataWidget.js @@ -1,4 +1,4 @@ -const Note = require('@joplinapp/lib/models/Note.js'); +const Note = require('@joplin/lib/models/Note.js'); const TextWidget = require('tkwidgets/TextWidget.js'); class NoteMetadataWidget extends TextWidget { diff --git a/packages/app-cli/app/gui/NoteWidget.js b/packages/app-cli/app/gui/NoteWidget.js index 887f0909d..0e5c112a7 100644 --- a/packages/app-cli/app/gui/NoteWidget.js +++ b/packages/app-cli/app/gui/NoteWidget.js @@ -1,6 +1,6 @@ -const Note = require('@joplinapp/lib/models/Note.js'); +const Note = require('@joplin/lib/models/Note.js'); const TextWidget = require('tkwidgets/TextWidget.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class NoteWidget extends TextWidget { constructor() { diff --git a/packages/app-cli/app/help-utils.js b/packages/app-cli/app/help-utils.js index 7d5f094a6..8cb9397f8 100644 --- a/packages/app-cli/app/help-utils.js +++ b/packages/app-cli/app/help-utils.js @@ -1,6 +1,6 @@ -const { wrap } = require('@joplinapp/lib/string-utils.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { _ } = require('@joplinapp/lib/locale'); +const { wrap } = require('@joplin/lib/string-utils.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const { _ } = require('@joplin/lib/locale'); const MAX_WIDTH = 78; const INDENT = ' '; diff --git a/packages/app-cli/app/main.js b/packages/app-cli/app/main.js index 9fe670d14..268378c24 100644 --- a/packages/app-cli/app/main.js +++ b/packages/app-cli/app/main.js @@ -11,24 +11,24 @@ if (compareVersion(nodeVersion, '10.0.0') < 0) { } const { app } = require('./app.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const MasterKey = require('@joplinapp/lib/models/MasterKey'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Revision = require('@joplinapp/lib/models/Revision.js'); -const Logger = require('@joplinapp/lib/Logger').default; -const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const MasterKey = require('@joplin/lib/models/MasterKey'); +const Setting = require('@joplin/lib/models/Setting').default; +const Revision = require('@joplin/lib/models/Revision.js'); +const Logger = require('@joplin/lib/Logger').default; +const FsDriverNode = require('@joplin/lib/fs-driver-node').default; const sharp = require('sharp'); -const { shimInit } = require('@joplinapp/lib/shim-init-node.js'); -const shim = require('@joplinapp/lib/shim').default; -const { _ } = require('@joplinapp/lib/locale'); -const { FileApiDriverLocal } = require('@joplinapp/lib/file-api-driver-local.js'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); -const envFromArgs = require('@joplinapp/lib/envFromArgs'); +const { shimInit } = require('@joplin/lib/shim-init-node.js'); +const shim = require('@joplin/lib/shim').default; +const { _ } = require('@joplin/lib/locale'); +const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local.js'); +const EncryptionService = require('@joplin/lib/services/EncryptionService'); +const envFromArgs = require('@joplin/lib/envFromArgs'); const env = envFromArgs(process.argv); diff --git a/packages/app-cli/app/services/plugins/PluginRunner.ts b/packages/app-cli/app/services/plugins/PluginRunner.ts index 477a5ba26..a1c94b733 100644 --- a/packages/app-cli/app/services/plugins/PluginRunner.ts +++ b/packages/app-cli/app/services/plugins/PluginRunner.ts @@ -1,10 +1,10 @@ import * as vm from 'vm'; -import Plugin from '@joplinapp/lib/services/plugins/Plugin'; -import sandboxProxy from '@joplinapp/lib/services/plugins/sandboxProxy'; -import BasePluginRunner from '@joplinapp/lib/services/plugins/BasePluginRunner'; -import executeSandboxCall from '@joplinapp/lib/services/plugins/utils/executeSandboxCall'; -import Global from '@joplinapp/lib/services/plugins/api/Global'; -import mapEventHandlersToIds, { EventHandlers } from '@joplinapp/lib/services/plugins/utils/mapEventHandlersToIds'; +import Plugin from '@joplin/lib/services/plugins/Plugin'; +import sandboxProxy from '@joplin/lib/services/plugins/sandboxProxy'; +import BasePluginRunner from '@joplin/lib/services/plugins/BasePluginRunner'; +import executeSandboxCall from '@joplin/lib/services/plugins/utils/executeSandboxCall'; +import Global from '@joplin/lib/services/plugins/api/Global'; +import mapEventHandlersToIds, { EventHandlers } from '@joplin/lib/services/plugins/utils/mapEventHandlersToIds'; function createConsoleWrapper(pluginId:string) { const wrapper:any = {}; diff --git a/packages/app-cli/gulpfile.js b/packages/app-cli/gulpfile.js index 8c70046c5..80097d346 100644 --- a/packages/app-cli/gulpfile.js +++ b/packages/app-cli/gulpfile.js @@ -1,6 +1,6 @@ const gulp = require('gulp'); const fs = require('fs-extra'); -const utils = require('@joplinapp/tools/gulp/utils'); +const utils = require('@joplin/tools/gulp/utils'); const tasks = { // compileExtensions: { // fn: require('../Tools/gulp/tasks/compileExtensions.js'), diff --git a/packages/app-cli/package-lock.json b/packages/app-cli/package-lock.json index aec66db84..dff80a802 100644 --- a/packages/app-cli/package-lock.json +++ b/packages/app-cli/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/app-cli", + "name": "joplin", "version": "1.4.3", "lockfileVersion": 1, "requires": true, diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index 39e976c58..bc36bb657 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -38,8 +38,8 @@ "node": ">=10.0.0" }, "dependencies": { - "@joplinapp/lib": "^1.0.9", - "@joplinapp/renderer": "^1.0.17", + "@joplin/lib": "^1.0.9", + "@joplin/renderer": "^1.0.17", "aws-sdk": "^2.588.0", "chalk": "^4.1.0", "clean-html": "^1.5.0", @@ -64,7 +64,7 @@ "yargs-parser": "^7.0.0" }, "devDependencies": { - "@joplinapp/tools": "^1.0.9", + "@joplin/tools": "^1.0.9", "@types/jasmine": "^3.6.0", "@types/node": "^14.14.6", "gulp": "^4.0.2", diff --git a/packages/app-cli/tests/ArrayUtils.js b/packages/app-cli/tests/ArrayUtils.js index 6c8a71b03..f520d3ac5 100644 --- a/packages/app-cli/tests/ArrayUtils.js +++ b/packages/app-cli/tests/ArrayUtils.js @@ -1,9 +1,9 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const ArrayUtils = require('@joplinapp/lib/ArrayUtils'); +const ArrayUtils = require('@joplin/lib/ArrayUtils'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/EnexToHtml.js b/packages/app-cli/tests/EnexToHtml.js index 326399a02..1e161a5c5 100644 --- a/packages/app-cli/tests/EnexToHtml.js +++ b/packages/app-cli/tests/EnexToHtml.js @@ -1,7 +1,7 @@ const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js'); -const shim = require('@joplinapp/lib/shim').default; -const { enexXmlToHtml } = require('@joplinapp/lib/import-enex-html-gen.js'); +const shim = require('@joplin/lib/shim').default; +const { enexXmlToHtml } = require('@joplin/lib/import-enex-html-gen.js'); const cleanHtml = require('clean-html'); process.on('unhandledRejection', (reason, p) => { diff --git a/packages/app-cli/tests/EnexToMd.js b/packages/app-cli/tests/EnexToMd.js index 8dd1a41ef..7297eb7da 100644 --- a/packages/app-cli/tests/EnexToMd.js +++ b/packages/app-cli/tests/EnexToMd.js @@ -2,14 +2,14 @@ const os = require('os'); -const time = require('@joplinapp/lib/time').default; -const { filename } = require('@joplinapp/lib/path-utils'); +const time = require('@joplin/lib/time').default; +const { filename } = require('@joplin/lib/path-utils'); const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; -const { enexXmlToMd } = require('@joplinapp/lib/import-enex-md-gen.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; +const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/HtmlToHtml.js b/packages/app-cli/tests/HtmlToHtml.js index 35dd98a1d..385723778 100644 --- a/packages/app-cli/tests/HtmlToHtml.js +++ b/packages/app-cli/tests/HtmlToHtml.js @@ -2,15 +2,15 @@ const os = require('os'); -const time = require('@joplinapp/lib/time').default; -const { filename } = require('@joplinapp/lib/path-utils'); +const time = require('@joplin/lib/time').default; +const { filename } = require('@joplin/lib/path-utils'); const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; -const HtmlToHtml = require('@joplinapp/renderer/HtmlToHtml'); -const { enexXmlToMd } = require('@joplinapp/lib/import-enex-md-gen.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; +const HtmlToHtml = require('@joplin/renderer/HtmlToHtml'); +const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/HtmlToMd.js b/packages/app-cli/tests/HtmlToMd.js index 544871b7c..430313f1b 100644 --- a/packages/app-cli/tests/HtmlToMd.js +++ b/packages/app-cli/tests/HtmlToMd.js @@ -2,15 +2,15 @@ const os = require('os'); -const time = require('@joplinapp/lib/time').default; -const { filename } = require('@joplinapp/lib/path-utils'); +const time = require('@joplin/lib/time').default; +const { filename } = require('@joplin/lib/path-utils'); const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; -const HtmlToMd = require('@joplinapp/lib/HtmlToMd'); -const { enexXmlToMd } = require('@joplinapp/lib/import-enex-md-gen.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; +const HtmlToMd = require('@joplin/lib/HtmlToMd'); +const { enexXmlToMd } = require('@joplin/lib/import-enex-md-gen.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/InMemoryCache.ts b/packages/app-cli/tests/InMemoryCache.ts index a30cc0de9..4e883bd28 100644 --- a/packages/app-cli/tests/InMemoryCache.ts +++ b/packages/app-cli/tests/InMemoryCache.ts @@ -1,5 +1,5 @@ -import InMemoryCache from '@joplinapp/lib/InMemoryCache'; -const time = require('@joplinapp/lib/time').default; +import InMemoryCache from '@joplin/lib/InMemoryCache'; +const time = require('@joplin/lib/time').default; describe('InMemoryCache', function() { diff --git a/packages/app-cli/tests/MarkupToHtml.js b/packages/app-cli/tests/MarkupToHtml.js index 9a582b90a..dcde86bf4 100644 --- a/packages/app-cli/tests/MarkupToHtml.js +++ b/packages/app-cli/tests/MarkupToHtml.js @@ -1,6 +1,6 @@ const { asyncTest } = require('./test-utils.js'); -const MarkupToHtml = require('@joplinapp/renderer/MarkupToHtml').default; +const MarkupToHtml = require('@joplin/renderer/MarkupToHtml').default; describe('MarkupToHtml', function() { diff --git a/packages/app-cli/tests/MdToHtml.ts b/packages/app-cli/tests/MdToHtml.ts index bdd77adfa..3eee4b242 100644 --- a/packages/app-cli/tests/MdToHtml.ts +++ b/packages/app-cli/tests/MdToHtml.ts @@ -1,9 +1,9 @@ -import MdToHtml from '@joplinapp/renderer/MdToHtml'; +import MdToHtml from '@joplin/renderer/MdToHtml'; const os = require('os'); -const { filename } = require('@joplinapp/lib/path-utils'); +const { filename } = require('@joplin/lib/path-utils'); const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js'); -const shim = require('@joplinapp/lib/shim').default; -const { themeStyle } = require('@joplinapp/lib/theme'); +const shim = require('@joplin/lib/shim').default; +const { themeStyle } = require('@joplin/lib/theme'); function newTestMdToHtml(options:any = null) { options = { diff --git a/packages/app-cli/tests/MdToMd.js b/packages/app-cli/tests/MdToMd.js index 128cbfd06..aa69ca57b 100644 --- a/packages/app-cli/tests/MdToMd.js +++ b/packages/app-cli/tests/MdToMd.js @@ -1,5 +1,5 @@ -const mdImporterService = require('@joplinapp/lib/services/interop/InteropService_Importer_Md').default; -const Note = require('@joplinapp/lib/models/Note.js'); +const mdImporterService = require('@joplin/lib/services/interop/InteropService_Importer_Md').default; +const Note = require('@joplin/lib/models/Note.js'); const { setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js'); const importer = new mdImporterService(); diff --git a/packages/app-cli/tests/StringUtils.js b/packages/app-cli/tests/StringUtils.js index 94b44723d..545b568ff 100644 --- a/packages/app-cli/tests/StringUtils.js +++ b/packages/app-cli/tests/StringUtils.js @@ -2,7 +2,7 @@ const { asyncTest } = require('./test-utils.js'); -const StringUtils = require('@joplinapp/lib/string-utils'); +const StringUtils = require('@joplin/lib/string-utils'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/TaskQueue.js b/packages/app-cli/tests/TaskQueue.js index 221b0beb9..bb3bae6fe 100644 --- a/packages/app-cli/tests/TaskQueue.js +++ b/packages/app-cli/tests/TaskQueue.js @@ -2,7 +2,7 @@ const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const TaskQueue = require('@joplinapp/lib/TaskQueue.js'); +const TaskQueue = require('@joplin/lib/TaskQueue.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/database.js b/packages/app-cli/tests/database.js index 1dcec10e7..e39c91f48 100644 --- a/packages/app-cli/tests/database.js +++ b/packages/app-cli/tests/database.js @@ -1,14 +1,14 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const ArrayUtils = require('@joplinapp/lib/ArrayUtils.js'); -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const BaseModel = require('@joplin/lib/BaseModel').default; +const ArrayUtils = require('@joplin/lib/ArrayUtils.js'); +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/eventManager.js b/packages/app-cli/tests/eventManager.js index 8af8e9370..360e20740 100644 --- a/packages/app-cli/tests/eventManager.js +++ b/packages/app-cli/tests/eventManager.js @@ -2,7 +2,7 @@ const { asyncTest,checkThrow } = require('./test-utils.js'); -const eventManager = require('@joplinapp/lib/eventManager').default; +const eventManager = require('@joplin/lib/eventManager').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/feature_NoteHistory.js b/packages/app-cli/tests/feature_NoteHistory.js index a407a1443..13ad8fea2 100644 --- a/packages/app-cli/tests/feature_NoteHistory.js +++ b/packages/app-cli/tests/feature_NoteHistory.js @@ -1,10 +1,10 @@ const { asyncTest, id, ids, createNTestFolders, sortedIds, createNTestNotes, TestApp } = require('./test-utils.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const uuid = require('@joplinapp/lib/uuid').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const uuid = require('@joplin/lib/uuid').default; +const Note = require('@joplin/lib/models/Note.js'); +const Folder = require('@joplin/lib/models/Folder.js'); -const { ALL_NOTES_FILTER_ID } = require('@joplinapp/lib/reserved-ids.js'); +const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids.js'); let testApp = null; diff --git a/packages/app-cli/tests/feature_NoteList.js b/packages/app-cli/tests/feature_NoteList.js index cadfedf01..f33c3980a 100644 --- a/packages/app-cli/tests/feature_NoteList.js +++ b/packages/app-cli/tests/feature_NoteList.js @@ -1,10 +1,10 @@ /* eslint-disable no-unused-vars */ const { setupDatabaseAndSynchronizer, switchClient, asyncTest, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const time = require('@joplinapp/lib/time').default; +const Setting = require('@joplin/lib/models/Setting').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const time = require('@joplin/lib/time').default; let testApp = null; diff --git a/packages/app-cli/tests/feature_ShowAllNotes.js b/packages/app-cli/tests/feature_ShowAllNotes.js index 20bfa6202..e74c7a221 100644 --- a/packages/app-cli/tests/feature_ShowAllNotes.js +++ b/packages/app-cli/tests/feature_ShowAllNotes.js @@ -1,11 +1,11 @@ /* eslint-disable no-unused-vars */ const { setupDatabaseAndSynchronizer, switchClient, asyncTest, id, ids, sortedIds, at, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const time = require('@joplinapp/lib/time').default; -const { ALL_NOTES_FILTER_ID } = require('@joplinapp/lib/reserved-ids.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const time = require('@joplin/lib/time').default; +const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids.js'); // // The integration tests are to test the integration of the core system, comprising the diff --git a/packages/app-cli/tests/feature_TagList.js b/packages/app-cli/tests/feature_TagList.js index 178d4f9ec..944235345 100644 --- a/packages/app-cli/tests/feature_TagList.js +++ b/packages/app-cli/tests/feature_TagList.js @@ -1,10 +1,10 @@ /* eslint-disable no-unused-vars */ const { setupDatabaseAndSynchronizer, switchClient, asyncTest, createNTestFolders, createNTestNotes, createNTestTags, TestApp } = require('./test-utils.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const time = require('@joplinapp/lib/time').default; +const Setting = require('@joplin/lib/models/Setting').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const time = require('@joplin/lib/time').default; let testApp = null; diff --git a/packages/app-cli/tests/file_api_driver.js b/packages/app-cli/tests/file_api_driver.js index 156fe0edd..1daed0413 100644 --- a/packages/app-cli/tests/file_api_driver.js +++ b/packages/app-cli/tests/file_api_driver.js @@ -1,12 +1,12 @@ /* eslint-disable no-unused-vars */ -const uuid = require('@joplinapp/lib/uuid').default; -const time = require('@joplinapp/lib/time').default; +const uuid = require('@joplin/lib/uuid').default; +const time = require('@joplin/lib/time').default; const { asyncTest, sleep, fileApi, fileContentEqual, checkThrowAsync } = require('./test-utils.js'); -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; const fs = require('fs-extra'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/filterParser.js b/packages/app-cli/tests/filterParser.js index ca6405575..ccbdd513d 100644 --- a/packages/app-cli/tests/filterParser.js +++ b/packages/app-cli/tests/filterParser.js @@ -1,7 +1,7 @@ /* eslint-disable no-unused-vars */ -const filterParser = require('@joplinapp/lib/services/searchengine/filterParser.js').default; -// import filterParser from '@joplinapp/lib/services/searchengine/filterParser.js'; +const filterParser = require('@joplin/lib/services/searchengine/filterParser.js').default; +// import filterParser from '@joplin/lib/services/searchengine/filterParser.js'; const makeTerm = (name, value, negated, quoted = false, wildcard = false) => { if (name === 'text') { return { name, value, negated, quoted, wildcard }; } diff --git a/packages/app-cli/tests/fsDriver.ts b/packages/app-cli/tests/fsDriver.ts index e19ecaad8..d7f9e50c9 100644 --- a/packages/app-cli/tests/fsDriver.ts +++ b/packages/app-cli/tests/fsDriver.ts @@ -1,5 +1,5 @@ -import FsDriverNode from '@joplinapp/lib/fs-driver-node'; -import shim from '@joplinapp/lib/shim'; +import FsDriverNode from '@joplin/lib/fs-driver-node'; +import shim from '@joplin/lib/shim'; const { expectThrow } = require('./test-utils.js'); // On Windows, path.resolve is going to convert a path such as diff --git a/packages/app-cli/tests/htmlUtils.js b/packages/app-cli/tests/htmlUtils.js index 3159c07d3..0ff77b475 100644 --- a/packages/app-cli/tests/htmlUtils.js +++ b/packages/app-cli/tests/htmlUtils.js @@ -2,7 +2,7 @@ const { asyncTest } = require('./test-utils.js'); -const htmlUtils = require('@joplinapp/lib/htmlUtils.js'); +const htmlUtils = require('@joplin/lib/htmlUtils.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/markdownUtils.js b/packages/app-cli/tests/markdownUtils.js index 71fb012ca..f8dc1542f 100644 --- a/packages/app-cli/tests/markdownUtils.js +++ b/packages/app-cli/tests/markdownUtils.js @@ -2,7 +2,7 @@ const { asyncTest } = require('./test-utils.js'); -const markdownUtils = require('@joplinapp/lib/markdownUtils').default; +const markdownUtils = require('@joplin/lib/markdownUtils').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/mimeUtils.js b/packages/app-cli/tests/mimeUtils.js index 4568e592f..620735f4d 100644 --- a/packages/app-cli/tests/mimeUtils.js +++ b/packages/app-cli/tests/mimeUtils.js @@ -1,9 +1,9 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime; +const mimeUtils = require('@joplin/lib/mime-utils.js').mime; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_BaseItem.js b/packages/app-cli/tests/models_BaseItem.js index a090383c2..620a03b63 100644 --- a/packages/app-cli/tests/models_BaseItem.js +++ b/packages/app-cli/tests/models_BaseItem.js @@ -1,14 +1,14 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_Folder.js b/packages/app-cli/tests/models_Folder.js index 903625473..b1b7eb5e7 100644 --- a/packages/app-cli/tests/models_Folder.js +++ b/packages/app-cli/tests/models_Folder.js @@ -1,12 +1,12 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_ItemChange.js b/packages/app-cli/tests/models_ItemChange.js index 6bc7ca6e5..58cc590f3 100644 --- a/packages/app-cli/tests/models_ItemChange.js +++ b/packages/app-cli/tests/models_ItemChange.js @@ -1,14 +1,14 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, revisionService, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); -const ResourceService = require('@joplinapp/lib/services/ResourceService'); -const ItemChangeUtils = require('@joplinapp/lib/services/ItemChangeUtils'); -const Note = require('@joplinapp/lib/models/Note'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const ItemChange = require('@joplinapp/lib/models/ItemChange'); +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); +const ResourceService = require('@joplin/lib/services/ResourceService'); +const ItemChangeUtils = require('@joplin/lib/services/ItemChangeUtils'); +const Note = require('@joplin/lib/models/Note'); +const Setting = require('@joplin/lib/models/Setting').default; +const ItemChange = require('@joplin/lib/models/ItemChange'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_Note.js b/packages/app-cli/tests/models_Note.js index 5a4af8dac..f018ffeff 100644 --- a/packages/app-cli/tests/models_Note.js +++ b/packages/app-cli/tests/models_Note.js @@ -1,14 +1,14 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const ArrayUtils = require('@joplinapp/lib/ArrayUtils.js'); -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const BaseModel = require('@joplin/lib/BaseModel').default; +const ArrayUtils = require('@joplin/lib/ArrayUtils.js'); +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_Note_CustomSortOrder.js b/packages/app-cli/tests/models_Note_CustomSortOrder.js index 92155ad2e..c9417c122 100644 --- a/packages/app-cli/tests/models_Note_CustomSortOrder.js +++ b/packages/app-cli/tests/models_Note_CustomSortOrder.js @@ -1,14 +1,14 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { sortedIds, createNTestNotes, asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const ArrayUtils = require('@joplinapp/lib/ArrayUtils.js'); -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const BaseModel = require('@joplin/lib/BaseModel').default; +const ArrayUtils = require('@joplin/lib/ArrayUtils.js'); +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_Resource.js b/packages/app-cli/tests/models_Resource.js index 9500b7629..d136c9235 100644 --- a/packages/app-cli/tests/models_Resource.js +++ b/packages/app-cli/tests/models_Resource.js @@ -1,13 +1,13 @@ /* eslint-disable no-unused-vars, require-atomic-updates */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_Revision.js b/packages/app-cli/tests/models_Revision.js index 4ffc4f92b..cc6449065 100644 --- a/packages/app-cli/tests/models_Revision.js +++ b/packages/app-cli/tests/models_Revision.js @@ -1,15 +1,15 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const Revision = require('@joplinapp/lib/models/Revision.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const Revision = require('@joplin/lib/models/Revision.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/models_Setting.ts b/packages/app-cli/tests/models_Setting.ts index 0630a5913..b4ce88626 100644 --- a/packages/app-cli/tests/models_Setting.ts +++ b/packages/app-cli/tests/models_Setting.ts @@ -1,4 +1,4 @@ -import Setting from '@joplinapp/lib/models/Setting'; +import Setting from '@joplin/lib/models/Setting'; const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('./test-utils.js'); diff --git a/packages/app-cli/tests/models_Tag.js b/packages/app-cli/tests/models_Tag.js index ffa6fbf6e..5bbea96fb 100644 --- a/packages/app-cli/tests/models_Tag.js +++ b/packages/app-cli/tests/models_Tag.js @@ -1,14 +1,14 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/pathUtils.js b/packages/app-cli/tests/pathUtils.js index c431e1865..14c8e7f23 100644 --- a/packages/app-cli/tests/pathUtils.js +++ b/packages/app-cli/tests/pathUtils.js @@ -1,7 +1,7 @@ /* eslint-disable no-unused-vars */ -const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('@joplinapp/lib/path-utils'); +const { extractExecutablePath, quotePath, unquotePath, friendlySafeFilename, toFileProtocolPath } = require('@joplin/lib/path-utils'); const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); process.on('unhandledRejection', (reason, p) => { diff --git a/packages/app-cli/tests/reducer.js b/packages/app-cli/tests/reducer.js index 4c15af2ca..18943b834 100644 --- a/packages/app-cli/tests/reducer.js +++ b/packages/app-cli/tests/reducer.js @@ -1,11 +1,11 @@ /* eslint-disable no-unused-vars */ const { setupDatabaseAndSynchronizer, switchClient, asyncTest, createNTestNotes, createNTestFolders, createNTestTags } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const reducer = require('@joplinapp/lib/reducer').default; -const { defaultState, stateUtils, MAX_HISTORY } = require('@joplinapp/lib/reducer'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const reducer = require('@joplin/lib/reducer').default; +const { defaultState, stateUtils, MAX_HISTORY } = require('@joplin/lib/reducer'); function initTestState(folders, selectedFolderIndex, notes, selectedNoteIndexes, tags = null, selectedTagIndex = null) { let state = defaultState; diff --git a/packages/app-cli/tests/services/plugins/api/JoplinSetting.ts b/packages/app-cli/tests/services/plugins/api/JoplinSetting.ts index e9677c7b7..838669250 100644 --- a/packages/app-cli/tests/services/plugins/api/JoplinSetting.ts +++ b/packages/app-cli/tests/services/plugins/api/JoplinSetting.ts @@ -1,4 +1,4 @@ -// import Setting from '@joplinapp/lib/models/Setting'; +// import Setting from '@joplin/lib/models/Setting'; // const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('../test-utils.js'); diff --git a/packages/app-cli/tests/services/plugins/sandboxProxy.ts b/packages/app-cli/tests/services/plugins/sandboxProxy.ts index 73ec1f197..dfa89f6b6 100644 --- a/packages/app-cli/tests/services/plugins/sandboxProxy.ts +++ b/packages/app-cli/tests/services/plugins/sandboxProxy.ts @@ -1,4 +1,4 @@ -import sandboxProxy, { Target } from '@joplinapp/lib/services/plugins/sandboxProxy'; +import sandboxProxy, { Target } from '@joplin/lib/services/plugins/sandboxProxy'; const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('../../test-utils.js'); diff --git a/packages/app-cli/tests/services_CommandService.ts b/packages/app-cli/tests/services_CommandService.ts index 57041aead..81e614fd2 100644 --- a/packages/app-cli/tests/services_CommandService.ts +++ b/packages/app-cli/tests/services_CommandService.ts @@ -1,6 +1,6 @@ -import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils'; -import ToolbarButtonUtils from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; -import CommandService, { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; +import MenuUtils from '@joplin/lib/services/commands/MenuUtils'; +import ToolbarButtonUtils from '@joplin/lib/services/commands/ToolbarButtonUtils'; +import CommandService, { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('./test-utils.js'); diff --git a/packages/app-cli/tests/services_EncryptionService.js b/packages/app-cli/tests/services_EncryptionService.js index c2e12a024..fa22355bc 100644 --- a/packages/app-cli/tests/services_EncryptionService.js +++ b/packages/app-cli/tests/services_EncryptionService.js @@ -1,18 +1,18 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const { Database } = require('@joplinapp/lib/database.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const MasterKey = require('@joplinapp/lib/models/MasterKey'); -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry.js'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const { Database } = require('@joplin/lib/database.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const MasterKey = require('@joplin/lib/models/MasterKey'); +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry.js'); +const EncryptionService = require('@joplin/lib/services/EncryptionService.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_InteropService.ts b/packages/app-cli/tests/services_InteropService.ts index 0238a5987..7eca9314a 100644 --- a/packages/app-cli/tests/services_InteropService.ts +++ b/packages/app-cli/tests/services_InteropService.ts @@ -1,15 +1,15 @@ -import InteropService from '@joplinapp/lib/services/interop/InteropService'; -import { CustomExportContext, CustomImportContext, Module, ModuleType } from '@joplinapp/lib/services/interop/types'; -import shim from '@joplinapp/lib/shim'; +import InteropService from '@joplin/lib/services/interop/InteropService'; +import { CustomExportContext, CustomImportContext, Module, ModuleType } from '@joplin/lib/services/interop/types'; +import shim from '@joplin/lib/shim'; const { asyncTest, fileContentEqual, setupDatabaseAndSynchronizer, switchClient, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const Resource = require('@joplin/lib/models/Resource.js'); const fs = require('fs-extra'); -const ArrayUtils = require('@joplinapp/lib/ArrayUtils'); +const ArrayUtils = require('@joplin/lib/ArrayUtils'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_InteropService_Exporter_Md.js b/packages/app-cli/tests/services_InteropService_Exporter_Md.js index 439fe255b..a90df99d9 100644 --- a/packages/app-cli/tests/services_InteropService_Exporter_Md.js +++ b/packages/app-cli/tests/services_InteropService_Exporter_Md.js @@ -3,12 +3,12 @@ const fs = require('fs-extra'); const { asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js'); -const InteropService_Exporter_Md = require('@joplinapp/lib/services/interop/InteropService_Exporter_Md').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const shim = require('@joplinapp/lib/shim').default; +const InteropService_Exporter_Md = require('@joplin/lib/services/interop/InteropService_Exporter_Md').default; +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const Note = require('@joplin/lib/models/Note.js'); +const shim = require('@joplin/lib/shim').default; const exportDir = `${__dirname}/export`; diff --git a/packages/app-cli/tests/services_KeymapService.js b/packages/app-cli/tests/services_KeymapService.js index 5b1930d9b..b227fd8e6 100644 --- a/packages/app-cli/tests/services_KeymapService.js +++ b/packages/app-cli/tests/services_KeymapService.js @@ -1,6 +1,6 @@ const { tempFilePath } = require('./test-utils.js'); -const KeymapService = require('@joplinapp/lib/services/KeymapService').default; +const KeymapService = require('@joplin/lib/services/KeymapService').default; const keymapService = KeymapService.instance(); keymapService.initialize([]); diff --git a/packages/app-cli/tests/services_KvStore.js b/packages/app-cli/tests/services_KvStore.js index b6686cfb6..3f9fd0fa8 100644 --- a/packages/app-cli/tests/services_KvStore.js +++ b/packages/app-cli/tests/services_KvStore.js @@ -2,7 +2,7 @@ const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const KvStore = require('@joplinapp/lib/services/KvStore.js'); +const KvStore = require('@joplin/lib/services/KvStore.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_PluginService.ts b/packages/app-cli/tests/services_PluginService.ts index db1211d53..c1e5aac86 100644 --- a/packages/app-cli/tests/services_PluginService.ts +++ b/packages/app-cli/tests/services_PluginService.ts @@ -1,12 +1,12 @@ import PluginRunner from '../app/services/plugins/PluginRunner'; -import PluginService from '@joplinapp/lib/services/plugins/PluginService'; -import { ContentScriptType } from '@joplinapp/lib/services/plugins/api/types'; -import MdToHtml from '@joplinapp/renderer/MdToHtml'; -import shim from '@joplinapp/lib/shim'; +import PluginService from '@joplin/lib/services/plugins/PluginService'; +import { ContentScriptType } from '@joplin/lib/services/plugins/api/types'; +import MdToHtml from '@joplin/renderer/MdToHtml'; +import shim from '@joplin/lib/shim'; const { asyncTest, setupDatabaseAndSynchronizer, switchClient, expectThrow, createTempDir } = require('./test-utils.js'); -const Note = require('@joplinapp/lib/models/Note'); -const Folder = require('@joplinapp/lib/models/Folder'); +const Note = require('@joplin/lib/models/Note'); +const Folder = require('@joplin/lib/models/Folder'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_ResourceService.js b/packages/app-cli/tests/services_ResourceService.js index b95cfaa5e..92ce672df 100644 --- a/packages/app-cli/tests/services_ResourceService.js +++ b/packages/app-cli/tests/services_ResourceService.js @@ -1,22 +1,22 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, resourceService, decryptionWorker, encryptionService, loadEncryptionMasterKey, allSyncTargetItemsEncrypted, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const InteropService = require('@joplinapp/lib/services/interop/InteropService').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const ItemChange = require('@joplinapp/lib/models/ItemChange.js'); -const NoteResource = require('@joplinapp/lib/models/NoteResource.js'); -const ResourceService = require('@joplinapp/lib/services/ResourceService.js'); +const InteropService = require('@joplin/lib/services/interop/InteropService').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const ItemChange = require('@joplin/lib/models/ItemChange.js'); +const NoteResource = require('@joplin/lib/models/NoteResource.js'); +const ResourceService = require('@joplin/lib/services/ResourceService.js'); const fs = require('fs-extra'); -const ArrayUtils = require('@joplinapp/lib/ArrayUtils'); -const ObjectUtils = require('@joplinapp/lib/ObjectUtils'); -const shim = require('@joplinapp/lib/shim').default; -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); +const ArrayUtils = require('@joplin/lib/ArrayUtils'); +const ObjectUtils = require('@joplin/lib/ObjectUtils'); +const shim = require('@joplin/lib/shim').default; +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_Revision.js b/packages/app-cli/tests/services_Revision.js index 6210ab08c..08cbb22b9 100644 --- a/packages/app-cli/tests/services_Revision.js +++ b/packages/app-cli/tests/services_Revision.js @@ -1,18 +1,18 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const ItemChange = require('@joplinapp/lib/models/ItemChange.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const Revision = require('@joplinapp/lib/models/Revision.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const RevisionService = require('@joplinapp/lib/services/RevisionService.js'); -const shim = require('@joplinapp/lib/shim').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const ItemChange = require('@joplin/lib/models/ItemChange.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const Revision = require('@joplin/lib/models/Revision.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const RevisionService = require('@joplin/lib/services/RevisionService.js'); +const shim = require('@joplin/lib/shim').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_SearchEngine.js b/packages/app-cli/tests/services_SearchEngine.js index b7eaf43df..14d64aca6 100644 --- a/packages/app-cli/tests/services_SearchEngine.js +++ b/packages/app-cli/tests/services_SearchEngine.js @@ -2,12 +2,12 @@ /* eslint prefer-const: 0*/ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync, mockDate, restoreDate } = require('./test-utils.js'); -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); -const Note = require('@joplinapp/lib/models/Note'); -const ItemChange = require('@joplinapp/lib/models/ItemChange'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); +const Note = require('@joplin/lib/models/Note'); +const ItemChange = require('@joplin/lib/models/ItemChange'); +const Setting = require('@joplin/lib/models/Setting').default; process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_SearchFilter.js b/packages/app-cli/tests/services_SearchFilter.js index b788da5e0..cd3b79ca2 100644 --- a/packages/app-cli/tests/services_SearchFilter.js +++ b/packages/app-cli/tests/services_SearchFilter.js @@ -2,17 +2,17 @@ /* eslint prefer-const: 0*/ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, createNTestNotes, switchClient, createNTestFolders } = require('./test-utils.js'); -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); -const Note = require('@joplinapp/lib/models/Note'); -const Folder = require('@joplinapp/lib/models/Folder'); -const Tag = require('@joplinapp/lib/models/Tag'); -const ItemChange = require('@joplinapp/lib/models/ItemChange'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Resource = require('@joplinapp/lib/models/Resource.js'); -const shim = require('@joplinapp/lib/shim').default; -const ResourceService = require('@joplinapp/lib/services/ResourceService.js'); +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); +const Note = require('@joplin/lib/models/Note'); +const Folder = require('@joplin/lib/models/Folder'); +const Tag = require('@joplin/lib/models/Tag'); +const ItemChange = require('@joplin/lib/models/ItemChange'); +const Setting = require('@joplin/lib/models/Setting').default; +const Resource = require('@joplin/lib/models/Resource.js'); +const shim = require('@joplin/lib/shim').default; +const ResourceService = require('@joplin/lib/services/ResourceService.js'); process.on('unhandledRejection', (reason, p) => { diff --git a/packages/app-cli/tests/services_SearchFuzzy.js b/packages/app-cli/tests/services_SearchFuzzy.js index dbf52424e..e3880afde 100644 --- a/packages/app-cli/tests/services_SearchFuzzy.js +++ b/packages/app-cli/tests/services_SearchFuzzy.js @@ -2,17 +2,17 @@ /* eslint prefer-const: 0*/ // -// const time = require('@joplinapp/lib/time').default; +// const time = require('@joplin/lib/time').default; // const { fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, asyncTest, db, synchronizer, fileApi, sleep, createNTestNotes, switchClient, createNTestFolders } = require('./test-utils.js'); -// const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); -// const Note = require('@joplinapp/lib/models/Note'); -// const Folder = require('@joplinapp/lib/models/Folder'); -// const Tag = require('@joplinapp/lib/models/Tag'); -// const ItemChange = require('@joplinapp/lib/models/ItemChange'); -// const Setting = require('@joplinapp/lib/models/Setting'); -// const Resource = require('@joplinapp/lib/models/Resource.js'); -// const shim = require('@joplinapp/lib/shim').default; -// const ResourceService = require('@joplinapp/lib/services/ResourceService.js'); +// const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); +// const Note = require('@joplin/lib/models/Note'); +// const Folder = require('@joplin/lib/models/Folder'); +// const Tag = require('@joplin/lib/models/Tag'); +// const ItemChange = require('@joplin/lib/models/ItemChange'); +// const Setting = require('@joplin/lib/models/Setting'); +// const Resource = require('@joplin/lib/models/Resource.js'); +// const shim = require('@joplin/lib/shim').default; +// const ResourceService = require('@joplin/lib/services/ResourceService.js'); // process.on('unhandledRejection', (reason, p) => { // console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/services_keychainService.ts b/packages/app-cli/tests/services_keychainService.ts index a1fc0015d..ad9c2223b 100644 --- a/packages/app-cli/tests/services_keychainService.ts +++ b/packages/app-cli/tests/services_keychainService.ts @@ -1,6 +1,6 @@ -import KeychainService from '@joplinapp/lib/services/keychain/KeychainService'; -import shim from '@joplinapp/lib/shim'; -import Setting from '@joplinapp/lib/models/Setting'; +import KeychainService from '@joplin/lib/services/keychain/KeychainService'; +import shim from '@joplin/lib/shim'; +import Setting from '@joplin/lib/models/Setting'; const { db, asyncTest, setupDatabaseAndSynchronizer, switchClient } = require('./test-utils.js'); diff --git a/packages/app-cli/tests/services_rest_Api.ts b/packages/app-cli/tests/services_rest_Api.ts index ab5f77d17..45a717df1 100644 --- a/packages/app-cli/tests/services_rest_Api.ts +++ b/packages/app-cli/tests/services_rest_Api.ts @@ -1,13 +1,13 @@ -import { PaginationOrderDir } from '@joplinapp/lib/models/utils/types'; -import Api, { RequestMethod } from '@joplinapp/lib/services/rest/Api'; -import shim from '@joplinapp/lib/shim'; +import { PaginationOrderDir } from '@joplin/lib/models/utils/types'; +import Api, { RequestMethod } from '@joplin/lib/services/rest/Api'; +import shim from '@joplin/lib/shim'; const { asyncTest, setupDatabaseAndSynchronizer, switchClient, checkThrowAsync } = require('./test-utils.js'); -const Folder = require('@joplinapp/lib/models/Folder'); -const Resource = require('@joplinapp/lib/models/Resource'); -const Note = require('@joplinapp/lib/models/Note'); -const Tag = require('@joplinapp/lib/models/Tag'); -const NoteTag = require('@joplinapp/lib/models/NoteTag'); +const Folder = require('@joplin/lib/models/Folder'); +const Resource = require('@joplin/lib/models/Resource'); +const Note = require('@joplin/lib/models/Note'); +const Tag = require('@joplin/lib/models/Tag'); +const NoteTag = require('@joplin/lib/models/NoteTag'); async function msleep(ms:number) { return new Promise((resolve) => { diff --git a/packages/app-cli/tests/support/syncTargetUtils.js b/packages/app-cli/tests/support/syncTargetUtils.js index b14f18d67..19776931a 100644 --- a/packages/app-cli/tests/support/syncTargetUtils.js +++ b/packages/app-cli/tests/support/syncTargetUtils.js @@ -1,11 +1,11 @@ const { syncDir, asyncTest, fileApi, synchronizer, createSyncTargetSnapshot, loadEncryptionMasterKey, decryptionWorker, encryptionService, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('../test-utils.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Folder = require('@joplinapp/lib/models/Folder'); -const Note = require('@joplinapp/lib/models/Note'); -const Tag = require('@joplinapp/lib/models/Tag'); -const Resource = require('@joplinapp/lib/models/Resource'); -const markdownUtils = require('@joplinapp/lib/markdownUtils').default;; -const shim = require('@joplinapp/lib/shim').default; +const Setting = require('@joplin/lib/models/Setting').default; +const Folder = require('@joplin/lib/models/Folder'); +const Note = require('@joplin/lib/models/Note'); +const Tag = require('@joplin/lib/models/Tag'); +const Resource = require('@joplin/lib/models/Resource'); +const markdownUtils = require('@joplin/lib/markdownUtils').default;; +const shim = require('@joplin/lib/shim').default; const fs = require('fs-extra'); const snapshotBaseDir = `${__dirname}/../../tests/support/syncTargetSnapshots`; diff --git a/packages/app-cli/tests/synchronizer.js b/packages/app-cli/tests/synchronizer.js index 45750b455..0ab9440d2 100644 --- a/packages/app-cli/tests/synchronizer.js +++ b/packages/app-cli/tests/synchronizer.js @@ -1,23 +1,23 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { setupDatabase, synchronizerStart, syncTargetName, allSyncTargetItemsEncrypted, tempFilePath, resourceFetcher, kvStore, revisionService, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, encryptionService, loadEncryptionMasterKey, fileContentEqual, decryptionWorker, checkThrowAsync, asyncTest } = require('./test-utils.js'); -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; const fs = require('fs-extra'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const { Database } = require('@joplinapp/lib/database.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const MasterKey = require('@joplinapp/lib/models/MasterKey'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Revision = require('@joplinapp/lib/models/Revision.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry.js'); -const WelcomeUtils = require('@joplinapp/lib/WelcomeUtils'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher'); +const Tag = require('@joplin/lib/models/Tag.js'); +const { Database } = require('@joplin/lib/database.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const MasterKey = require('@joplin/lib/models/MasterKey'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Revision = require('@joplin/lib/models/Revision.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry.js'); +const WelcomeUtils = require('@joplin/lib/WelcomeUtils'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/synchronizer_LockHandler.ts b/packages/app-cli/tests/synchronizer_LockHandler.ts index 85cdcb303..20b434034 100644 --- a/packages/app-cli/tests/synchronizer_LockHandler.ts +++ b/packages/app-cli/tests/synchronizer_LockHandler.ts @@ -1,4 +1,4 @@ -import LockHandler, { LockType, LockHandlerOptions, Lock } from '@joplinapp/lib/services/synchronizer/LockHandler'; +import LockHandler, { LockType, LockHandlerOptions, Lock } from '@joplin/lib/services/synchronizer/LockHandler'; const { isNetworkSyncTarget, asyncTest, fileApi, setupDatabaseAndSynchronizer, synchronizer, switchClient, msleep, expectThrow, expectNotThrow } = require('./test-utils.js'); diff --git a/packages/app-cli/tests/synchronizer_MigrationHandler.ts b/packages/app-cli/tests/synchronizer_MigrationHandler.ts index 805874995..8b263c50e 100644 --- a/packages/app-cli/tests/synchronizer_MigrationHandler.ts +++ b/packages/app-cli/tests/synchronizer_MigrationHandler.ts @@ -1,6 +1,6 @@ -import LockHandler from '@joplinapp/lib/services/synchronizer/LockHandler'; -import MigrationHandler from '@joplinapp/lib/services/synchronizer/MigrationHandler'; -import { Dirnames } from '@joplinapp/lib/services/synchronizer/utils/types'; +import LockHandler from '@joplin/lib/services/synchronizer/LockHandler'; +import MigrationHandler from '@joplin/lib/services/synchronizer/MigrationHandler'; +import { Dirnames } from '@joplin/lib/services/synchronizer/utils/types'; // To create a sync target snapshot for the current syncVersion: // - In test-utils, set syncTargetName_ to "filesystem" @@ -10,8 +10,8 @@ import { Dirnames } from '@joplinapp/lib/services/synchronizer/utils/types'; const { asyncTest, setSyncTargetName, fileApi, synchronizer, decryptionWorker, encryptionService, setupDatabaseAndSynchronizer, switchClient, expectThrow, expectNotThrow } = require('./test-utils.js'); const { deploySyncTargetSnapshot, testData, checkTestData } = require('./support/syncTargetUtils'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const MasterKey = require('@joplinapp/lib/models/MasterKey'); +const Setting = require('@joplin/lib/models/Setting').default; +const MasterKey = require('@joplin/lib/models/MasterKey'); const specTimeout = 60000 * 10; // Nextcloud tests can be slow diff --git a/packages/app-cli/tests/test-utils.js b/packages/app-cli/tests/test-utils.js index 26dd67006..97fc52513 100644 --- a/packages/app-cli/tests/test-utils.js +++ b/packages/app-cli/tests/test-utils.js @@ -1,56 +1,56 @@ /* eslint-disable require-atomic-updates */ const fs = require('fs-extra'); -const { JoplinDatabase } = require('@joplinapp/lib/joplin-database.js'); -const { DatabaseDriverNode } = require('@joplinapp/lib/database-driver-node.js'); -const BaseApplication = require('@joplinapp/lib/BaseApplication').default; -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const ItemChange = require('@joplinapp/lib/models/ItemChange.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const Revision = require('@joplinapp/lib/models/Revision.js'); -const Logger = require('@joplinapp/lib/Logger').default; -const Setting = require('@joplinapp/lib/models/Setting').default; -const MasterKey = require('@joplinapp/lib/models/MasterKey'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const { FileApi } = require('@joplinapp/lib/file-api.js'); -const { FileApiDriverMemory } = require('@joplinapp/lib/file-api-driver-memory.js'); -const { FileApiDriverLocal } = require('@joplinapp/lib/file-api-driver-local.js'); -const { FileApiDriverWebDav } = require('@joplinapp/lib/file-api-driver-webdav.js'); -const { FileApiDriverDropbox } = require('@joplinapp/lib/file-api-driver-dropbox.js'); -const { FileApiDriverOneDrive } = require('@joplinapp/lib/file-api-driver-onedrive.js'); -const { FileApiDriverAmazonS3 } = require('@joplinapp/lib/file-api-driver-amazon-s3.js'); -const BaseService = require('@joplinapp/lib/services/BaseService').default; -const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default; -const time = require('@joplinapp/lib/time').default; -const { shimInit } = require('@joplinapp/lib/shim-init-node.js'); -const shim = require('@joplinapp/lib/shim').default; -const uuid = require('@joplinapp/lib/uuid').default; -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry.js'); -const SyncTargetMemory = require('@joplinapp/lib/SyncTargetMemory.js'); -const SyncTargetFilesystem = require('@joplinapp/lib/SyncTargetFilesystem.js'); -const SyncTargetOneDrive = require('@joplinapp/lib/SyncTargetOneDrive.js'); -const SyncTargetNextcloud = require('@joplinapp/lib/SyncTargetNextcloud.js'); -const SyncTargetDropbox = require('@joplinapp/lib/SyncTargetDropbox.js'); -const SyncTargetAmazonS3 = require('@joplinapp/lib/SyncTargetAmazonS3.js'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService.js'); -const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker.js'); -const ResourceService = require('@joplinapp/lib/services/ResourceService.js'); -const RevisionService = require('@joplinapp/lib/services/RevisionService.js'); -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js'); -const KvStore = require('@joplinapp/lib/services/KvStore.js'); -const WebDavApi = require('@joplinapp/lib/WebDavApi'); -const DropboxApi = require('@joplinapp/lib/DropboxApi'); -const { OneDriveApi } = require('@joplinapp/lib/onedrive-api'); -const { loadKeychainServiceAndSettings } = require('@joplinapp/lib/services/SettingUtils'); -const KeychainServiceDriver = require('@joplinapp/lib/services/keychain/KeychainServiceDriver.node').default; -const KeychainServiceDriverDummy = require('@joplinapp/lib/services/keychain/KeychainServiceDriver.dummy').default; +const { JoplinDatabase } = require('@joplin/lib/joplin-database.js'); +const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js'); +const BaseApplication = require('@joplin/lib/BaseApplication').default; +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const ItemChange = require('@joplin/lib/models/ItemChange.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const Revision = require('@joplin/lib/models/Revision.js'); +const Logger = require('@joplin/lib/Logger').default; +const Setting = require('@joplin/lib/models/Setting').default; +const MasterKey = require('@joplin/lib/models/MasterKey'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const { FileApi } = require('@joplin/lib/file-api.js'); +const { FileApiDriverMemory } = require('@joplin/lib/file-api-driver-memory.js'); +const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local.js'); +const { FileApiDriverWebDav } = require('@joplin/lib/file-api-driver-webdav.js'); +const { FileApiDriverDropbox } = require('@joplin/lib/file-api-driver-dropbox.js'); +const { FileApiDriverOneDrive } = require('@joplin/lib/file-api-driver-onedrive.js'); +const { FileApiDriverAmazonS3 } = require('@joplin/lib/file-api-driver-amazon-s3.js'); +const BaseService = require('@joplin/lib/services/BaseService').default; +const FsDriverNode = require('@joplin/lib/fs-driver-node').default; +const time = require('@joplin/lib/time').default; +const { shimInit } = require('@joplin/lib/shim-init-node.js'); +const shim = require('@joplin/lib/shim').default; +const uuid = require('@joplin/lib/uuid').default; +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry.js'); +const SyncTargetMemory = require('@joplin/lib/SyncTargetMemory.js'); +const SyncTargetFilesystem = require('@joplin/lib/SyncTargetFilesystem.js'); +const SyncTargetOneDrive = require('@joplin/lib/SyncTargetOneDrive.js'); +const SyncTargetNextcloud = require('@joplin/lib/SyncTargetNextcloud.js'); +const SyncTargetDropbox = require('@joplin/lib/SyncTargetDropbox.js'); +const SyncTargetAmazonS3 = require('@joplin/lib/SyncTargetAmazonS3.js'); +const EncryptionService = require('@joplin/lib/services/EncryptionService.js'); +const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker.js'); +const ResourceService = require('@joplin/lib/services/ResourceService.js'); +const RevisionService = require('@joplin/lib/services/RevisionService.js'); +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js'); +const KvStore = require('@joplin/lib/services/KvStore.js'); +const WebDavApi = require('@joplin/lib/WebDavApi'); +const DropboxApi = require('@joplin/lib/DropboxApi'); +const { OneDriveApi } = require('@joplin/lib/onedrive-api'); +const { loadKeychainServiceAndSettings } = require('@joplin/lib/services/SettingUtils'); +const KeychainServiceDriver = require('@joplin/lib/services/keychain/KeychainServiceDriver.node').default; +const KeychainServiceDriverDummy = require('@joplin/lib/services/keychain/KeychainServiceDriver.dummy').default; const md5 = require('md5'); const S3 = require('aws-sdk/clients/s3'); -const { Dirnames } = require('@joplinapp/lib/services/synchronizer/utils/types'); +const { Dirnames } = require('@joplin/lib/services/synchronizer/utils/types'); const sharp = require('sharp'); const databases_ = []; @@ -429,7 +429,7 @@ async function initFileApi() { // redirection URL in onedrive-auth.txt. Keep in mind that auth data // only lasts 1h for OneDrive. // https://login.live.com/oauth20_authorize.srf?client_id=f1e68e1e-a729-4514-b041-4fdd5c7ac03a&scope=files.readwrite,offline_access&response_type=token&redirect_uri=https://joplinapp.org - const { parameters, setEnvOverride } = require('@joplinapp/lib/parameters.js'); + const { parameters, setEnvOverride } = require('@joplin/lib/parameters.js'); Setting.setConstant('env', 'dev'); setEnvOverride('test'); const config = parameters().oneDriveTest; diff --git a/packages/app-cli/tests/timeUtils.js b/packages/app-cli/tests/timeUtils.js index 46ddc4236..0a45cd6e4 100644 --- a/packages/app-cli/tests/timeUtils.js +++ b/packages/app-cli/tests/timeUtils.js @@ -1,9 +1,9 @@ /* eslint-disable no-unused-vars */ -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { asyncTest, fileContentEqual, setupDatabase, setupDatabaseAndSynchronizer, db, synchronizer, fileApi, sleep, clearDatabase, switchClient, syncTargetId, objectsEqual, checkThrowAsync } = require('./test-utils.js'); -const timeUtils = require('@joplinapp/lib/time'); +const timeUtils = require('@joplin/lib/time'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-cli/tests/urlUtils.js b/packages/app-cli/tests/urlUtils.js index 5ed7233a4..889bb21e4 100644 --- a/packages/app-cli/tests/urlUtils.js +++ b/packages/app-cli/tests/urlUtils.js @@ -1,6 +1,6 @@ const { asyncTest } = require('./test-utils.js'); -const urlUtils = require('@joplinapp/lib/urlUtils.js'); +const urlUtils = require('@joplin/lib/urlUtils.js'); process.on('unhandledRejection', (reason, p) => { console.log('Unhandled Rejection at: Promise', p, 'reason:', reason); diff --git a/packages/app-clipper/package.json b/packages/app-clipper/package.json index 6e8048bcc..a73ca6439 100644 --- a/packages/app-clipper/package.json +++ b/packages/app-clipper/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/app-clipper", + "name": "@joplin/app-clipper", "private": true, "scripts": { "postinstall": "cd popup && npm install" diff --git a/packages/app-desktop/ElectronAppWrapper.ts b/packages/app-desktop/ElectronAppWrapper.ts index 670442321..cb43815b8 100644 --- a/packages/app-desktop/ElectronAppWrapper.ts +++ b/packages/app-desktop/ElectronAppWrapper.ts @@ -1,11 +1,11 @@ -import Logger from '@joplinapp/lib/Logger'; +import Logger from '@joplin/lib/Logger'; import { PluginMessage } from './services/plugins/PluginRunner'; -import shim from '@joplinapp/lib/shim'; +import shim from '@joplin/lib/shim'; const { BrowserWindow, Tray, screen } = require('electron'); const url = require('url'); const path = require('path'); -const { dirname } = require('@joplinapp/lib/path-utils'); +const { dirname } = require('@joplin/lib/path-utils'); const fs = require('fs-extra'); const { ipcMain } = require('electron'); diff --git a/packages/app-desktop/InteropServiceHelper.ts b/packages/app-desktop/InteropServiceHelper.ts index 0307df620..5ca0d6ff9 100644 --- a/packages/app-desktop/InteropServiceHelper.ts +++ b/packages/app-desktop/InteropServiceHelper.ts @@ -1,14 +1,14 @@ -import InteropService from '@joplinapp/lib/services/interop/InteropService'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import shim from '@joplinapp/lib/shim'; -import { ExportOptions, FileSystemItem, Module } from '@joplinapp/lib/services/interop/types'; +import InteropService from '@joplin/lib/services/interop/InteropService'; +import CommandService from '@joplin/lib/services/CommandService'; +import shim from '@joplin/lib/shim'; +import { ExportOptions, FileSystemItem, Module } from '@joplin/lib/services/interop/types'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const bridge = require('electron').remote.require('./bridge').default; -const Setting = require('@joplinapp/lib/models/Setting').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const { friendlySafeFilename } = require('@joplinapp/lib/path-utils'); -const time = require('@joplinapp/lib/time').default; +const Setting = require('@joplin/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note.js'); +const { friendlySafeFilename } = require('@joplin/lib/path-utils'); +const time = require('@joplin/lib/time').default; const md5 = require('md5'); const url = require('url'); diff --git a/packages/app-desktop/README.md b/packages/app-desktop/README.md index 974471dd4..f9f72b479 100644 --- a/packages/app-desktop/README.md +++ b/packages/app-desktop/README.md @@ -1,11 +1,11 @@ -# `@joplinapp/app-desktop` +# `@joplin/app-desktop` > TODO: description ## Usage ``` -const appDesktop = require('@joplinapp/app-desktop'); +const appDesktop = require('@joplin/app-desktop'); // TODO: DEMONSTRATE API ``` diff --git a/packages/app-desktop/app.ts b/packages/app-desktop/app.ts index c5050cb47..239fbbae0 100644 --- a/packages/app-desktop/app.ts +++ b/packages/app-desktop/app.ts @@ -1,43 +1,43 @@ -import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import KeymapService from '@joplinapp/lib/services/KeymapService'; -import PluginService from '@joplinapp/lib/services/plugins/PluginService'; -import resourceEditWatcherReducer, { defaultState as resourceEditWatcherDefaultState } from '@joplinapp/lib/services/ResourceEditWatcher/reducer'; -import { defaultState, State } from '@joplinapp/lib/reducer'; +import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index'; +import CommandService from '@joplin/lib/services/CommandService'; +import KeymapService from '@joplin/lib/services/KeymapService'; +import PluginService from '@joplin/lib/services/plugins/PluginService'; +import resourceEditWatcherReducer, { defaultState as resourceEditWatcherDefaultState } from '@joplin/lib/services/ResourceEditWatcher/reducer'; +import { defaultState, State } from '@joplin/lib/reducer'; import PluginRunner from './services/plugins/PluginRunner'; import PlatformImplementation from './services/plugins/PlatformImplementation'; -import shim from '@joplinapp/lib/shim'; -import AlarmService from '@joplinapp/lib/services/AlarmService'; -import AlarmServiceDriverNode from '@joplinapp/lib/services/AlarmServiceDriverNode'; -import Logger, { TargetType } from '@joplinapp/lib/Logger'; -import Setting from '@joplinapp/lib/models/Setting'; -import actionApi from '@joplinapp/lib/services/rest/actionApi.desktop'; -import BaseApplication from '@joplinapp/lib/BaseApplication'; -import { _, setLocale } from '@joplinapp/lib/locale'; -import SpellCheckerService from '@joplinapp/lib/services/spellChecker/SpellCheckerService'; +import shim from '@joplin/lib/shim'; +import AlarmService from '@joplin/lib/services/AlarmService'; +import AlarmServiceDriverNode from '@joplin/lib/services/AlarmServiceDriverNode'; +import Logger, { TargetType } from '@joplin/lib/Logger'; +import Setting from '@joplin/lib/models/Setting'; +import actionApi from '@joplin/lib/services/rest/actionApi.desktop'; +import BaseApplication from '@joplin/lib/BaseApplication'; +import { _, setLocale } from '@joplin/lib/locale'; +import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService'; import SpellCheckerServiceDriverNative from './services/spellChecker/SpellCheckerServiceDriverNative'; import bridge from './services/bridge'; import menuCommandNames from './gui/menuCommandNames'; -const { FoldersScreenUtils } = require('@joplinapp/lib/folders-screen-utils.js'); -const MasterKey = require('@joplinapp/lib/models/MasterKey'); -const Folder = require('@joplinapp/lib/models/Folder'); +const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js'); +const MasterKey = require('@joplin/lib/models/MasterKey'); +const Folder = require('@joplin/lib/models/Folder'); const fs = require('fs-extra'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const { reg } = require('@joplinapp/lib/registry.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const { reg } = require('@joplin/lib/registry.js'); const packageInfo = require('./packageInfo.js'); -const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker'); -const ResourceService = require('@joplinapp/lib/services/ResourceService'); -const ClipperServer = require('@joplinapp/lib/ClipperServer'); -const ExternalEditWatcher = require('@joplinapp/lib/services/ExternalEditWatcher'); +const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker'); +const ResourceService = require('@joplin/lib/services/ResourceService'); +const ClipperServer = require('@joplin/lib/ClipperServer'); +const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher'); const { webFrame } = require('electron'); const Menu = bridge().Menu; -const PluginManager = require('@joplinapp/lib/services/PluginManager'); -const RevisionService = require('@joplinapp/lib/services/RevisionService'); -const MigrationService = require('@joplinapp/lib/services/MigrationService'); -const TemplateUtils = require('@joplinapp/lib/TemplateUtils'); -const CssUtils = require('@joplinapp/lib/CssUtils'); -// const populateDatabase = require('@joplinapp/lib/services/debug/populateDatabase').default; +const PluginManager = require('@joplin/lib/services/PluginManager'); +const RevisionService = require('@joplin/lib/services/RevisionService'); +const MigrationService = require('@joplin/lib/services/MigrationService'); +const TemplateUtils = require('@joplin/lib/TemplateUtils'); +const CssUtils = require('@joplin/lib/CssUtils'); +// const populateDatabase = require('@joplin/lib/services/debug/populateDatabase').default; const commands = [ require('./gui/NoteListControls/commands/focusSearch'), @@ -83,9 +83,9 @@ const globalCommands = [ require('./commands/toggleExternalEditing'), require('./commands/copyDevCommand'), require('./commands/openProfileDirectory'), - require('@joplinapp/lib/commands/synchronize'), - require('@joplinapp/lib/commands/historyBackward'), - require('@joplinapp/lib/commands/historyForward'), + require('@joplin/lib/commands/synchronize'), + require('@joplin/lib/commands/historyBackward'), + require('@joplin/lib/commands/historyForward'), ]; const editorCommandDeclarations = require('./gui/NoteEditor/commands/editorCommandDeclarations').default; diff --git a/packages/app-desktop/bridge.ts b/packages/app-desktop/bridge.ts index 28ed140bb..72b7f311c 100644 --- a/packages/app-desktop/bridge.ts +++ b/packages/app-desktop/bridge.ts @@ -1,8 +1,8 @@ import ElectronAppWrapper from './ElectronAppWrapper'; -import shim from '@joplinapp/lib/shim'; +import shim from '@joplin/lib/shim'; -import { _, setLocale } from '@joplinapp/lib/locale'; -const { dirname, toSystemSlashes } = require('@joplinapp/lib/path-utils'); +import { _, setLocale } from '@joplin/lib/locale'; +const { dirname, toSystemSlashes } = require('@joplin/lib/path-utils'); const { BrowserWindow, nativeTheme } = require('electron'); interface LastSelectedPath { diff --git a/packages/app-desktop/checkForUpdates.js b/packages/app-desktop/checkForUpdates.js index 62ee9adf2..55efe423a 100644 --- a/packages/app-desktop/checkForUpdates.js +++ b/packages/app-desktop/checkForUpdates.js @@ -1,9 +1,9 @@ const { dialog } = require('electron'); -const shim = require('@joplinapp/lib/shim').default; -const Logger = require('@joplinapp/lib/Logger').default; -const { _ } = require('@joplinapp/lib/locale'); +const shim = require('@joplin/lib/shim').default; +const Logger = require('@joplin/lib/Logger').default; +const { _ } = require('@joplin/lib/locale'); const fetch = require('node-fetch'); -const { fileExtension } = require('@joplinapp/lib/path-utils'); +const { fileExtension } = require('@joplin/lib/path-utils'); const packageInfo = require('./packageInfo.js'); const compareVersions = require('compare-versions'); diff --git a/packages/app-desktop/commands/copyDevCommand.ts b/packages/app-desktop/commands/copyDevCommand.ts index 1b0cc6ed0..9c528af56 100644 --- a/packages/app-desktop/commands/copyDevCommand.ts +++ b/packages/app-desktop/commands/copyDevCommand.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; const app = require('electron').remote.app; const { clipboard } = require('electron'); diff --git a/packages/app-desktop/commands/focusElement.ts b/packages/app-desktop/commands/focusElement.ts index 134f58bd4..c6f55193e 100644 --- a/packages/app-desktop/commands/focusElement.ts +++ b/packages/app-desktop/commands/focusElement.ts @@ -1,4 +1,4 @@ -import CommandService, { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; +import CommandService, { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; export const declaration:CommandDeclaration = { name: 'focusElement', diff --git a/packages/app-desktop/commands/openProfileDirectory.ts b/packages/app-desktop/commands/openProfileDirectory.ts index b238ab2a6..71d792672 100644 --- a/packages/app-desktop/commands/openProfileDirectory.ts +++ b/packages/app-desktop/commands/openProfileDirectory.ts @@ -1,7 +1,7 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; import bridge from '../services/bridge'; -import Setting from '@joplinapp/lib/models/Setting'; +import Setting from '@joplin/lib/models/Setting'; export const declaration:CommandDeclaration = { name: 'openProfileDirectory', diff --git a/packages/app-desktop/commands/startExternalEditing.ts b/packages/app-desktop/commands/startExternalEditing.ts index fb0dc8f0f..519dac881 100644 --- a/packages/app-desktop/commands/startExternalEditing.ts +++ b/packages/app-desktop/commands/startExternalEditing.ts @@ -1,8 +1,8 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; -const Note = require('@joplinapp/lib/models/Note'); -const ExternalEditWatcher = require('@joplinapp/lib/services/ExternalEditWatcher'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; +const Note = require('@joplin/lib/models/Note'); +const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher'); const bridge = require('electron').remote.require('./bridge').default; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/commands/stopExternalEditing.ts b/packages/app-desktop/commands/stopExternalEditing.ts index bdf4d1054..fa4d23b21 100644 --- a/packages/app-desktop/commands/stopExternalEditing.ts +++ b/packages/app-desktop/commands/stopExternalEditing.ts @@ -1,7 +1,7 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; -const ExternalEditWatcher = require('@joplinapp/lib/services/ExternalEditWatcher'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; +const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher'); export const declaration:CommandDeclaration = { name: 'stopExternalEditing', diff --git a/packages/app-desktop/commands/toggleExternalEditing.ts b/packages/app-desktop/commands/toggleExternalEditing.ts index 97ec4ce5a..9097a7ded 100644 --- a/packages/app-desktop/commands/toggleExternalEditing.ts +++ b/packages/app-desktop/commands/toggleExternalEditing.ts @@ -1,6 +1,6 @@ -import CommandService, { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; +import CommandService, { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; import { DesktopCommandContext } from '../services/commands/types'; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/gui/ClipperConfigScreen.jsx b/packages/app-desktop/gui/ClipperConfigScreen.jsx index 8b66f5306..20e31b51b 100644 --- a/packages/app-desktop/gui/ClipperConfigScreen.jsx +++ b/packages/app-desktop/gui/ClipperConfigScreen.jsx @@ -1,10 +1,10 @@ const React = require('react'); const { connect } = require('react-redux'); const bridge = require('electron').remote.require('./bridge').default; -const { themeStyle } = require('@joplinapp/lib/theme'); -const { _ } = require('@joplinapp/lib/locale'); -const ClipperServer = require('@joplinapp/lib/ClipperServer'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const { themeStyle } = require('@joplin/lib/theme'); +const { _ } = require('@joplin/lib/locale'); +const ClipperServer = require('@joplin/lib/ClipperServer'); +const Setting = require('@joplin/lib/models/Setting').default; const { clipboard } = require('electron'); const ExtensionBadge = require('./ExtensionBadge.min'); diff --git a/packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx b/packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx index 204fa909f..823296585 100644 --- a/packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ButtonBar.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import Button, { ButtonLevel } from '../Button/Button'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const styled = require('styled-components').default; interface Props { diff --git a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx index df3e988b3..5838241e2 100644 --- a/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx +++ b/packages/app-desktop/gui/ConfigScreen/ConfigScreen.tsx @@ -2,13 +2,13 @@ import * as React from 'react'; import SideBar from './SideBar'; import ButtonBar from './ButtonBar'; import Button, { ButtonLevel } from '../Button/Button'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { themeStyle } = require('@joplinapp/lib/theme'); -const pathUtils = require('@joplinapp/lib/path-utils'); -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry'); -const shared = require('@joplinapp/lib/components/shared/config-shared.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const { themeStyle } = require('@joplin/lib/theme'); +const pathUtils = require('@joplin/lib/path-utils'); +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry'); +const shared = require('@joplin/lib/components/shared/config-shared.js'); const bridge = require('electron').remote.require('./bridge').default; const { EncryptionConfigScreen } = require('../EncryptionConfigScreen.min'); const { ClipperConfigScreen } = require('../ClipperConfigScreen.min'); diff --git a/packages/app-desktop/gui/ConfigScreen/SideBar.tsx b/packages/app-desktop/gui/ConfigScreen/SideBar.tsx index a3c2f7be0..a43b5a60c 100644 --- a/packages/app-desktop/gui/ConfigScreen/SideBar.tsx +++ b/packages/app-desktop/gui/ConfigScreen/SideBar.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; const styled = require('styled-components').default; -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; interface Props { selection: string, diff --git a/packages/app-desktop/gui/DialogButtonRow.jsx b/packages/app-desktop/gui/DialogButtonRow.jsx index 8fa910a7f..cf87a6871 100644 --- a/packages/app-desktop/gui/DialogButtonRow.jsx +++ b/packages/app-desktop/gui/DialogButtonRow.jsx @@ -1,6 +1,6 @@ const React = require('react'); -const { _ } = require('@joplinapp/lib/locale'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { _ } = require('@joplin/lib/locale'); +const { themeStyle } = require('@joplin/lib/theme'); function DialogButtonRow(props) { const theme = themeStyle(props.themeId); diff --git a/packages/app-desktop/gui/DropboxLoginScreen.tsx b/packages/app-desktop/gui/DropboxLoginScreen.tsx index 105435cd2..991a92069 100644 --- a/packages/app-desktop/gui/DropboxLoginScreen.tsx +++ b/packages/app-desktop/gui/DropboxLoginScreen.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import ButtonBar from './ConfigScreen/ButtonBar'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); const bridge = require('electron').remote.require('./bridge').default; -const { themeStyle } = require('@joplinapp/lib/theme'); -const Shared = require('@joplinapp/lib/components/shared/dropbox-login-shared'); +const { themeStyle } = require('@joplin/lib/theme'); +const Shared = require('@joplin/lib/components/shared/dropbox-login-shared'); interface Props { themeId: string, diff --git a/packages/app-desktop/gui/EncryptionConfigScreen.jsx b/packages/app-desktop/gui/EncryptionConfigScreen.jsx index 63b0ddbf6..faa9a0715 100644 --- a/packages/app-desktop/gui/EncryptionConfigScreen.jsx +++ b/packages/app-desktop/gui/EncryptionConfigScreen.jsx @@ -1,13 +1,13 @@ const React = require('react'); const { connect } = require('react-redux'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const { _ } = require('@joplinapp/lib/locale'); -const time = require('@joplinapp/lib/time').default; -const shim = require('@joplinapp/lib/shim').default; +const Setting = require('@joplin/lib/models/Setting').default; +const EncryptionService = require('@joplin/lib/services/EncryptionService'); +const { themeStyle } = require('@joplin/lib/theme'); +const { _ } = require('@joplin/lib/locale'); +const time = require('@joplin/lib/time').default; +const shim = require('@joplin/lib/shim').default; const dialogs = require('./dialogs'); -const shared = require('@joplinapp/lib/components/shared/encryption-config-shared.js'); +const shared = require('@joplin/lib/components/shared/encryption-config-shared.js'); const bridge = require('electron').remote.require('./bridge').default; class EncryptionConfigScreenComponent extends React.Component { diff --git a/packages/app-desktop/gui/ErrorBoundary.tsx b/packages/app-desktop/gui/ErrorBoundary.tsx index 425a5c54c..767ee15e4 100644 --- a/packages/app-desktop/gui/ErrorBoundary.tsx +++ b/packages/app-desktop/gui/ErrorBoundary.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import versionInfo from '@joplinapp/lib/versionInfo'; +import versionInfo from '@joplin/lib/versionInfo'; const packageInfo = require('../packageInfo.js'); const ipcRenderer = require('electron').ipcRenderer; diff --git a/packages/app-desktop/gui/ExtensionBadge.jsx b/packages/app-desktop/gui/ExtensionBadge.jsx index 1334fb938..3249782ac 100644 --- a/packages/app-desktop/gui/ExtensionBadge.jsx +++ b/packages/app-desktop/gui/ExtensionBadge.jsx @@ -1,7 +1,7 @@ const React = require('react'); const bridge = require('electron').remote.require('./bridge').default; const styleSelector = require('./style/ExtensionBadge'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); function platformAssets(type) { if (type === 'firefox') { diff --git a/packages/app-desktop/gui/HelpButton.jsx b/packages/app-desktop/gui/HelpButton.jsx index 91a6da454..3b646688f 100644 --- a/packages/app-desktop/gui/HelpButton.jsx +++ b/packages/app-desktop/gui/HelpButton.jsx @@ -1,6 +1,6 @@ const React = require('react'); const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); class HelpButtonComponent extends React.Component { constructor() { diff --git a/packages/app-desktop/gui/IconButton.jsx b/packages/app-desktop/gui/IconButton.jsx index 23f1a81b0..239539271 100644 --- a/packages/app-desktop/gui/IconButton.jsx +++ b/packages/app-desktop/gui/IconButton.jsx @@ -1,5 +1,5 @@ const React = require('react'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); class IconButton extends React.Component { render() { diff --git a/packages/app-desktop/gui/ImportScreen.jsx b/packages/app-desktop/gui/ImportScreen.jsx index 9f15384f0..d125d9eb1 100644 --- a/packages/app-desktop/gui/ImportScreen.jsx +++ b/packages/app-desktop/gui/ImportScreen.jsx @@ -1,10 +1,10 @@ const React = require('react'); const { connect } = require('react-redux'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const { _ } = require('@joplinapp/lib/locale'); -const { filename, basename } = require('@joplinapp/lib/path-utils'); -const { importEnex } = require('@joplinapp/lib/import-enex'); +const Folder = require('@joplin/lib/models/Folder.js'); +const { themeStyle } = require('@joplin/lib/theme'); +const { _ } = require('@joplin/lib/locale'); +const { filename, basename } = require('@joplin/lib/path-utils'); +const { importEnex } = require('@joplin/lib/import-enex'); class ImportScreenComponent extends React.Component { UNSAFE_componentWillMount() { diff --git a/packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx b/packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx index 168f4de62..202a33d44 100644 --- a/packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx +++ b/packages/app-desktop/gui/KeymapConfig/KeymapConfigScreen.tsx @@ -1,16 +1,16 @@ import * as React from 'react'; import { useState } from 'react'; -import KeymapService, { KeymapItem } from '@joplinapp/lib/services/KeymapService'; +import KeymapService, { KeymapItem } from '@joplin/lib/services/KeymapService'; import { ShortcutRecorder } from './ShortcutRecorder'; import getLabel from './utils/getLabel'; import useKeymap from './utils/useKeymap'; import useCommandStatus from './utils/useCommandStatus'; import styles_ from './styles'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const bridge = require('electron').remote.require('./bridge').default; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; const keymapService = KeymapService.instance(); diff --git a/packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx b/packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx index f47120dc6..2eb0ea435 100644 --- a/packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx +++ b/packages/app-desktop/gui/KeymapConfig/ShortcutRecorder.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { useState, useEffect, KeyboardEvent } from 'react'; -import KeymapService from '@joplinapp/lib/services/KeymapService'; +import KeymapService from '@joplin/lib/services/KeymapService'; import styles_ from './styles'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const keymapService = KeymapService.instance(); export interface ShortcutRecorderProps { diff --git a/packages/app-desktop/gui/KeymapConfig/styles/index.ts b/packages/app-desktop/gui/KeymapConfig/styles/index.ts index e9612894d..d4250104e 100644 --- a/packages/app-desktop/gui/KeymapConfig/styles/index.ts +++ b/packages/app-desktop/gui/KeymapConfig/styles/index.ts @@ -1,4 +1,4 @@ -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); export default function styles(themeId: number) { return buildStyle('KeymapConfigScreen', themeId, (theme: any) => { diff --git a/packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts b/packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts index e40407a96..99355766b 100644 --- a/packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts +++ b/packages/app-desktop/gui/KeymapConfig/utils/getLabel.ts @@ -1,7 +1,7 @@ -import CommandService from '@joplinapp/lib/services/CommandService'; -import shim from '@joplinapp/lib/shim'; +import CommandService from '@joplin/lib/services/CommandService'; +import shim from '@joplin/lib/shim'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const commandService = CommandService.instance(); diff --git a/packages/app-desktop/gui/KeymapConfig/utils/useCommandStatus.ts b/packages/app-desktop/gui/KeymapConfig/utils/useCommandStatus.ts index 5511c712c..5e804abe4 100644 --- a/packages/app-desktop/gui/KeymapConfig/utils/useCommandStatus.ts +++ b/packages/app-desktop/gui/KeymapConfig/utils/useCommandStatus.ts @@ -1,5 +1,5 @@ import { useState } from 'react'; -import KeymapService from '@joplinapp/lib/services/KeymapService'; +import KeymapService from '@joplin/lib/services/KeymapService'; const keymapService = KeymapService.instance(); diff --git a/packages/app-desktop/gui/KeymapConfig/utils/useKeymap.ts b/packages/app-desktop/gui/KeymapConfig/utils/useKeymap.ts index 8b1e53244..666380404 100644 --- a/packages/app-desktop/gui/KeymapConfig/utils/useKeymap.ts +++ b/packages/app-desktop/gui/KeymapConfig/utils/useKeymap.ts @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import KeymapService, { KeymapItem } from '@joplinapp/lib/services/KeymapService'; +import KeymapService, { KeymapItem } from '@joplin/lib/services/KeymapService'; import getLabel from './getLabel'; const keymapService = KeymapService.instance(); diff --git a/packages/app-desktop/gui/MainScreen/MainScreen.tsx b/packages/app-desktop/gui/MainScreen/MainScreen.tsx index 42eb81a23..2938f6994 100644 --- a/packages/app-desktop/gui/MainScreen/MainScreen.tsx +++ b/packages/app-desktop/gui/MainScreen/MainScreen.tsx @@ -5,29 +5,29 @@ import NoteEditor from '../NoteEditor/NoteEditor'; import NoteContentPropertiesDialog from '../NoteContentPropertiesDialog'; import ShareNoteDialog from '../ShareNoteDialog'; import NoteListControls from '../NoteListControls/NoteListControls'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import PluginService from '@joplinapp/lib/services/plugins/PluginService'; -import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer'; +import CommandService from '@joplin/lib/services/CommandService'; +import PluginService from '@joplin/lib/services/plugins/PluginService'; +import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer'; import SideBar from '../SideBar/SideBar'; import UserWebview from '../../services/plugins/UserWebview'; import UserWebviewDialog from '../../services/plugins/UserWebviewDialog'; -import { ContainerType } from '@joplinapp/lib/services/plugins/WebviewController'; -import { stateUtils } from '@joplinapp/lib/reducer'; +import { ContainerType } from '@joplin/lib/services/plugins/WebviewController'; +import { stateUtils } from '@joplin/lib/reducer'; import InteropServiceHelper from '../../InteropServiceHelper'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const produce = require('immer').default; const { connect } = require('react-redux'); const { PromptDialog } = require('../PromptDialog.min.js'); const NotePropertiesDialog = require('../NotePropertiesDialog.min.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const shim = require('@joplinapp/lib/shim').default; -const { themeStyle } = require('@joplinapp/lib/theme.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const shim = require('@joplin/lib/shim').default; +const { themeStyle } = require('@joplin/lib/theme.js'); const bridge = require('electron').remote.require('./bridge').default; -const PluginManager = require('@joplinapp/lib/services/PluginManager'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); +const PluginManager = require('@joplin/lib/services/PluginManager'); +const EncryptionService = require('@joplin/lib/services/EncryptionService'); const ipcRenderer = require('electron').ipcRenderer; -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const styled = require('styled-components').default; const StyledUserWebviewDialogContainer = styled.div` diff --git a/packages/app-desktop/gui/MainScreen/commands/editAlarm.ts b/packages/app-desktop/gui/MainScreen/commands/editAlarm.ts index 38695cbe0..3abfd4e0d 100644 --- a/packages/app-desktop/gui/MainScreen/commands/editAlarm.ts +++ b/packages/app-desktop/gui/MainScreen/commands/editAlarm.ts @@ -1,9 +1,9 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import eventManager from '@joplinapp/lib/eventManager'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; -const Note = require('@joplinapp/lib/models/Note'); -const time = require('@joplinapp/lib/time').default; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import eventManager from '@joplin/lib/eventManager'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; +const Note = require('@joplin/lib/models/Note'); +const time = require('@joplin/lib/time').default; export const declaration:CommandDeclaration = { name: 'editAlarm', diff --git a/packages/app-desktop/gui/MainScreen/commands/exportPdf.ts b/packages/app-desktop/gui/MainScreen/commands/exportPdf.ts index 69bacd89a..261dbc373 100644 --- a/packages/app-desktop/gui/MainScreen/commands/exportPdf.ts +++ b/packages/app-desktop/gui/MainScreen/commands/exportPdf.ts @@ -1,8 +1,8 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import shim from '@joplinapp/lib/shim'; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import shim from '@joplin/lib/shim'; import InteropServiceHelper from '../../../InteropServiceHelper'; -import { _ } from '@joplinapp/lib/locale'; -const Note = require('@joplinapp/lib/models/Note'); +import { _ } from '@joplin/lib/locale'; +const Note = require('@joplin/lib/models/Note'); const bridge = require('electron').remote.require('./bridge').default; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/gui/MainScreen/commands/hideModalMessage.ts b/packages/app-desktop/gui/MainScreen/commands/hideModalMessage.ts index 172ccdf30..3e6357c0e 100644 --- a/packages/app-desktop/gui/MainScreen/commands/hideModalMessage.ts +++ b/packages/app-desktop/gui/MainScreen/commands/hideModalMessage.ts @@ -1,4 +1,4 @@ -import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; +import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; export const declaration:CommandDeclaration = { name: 'hideModalMessage', diff --git a/packages/app-desktop/gui/MainScreen/commands/moveToFolder.ts b/packages/app-desktop/gui/MainScreen/commands/moveToFolder.ts index e99202778..8478f5735 100644 --- a/packages/app-desktop/gui/MainScreen/commands/moveToFolder.ts +++ b/packages/app-desktop/gui/MainScreen/commands/moveToFolder.ts @@ -1,7 +1,7 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const Folder = require('@joplinapp/lib/models/Folder'); -const Note = require('@joplinapp/lib/models/Note'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const Folder = require('@joplin/lib/models/Folder'); +const Note = require('@joplin/lib/models/Note'); export const declaration:CommandDeclaration = { name: 'moveToFolder', diff --git a/packages/app-desktop/gui/MainScreen/commands/newFolder.ts b/packages/app-desktop/gui/MainScreen/commands/newFolder.ts index 63d037321..bf9fbc242 100644 --- a/packages/app-desktop/gui/MainScreen/commands/newFolder.ts +++ b/packages/app-desktop/gui/MainScreen/commands/newFolder.ts @@ -1,6 +1,6 @@ -import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const Folder = require('@joplinapp/lib/models/Folder'); +import { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const Folder = require('@joplin/lib/models/Folder'); const bridge = require('electron').remote.require('./bridge').default; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/gui/MainScreen/commands/newNote.ts b/packages/app-desktop/gui/MainScreen/commands/newNote.ts index 574417ca4..3a29bc006 100644 --- a/packages/app-desktop/gui/MainScreen/commands/newNote.ts +++ b/packages/app-desktop/gui/MainScreen/commands/newNote.ts @@ -1,8 +1,8 @@ -import { utils, CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const Setting = require('@joplinapp/lib/models/Setting').default; -const Note = require('@joplinapp/lib/models/Note'); -const TemplateUtils = require('@joplinapp/lib/TemplateUtils'); +import { utils, CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const Setting = require('@joplin/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note'); +const TemplateUtils = require('@joplin/lib/TemplateUtils'); export const declaration:CommandDeclaration = { name: 'newNote', diff --git a/packages/app-desktop/gui/MainScreen/commands/newSubFolder.ts b/packages/app-desktop/gui/MainScreen/commands/newSubFolder.ts index 00e39f198..5e5e26312 100644 --- a/packages/app-desktop/gui/MainScreen/commands/newSubFolder.ts +++ b/packages/app-desktop/gui/MainScreen/commands/newSubFolder.ts @@ -1,5 +1,5 @@ -import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'newSubFolder', diff --git a/packages/app-desktop/gui/MainScreen/commands/newTodo.ts b/packages/app-desktop/gui/MainScreen/commands/newTodo.ts index bfca7a11b..62f9c1aee 100644 --- a/packages/app-desktop/gui/MainScreen/commands/newTodo.ts +++ b/packages/app-desktop/gui/MainScreen/commands/newTodo.ts @@ -1,5 +1,5 @@ -import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import CommandService, { CommandContext, CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'newTodo', diff --git a/packages/app-desktop/gui/MainScreen/commands/openFolder.ts b/packages/app-desktop/gui/MainScreen/commands/openFolder.ts index 58fbae0f8..c5bb9cfe3 100644 --- a/packages/app-desktop/gui/MainScreen/commands/openFolder.ts +++ b/packages/app-desktop/gui/MainScreen/commands/openFolder.ts @@ -1,4 +1,4 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; export const declaration:CommandDeclaration = { name: 'openFolder', diff --git a/packages/app-desktop/gui/MainScreen/commands/openNote.ts b/packages/app-desktop/gui/MainScreen/commands/openNote.ts index 51eaf76c8..c60ea2116 100644 --- a/packages/app-desktop/gui/MainScreen/commands/openNote.ts +++ b/packages/app-desktop/gui/MainScreen/commands/openNote.ts @@ -1,6 +1,6 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -const Note = require('@joplinapp/lib/models/Note'); -const Folder = require('@joplinapp/lib/models/Folder'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +const Note = require('@joplin/lib/models/Note'); +const Folder = require('@joplin/lib/models/Folder'); export const declaration:CommandDeclaration = { name: 'openNote', diff --git a/packages/app-desktop/gui/MainScreen/commands/openTag.ts b/packages/app-desktop/gui/MainScreen/commands/openTag.ts index 2ea7dcc3b..aa9497d82 100644 --- a/packages/app-desktop/gui/MainScreen/commands/openTag.ts +++ b/packages/app-desktop/gui/MainScreen/commands/openTag.ts @@ -1,4 +1,4 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; export const declaration:CommandDeclaration = { name: 'openTag', diff --git a/packages/app-desktop/gui/MainScreen/commands/print.ts b/packages/app-desktop/gui/MainScreen/commands/print.ts index 1064579f1..3c27f9d31 100644 --- a/packages/app-desktop/gui/MainScreen/commands/print.ts +++ b/packages/app-desktop/gui/MainScreen/commands/print.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; const bridge = require('electron').remote.require('./bridge').default; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/gui/MainScreen/commands/renameFolder.ts b/packages/app-desktop/gui/MainScreen/commands/renameFolder.ts index 69e4d0336..f6e8cac63 100644 --- a/packages/app-desktop/gui/MainScreen/commands/renameFolder.ts +++ b/packages/app-desktop/gui/MainScreen/commands/renameFolder.ts @@ -1,6 +1,6 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const Folder = require('@joplinapp/lib/models/Folder'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const Folder = require('@joplin/lib/models/Folder'); const bridge = require('electron').remote.require('./bridge').default; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/gui/MainScreen/commands/renameTag.ts b/packages/app-desktop/gui/MainScreen/commands/renameTag.ts index db147ad56..ba60c7276 100644 --- a/packages/app-desktop/gui/MainScreen/commands/renameTag.ts +++ b/packages/app-desktop/gui/MainScreen/commands/renameTag.ts @@ -1,6 +1,6 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const Tag = require('@joplinapp/lib/models/Tag'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const Tag = require('@joplin/lib/models/Tag'); const bridge = require('electron').remote.require('./bridge').default; export const declaration:CommandDeclaration = { diff --git a/packages/app-desktop/gui/MainScreen/commands/search.ts b/packages/app-desktop/gui/MainScreen/commands/search.ts index 93c5830cd..a92be0207 100644 --- a/packages/app-desktop/gui/MainScreen/commands/search.ts +++ b/packages/app-desktop/gui/MainScreen/commands/search.ts @@ -1,6 +1,6 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const uuid = require('@joplinapp/lib/uuid').default; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +const BaseModel = require('@joplin/lib/BaseModel').default; +const uuid = require('@joplin/lib/uuid').default; export const declaration:CommandDeclaration = { name: 'search', diff --git a/packages/app-desktop/gui/MainScreen/commands/selectTemplate.ts b/packages/app-desktop/gui/MainScreen/commands/selectTemplate.ts index 01137b0f4..9242d6b3b 100644 --- a/packages/app-desktop/gui/MainScreen/commands/selectTemplate.ts +++ b/packages/app-desktop/gui/MainScreen/commands/selectTemplate.ts @@ -1,6 +1,6 @@ -import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const TemplateUtils = require('@joplinapp/lib/TemplateUtils'); +import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const TemplateUtils = require('@joplin/lib/TemplateUtils'); export const declaration:CommandDeclaration = { name: 'selectTemplate', diff --git a/packages/app-desktop/gui/MainScreen/commands/setTags.ts b/packages/app-desktop/gui/MainScreen/commands/setTags.ts index c3308157c..e6f099e22 100644 --- a/packages/app-desktop/gui/MainScreen/commands/setTags.ts +++ b/packages/app-desktop/gui/MainScreen/commands/setTags.ts @@ -1,6 +1,6 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -const Tag = require('@joplinapp/lib/models/Tag'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +const Tag = require('@joplin/lib/models/Tag'); export const declaration:CommandDeclaration = { name: 'setTags', diff --git a/packages/app-desktop/gui/MainScreen/commands/showModalMessage.tsx b/packages/app-desktop/gui/MainScreen/commands/showModalMessage.tsx index a4a7e120c..a463ff51a 100644 --- a/packages/app-desktop/gui/MainScreen/commands/showModalMessage.tsx +++ b/packages/app-desktop/gui/MainScreen/commands/showModalMessage.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService'; +import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService'; export const declaration:CommandDeclaration = { name: 'showModalMessage', diff --git a/packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.ts b/packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.ts index fe60e3501..1b355b8d9 100644 --- a/packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.ts +++ b/packages/app-desktop/gui/MainScreen/commands/showNoteContentProperties.ts @@ -1,7 +1,7 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; -const Note = require('@joplinapp/lib/models/Note'); +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; +const Note = require('@joplin/lib/models/Note'); export const declaration:CommandDeclaration = { name: 'showNoteContentProperties', diff --git a/packages/app-desktop/gui/MainScreen/commands/showNoteProperties.ts b/packages/app-desktop/gui/MainScreen/commands/showNoteProperties.ts index 2335c2f00..656459880 100644 --- a/packages/app-desktop/gui/MainScreen/commands/showNoteProperties.ts +++ b/packages/app-desktop/gui/MainScreen/commands/showNoteProperties.ts @@ -1,6 +1,6 @@ -import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; +import CommandService, { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; export const declaration:CommandDeclaration = { name: 'showNoteProperties', diff --git a/packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts b/packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts index 211bf5758..66f41b969 100644 --- a/packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts +++ b/packages/app-desktop/gui/MainScreen/commands/showShareNoteDialog.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'showShareNoteDialog', diff --git a/packages/app-desktop/gui/MainScreen/commands/toggleEditors.ts b/packages/app-desktop/gui/MainScreen/commands/toggleEditors.ts index db7393c4d..3cd7afa7b 100644 --- a/packages/app-desktop/gui/MainScreen/commands/toggleEditors.ts +++ b/packages/app-desktop/gui/MainScreen/commands/toggleEditors.ts @@ -1,7 +1,7 @@ -import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService'; -import Setting from '@joplinapp/lib/models/Setting'; -import { stateUtils } from '@joplinapp/lib/reducer'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService'; +import Setting from '@joplin/lib/models/Setting'; +import { stateUtils } from '@joplin/lib/reducer'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'toggleEditors', diff --git a/packages/app-desktop/gui/MainScreen/commands/toggleNoteList.ts b/packages/app-desktop/gui/MainScreen/commands/toggleNoteList.ts index 4e575b760..f75b641a5 100644 --- a/packages/app-desktop/gui/MainScreen/commands/toggleNoteList.ts +++ b/packages/app-desktop/gui/MainScreen/commands/toggleNoteList.ts @@ -1,5 +1,5 @@ -import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'toggleNoteList', diff --git a/packages/app-desktop/gui/MainScreen/commands/toggleSideBar.ts b/packages/app-desktop/gui/MainScreen/commands/toggleSideBar.ts index 8fffa8be8..383f76622 100644 --- a/packages/app-desktop/gui/MainScreen/commands/toggleSideBar.ts +++ b/packages/app-desktop/gui/MainScreen/commands/toggleSideBar.ts @@ -1,5 +1,5 @@ -import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'toggleSideBar', diff --git a/packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.ts b/packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.ts index 255988b71..e3713ad78 100644 --- a/packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.ts +++ b/packages/app-desktop/gui/MainScreen/commands/toggleVisiblePanes.ts @@ -1,5 +1,5 @@ -import { CommandDeclaration, CommandRuntime } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandDeclaration, CommandRuntime } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'toggleVisiblePanes', diff --git a/packages/app-desktop/gui/MenuBar.tsx b/packages/app-desktop/gui/MenuBar.tsx index 8e372010f..219677341 100644 --- a/packages/app-desktop/gui/MenuBar.tsx +++ b/packages/app-desktop/gui/MenuBar.tsx @@ -1,30 +1,30 @@ import { useEffect, useState, useRef, useCallback } from 'react'; import { AppState } from '../app'; -import InteropService from '@joplinapp/lib/services/interop/InteropService'; -import { stateUtils } from '@joplinapp/lib/reducer'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils'; -import KeymapService from '@joplinapp/lib/services/KeymapService'; -import { PluginStates, utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer'; -import shim from '@joplinapp/lib/shim'; -import Setting from '@joplinapp/lib/models/Setting'; -import versionInfo from '@joplinapp/lib/versionInfo'; -import { Module } from '@joplinapp/lib/services/interop/types'; +import InteropService from '@joplin/lib/services/interop/InteropService'; +import { stateUtils } from '@joplin/lib/reducer'; +import CommandService from '@joplin/lib/services/CommandService'; +import MenuUtils from '@joplin/lib/services/commands/MenuUtils'; +import KeymapService from '@joplin/lib/services/KeymapService'; +import { PluginStates, utils as pluginUtils } from '@joplin/lib/services/plugins/reducer'; +import shim from '@joplin/lib/shim'; +import Setting from '@joplin/lib/models/Setting'; +import versionInfo from '@joplin/lib/versionInfo'; +import { Module } from '@joplin/lib/services/interop/types'; import InteropServiceHelper from '../InteropServiceHelper'; -import { _ } from '@joplinapp/lib/locale'; -import { MenuItem, MenuItemLocation } from '@joplinapp/lib/services/plugins/api/types'; -import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext'; -import SpellCheckerService from '@joplinapp/lib/services/spellChecker/SpellCheckerService'; +import { _ } from '@joplin/lib/locale'; +import { MenuItem, MenuItemLocation } from '@joplin/lib/services/plugins/api/types'; +import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext'; +import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService'; import menuCommandNames from './menuCommandNames'; const { connect } = require('react-redux'); -const { reg } = require('@joplinapp/lib/registry.js'); +const { reg } = require('@joplin/lib/registry.js'); const packageInfo = require('../packageInfo.js'); const bridge = require('electron').remote.require('./bridge').default; const { shell, clipboard } = require('electron'); const Menu = bridge().Menu; -const PluginManager = require('@joplinapp/lib/services/PluginManager'); -const TemplateUtils = require('@joplinapp/lib/TemplateUtils'); +const PluginManager = require('@joplin/lib/services/PluginManager'); +const TemplateUtils = require('@joplin/lib/TemplateUtils'); const menuUtils = new MenuUtils(CommandService.instance()); diff --git a/packages/app-desktop/gui/MultiNoteActions.tsx b/packages/app-desktop/gui/MultiNoteActions.tsx index 3ac0e9f0f..6089857cb 100644 --- a/packages/app-desktop/gui/MultiNoteActions.tsx +++ b/packages/app-desktop/gui/MultiNoteActions.tsx @@ -1,8 +1,8 @@ -import { PluginStates } from '@joplinapp/lib/services/plugins/reducer'; +import { PluginStates } from '@joplin/lib/services/plugins/reducer'; import * as React from 'react'; import NoteListUtils from './utils/NoteListUtils'; -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); const bridge = require('electron').remote.require('./bridge').default; interface MultiNoteActionsProps { diff --git a/packages/app-desktop/gui/Navigator.jsx b/packages/app-desktop/gui/Navigator.jsx index 10023d099..48e5d5590 100644 --- a/packages/app-desktop/gui/Navigator.jsx +++ b/packages/app-desktop/gui/Navigator.jsx @@ -1,6 +1,6 @@ const React = require('react'); const Component = React.Component; -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; const { connect } = require('react-redux'); const bridge = require('electron').remote.require('./bridge').default; diff --git a/packages/app-desktop/gui/NoteContentPropertiesDialog.tsx b/packages/app-desktop/gui/NoteContentPropertiesDialog.tsx index ba8f0b130..0363bd7d1 100644 --- a/packages/app-desktop/gui/NoteContentPropertiesDialog.tsx +++ b/packages/app-desktop/gui/NoteContentPropertiesDialog.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { useState, useEffect } from 'react'; -import { _ } from '@joplinapp/lib/locale'; -const { themeStyle } = require('@joplinapp/lib/theme'); +import { _ } from '@joplin/lib/locale'; +const { themeStyle } = require('@joplin/lib/theme'); const DialogButtonRow = require('./DialogButtonRow.min'); const Countable = require('countable'); -const markupLanguageUtils = require('@joplinapp/lib/markupLanguageUtils').default; +const markupLanguageUtils = require('@joplin/lib/markupLanguageUtils').default; interface NoteContentPropertiesDialogProps { themeId: number, diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx index 28df88dfe..9b9128834 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/CodeMirror.tsx @@ -12,20 +12,20 @@ import { RenderedBody, defaultRenderedBody } from './utils/types'; import NoteTextViewer from '../../../NoteTextViewer'; import Editor from './Editor'; import usePluginServiceRegistration from '../../utils/usePluginServiceRegistration'; -import Setting from '@joplinapp/lib/models/Setting'; -import { _ } from '@joplinapp/lib/locale'; +import Setting from '@joplin/lib/models/Setting'; +import { _ } from '@joplin/lib/locale'; import bridge from '../../../../services/bridge'; -import markdownUtils from '@joplinapp/lib/markdownUtils'; -import shim from '@joplinapp/lib/shim'; +import markdownUtils from '@joplin/lib/markdownUtils'; +import shim from '@joplin/lib/shim'; -const Note = require('@joplinapp/lib/models/Note.js'); +const Note = require('@joplin/lib/models/Note.js'); const { clipboard } = require('electron'); -const shared = require('@joplinapp/lib/components/shared/note-screen-shared.js'); +const shared = require('@joplin/lib/components/shared/note-screen-shared.js'); const Menu = bridge().Menu; const MenuItem = bridge().MenuItem; -const { reg } = require('@joplinapp/lib/registry.js'); +const { reg } = require('@joplin/lib/registry.js'); const dialogs = require('../../../dialogs'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); function markupRenderOptions(override: any = null) { return { ...override }; diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx index 01512a3e4..90e10c301 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx @@ -25,9 +25,9 @@ import 'codemirror/keymap/sublime'; // Used for swapLineUp and swapLineDown import 'codemirror/mode/meta'; -// import eventManager from '@joplinapp/lib/eventManager'; +// import eventManager from '@joplin/lib/eventManager'; -const { reg } = require('@joplinapp/lib/registry.js'); +const { reg } = require('@joplin/lib/registry.js'); // Based on http://pypl.github.io/PYPL.html const topLanguages = [ diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx index 52125a2dc..4c6084584 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import CommandService from '@joplin/lib/services/CommandService'; import ToolbarBase from '../../../ToolbarBase'; -import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer'; +import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer'; import { connect } from 'react-redux'; import { AppState } from '../../../../app'; -import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; -import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext'; -const { buildStyle } = require('@joplinapp/lib/theme'); +import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils'; +import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext'; +const { buildStyle } = require('@joplin/lib/theme'); interface ToolbarProps { themeId: number, diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.ts index f440e07bc..4e0902097 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.ts @@ -1,5 +1,5 @@ import { NoteBodyEditorProps } from '../../../utils/types'; -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); export default function styles(props: NoteBodyEditorProps) { return buildStyle('CodeMirror', props.themeId, (theme: any) => { diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.ts index a1248cbff..e4da8ca2f 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.ts @@ -1,5 +1,5 @@ import { useEffect, useCallback, useRef, useState } from 'react'; -import shim from '@joplinapp/lib/shim'; +import shim from '@joplin/lib/shim'; export function cursorPositionToTextOffset(cursorPos: any, body: string) { if (!body) return 0; diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.ts index aec146f0d..08fe2964a 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.ts @@ -1,5 +1,5 @@ import { useEffect, useRef, useState } from 'react'; -import shim from '@joplinapp/lib/shim'; +import shim from '@joplin/lib/shim'; export default function useEditorSearch(CodeMirror: any) { diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.ts index a8e530340..b5d503053 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinMode.ts @@ -1,6 +1,6 @@ import 'codemirror/addon/mode/multiplex'; import 'codemirror/mode/stex/stex'; -import Setting from '@joplinapp/lib/models/Setting'; +import Setting from '@joplin/lib/models/Setting'; // Joplin markdown is a the same as markdown mode, but it has configured defaults // and support for katex math blocks diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.ts index 9750fb783..989db4569 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useKeymap.ts @@ -1,6 +1,6 @@ import { useEffect } from 'react'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import shim from '@joplinapp/lib/shim'; +import CommandService from '@joplin/lib/services/CommandService'; +import shim from '@joplin/lib/shim'; export default function useKeymap(CodeMirror: any) { diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts index c5a51f84b..4006ddf4f 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useListIdent.ts @@ -1,4 +1,4 @@ -const { isListItem, isEmptyListItem, extractListToken, olLineNumber } = require('@joplinapp/lib/markdownUtils').default; +const { isListItem, isEmptyListItem, extractListToken, olLineNumber } = require('@joplin/lib/markdownUtils').default; // Markdown list indentation. // If the current line starts with `markup.list` token, diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx index cc0ecf790..707eb347b 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx @@ -4,21 +4,21 @@ import { ScrollOptions, ScrollOptionTypes, EditorCommand, NoteBodyEditorProps } import { resourcesStatus, commandAttachFileToBody, handlePasteEvent } from '../../utils/resourceHandling'; import useScroll from './utils/useScroll'; import styles_ from './styles'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; +import CommandService from '@joplin/lib/services/CommandService'; +import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils'; import ToggleEditorsButton, { Value as ToggleEditorsButtonValue } from '../../../ToggleEditorsButton/ToggleEditorsButton'; import ToolbarButton from '../../../../gui/ToolbarButton/ToolbarButton'; import usePluginServiceRegistration from '../../utils/usePluginServiceRegistration'; -import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer'; -import { _, closestSupportedLocale } from '@joplinapp/lib/locale'; +import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer'; +import { _, closestSupportedLocale } from '@joplin/lib/locale'; import setupContextMenu from './utils/setupContextMenu'; -const { MarkupToHtml } = require('@joplinapp/renderer'); +const { MarkupToHtml } = require('@joplin/renderer'); const taboverride = require('taboverride'); -const { reg } = require('@joplinapp/lib/registry.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem'); -const shim = require('@joplinapp/lib/shim').default; -const { themeStyle } = require('@joplinapp/lib/theme'); +const { reg } = require('@joplin/lib/registry.js'); +const BaseItem = require('@joplin/lib/models/BaseItem'); +const shim = require('@joplin/lib/shim').default; +const { themeStyle } = require('@joplin/lib/theme'); const { clipboard } = require('electron'); const supportedLocales = require('./supportedLocales'); diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.ts index ff06b6622..a7333b2fe 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.ts @@ -1,5 +1,5 @@ import { NoteBodyEditorProps } from '../../../utils/types'; -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); export default function styles(props:NoteBodyEditorProps) { return buildStyle(['TinyMCE', props.style.width, props.style.height], props.themeId, (theme:any) => { diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.ts index 47f3c8ba7..11745c64d 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupContextMenu.ts @@ -1,7 +1,7 @@ -import SpellCheckerService from '@joplinapp/lib/services/spellChecker/SpellCheckerService'; +import SpellCheckerService from '@joplin/lib/services/spellChecker/SpellCheckerService'; import bridge from '../../../../../services/bridge'; import { menuItems, ContextMenuOptions, ContextMenuItemType } from '../../../utils/contextMenu'; -const Resource = require('@joplinapp/lib/models/Resource'); +const Resource = require('@joplin/lib/models/Resource'); // x and y are the absolute coordinates, as returned by the context-menu event // handler on the webContent. This function will return null if the point is diff --git a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.ts b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.ts index eac588915..d0d34d0d2 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.ts +++ b/packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/useScroll.ts @@ -1,5 +1,5 @@ import { useEffect, useCallback, useRef } from 'react'; -import shim from '@joplinapp/lib/shim'; +import shim from '@joplin/lib/shim'; interface HookDependencies { editor:any, diff --git a/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx b/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx index fb8a921ab..4089e464a 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteEditor.tsx @@ -15,28 +15,28 @@ import useFormNote, { OnLoadEvent } from './utils/useFormNote'; import useFolder from './utils/useFolder'; import styles_ from './styles'; import { NoteEditorProps, FormNote, ScrollOptions, ScrollOptionTypes, OnChangeEvent, NoteBodyEditorProps } from './utils/types'; -import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index'; +import CommandService from '@joplin/lib/services/CommandService'; import ToolbarButton from '../ToolbarButton/ToolbarButton'; import Button, { ButtonLevel } from '../Button/Button'; -import eventManager from '@joplinapp/lib/eventManager'; +import eventManager from '@joplin/lib/eventManager'; import { AppState } from '../../app'; -import ToolbarButtonUtils from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; -import { _ } from '@joplinapp/lib/locale'; -import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext'; +import ToolbarButtonUtils from '@joplin/lib/services/commands/ToolbarButtonUtils'; +import { _ } from '@joplin/lib/locale'; +import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext'; import TagList from '../TagList'; import NoteTitleBar from './NoteTitle/NoteTitleBar'; -import markupLanguageUtils from '@joplinapp/lib/markupLanguageUtils'; +import markupLanguageUtils from '@joplin/lib/markupLanguageUtils'; import usePrevious from '../hooks/usePrevious'; -import Setting from '@joplinapp/lib/models/Setting'; +import Setting from '@joplin/lib/models/Setting'; -const { themeStyle } = require('@joplinapp/lib/theme'); -const { substrWithEllipsis } = require('@joplinapp/lib/string-utils'); +const { themeStyle } = require('@joplin/lib/theme'); +const { substrWithEllipsis } = require('@joplin/lib/string-utils'); const NoteSearchBar = require('../NoteSearchBar.min.js'); -const { reg } = require('@joplinapp/lib/registry.js'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { reg } = require('@joplin/lib/registry.js'); +const Note = require('@joplin/lib/models/Note.js'); const bridge = require('electron').remote.require('./bridge').default; -const ExternalEditWatcher = require('@joplinapp/lib/services/ExternalEditWatcher'); +const ExternalEditWatcher = require('@joplin/lib/services/ExternalEditWatcher'); const NoteRevisionViewer = require('../NoteRevisionViewer.min'); const commands = [ diff --git a/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx b/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx index d842b39e9..5c69f09f9 100644 --- a/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx +++ b/packages/app-desktop/gui/NoteEditor/NoteTitle/NoteTitleBar.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; -import { _ } from '@joplinapp/lib/locale'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import CommandService from '@joplin/lib/services/CommandService'; import { ChangeEvent, useCallback } from 'react'; import NoteToolbar from '../../NoteToolbar/NoteToolbar'; -import { buildStyle } from '@joplinapp/lib/theme'; -import time from '@joplinapp/lib/time'; +import { buildStyle } from '@joplin/lib/theme'; +import time from '@joplin/lib/time'; interface Props { themeId: number, diff --git a/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts b/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts index 82cd6f5cb..2ae3f852d 100644 --- a/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts +++ b/packages/app-desktop/gui/NoteEditor/commands/editorCommandDeclarations.ts @@ -1,5 +1,5 @@ -import { CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; const declarations:CommandDeclaration[] = [ { diff --git a/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.ts b/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.ts index 8137ba875..6e0007988 100644 --- a/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.ts +++ b/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteBody.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'focusElementNoteBody', diff --git a/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.ts b/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.ts index 77c284c0f..895064e3c 100644 --- a/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.ts +++ b/packages/app-desktop/gui/NoteEditor/commands/focusElementNoteTitle.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'focusElementNoteTitle', diff --git a/packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.ts b/packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.ts index cf6f3e245..58fee9990 100644 --- a/packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.ts +++ b/packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'showLocalSearch', diff --git a/packages/app-desktop/gui/NoteEditor/commands/showRevisions.ts b/packages/app-desktop/gui/NoteEditor/commands/showRevisions.ts index 6099d0b27..0bc137746 100644 --- a/packages/app-desktop/gui/NoteEditor/commands/showRevisions.ts +++ b/packages/app-desktop/gui/NoteEditor/commands/showRevisions.ts @@ -1,4 +1,4 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; export const declaration:CommandDeclaration = { name: 'showRevisions', diff --git a/packages/app-desktop/gui/NoteEditor/styles/index.ts b/packages/app-desktop/gui/NoteEditor/styles/index.ts index 01677f054..4823a7a30 100644 --- a/packages/app-desktop/gui/NoteEditor/styles/index.ts +++ b/packages/app-desktop/gui/NoteEditor/styles/index.ts @@ -1,6 +1,6 @@ import { NoteEditorProps } from '../utils/types'; -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); export default function styles(props: NoteEditorProps) { return buildStyle(['NoteEditor'], props.themeId, (theme: any) => { diff --git a/packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts b/packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts index c271c7099..ac4354391 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/contextMenu.ts @@ -1,13 +1,13 @@ -import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index'; -import { _ } from '@joplinapp/lib/locale'; +import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index'; +import { _ } from '@joplin/lib/locale'; const bridge = require('electron').remote.require('./bridge').default; const Menu = bridge().Menu; const MenuItem = bridge().MenuItem; -const Resource = require('@joplinapp/lib/models/Resource.js'); +const Resource = require('@joplin/lib/models/Resource.js'); const fs = require('fs-extra'); const { clipboard } = require('electron'); -const { toSystemSlashes } = require('@joplinapp/lib/path-utils'); +const { toSystemSlashes } = require('@joplin/lib/path-utils'); export enum ContextMenuItemType { None = '', diff --git a/packages/app-desktop/gui/NoteEditor/utils/index.ts b/packages/app-desktop/gui/NoteEditor/utils/index.ts index 84514dec1..fefbe8b47 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/index.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/index.ts @@ -1,8 +1,8 @@ import { FormNote } from './types'; -const HtmlToMd = require('@joplinapp/lib/HtmlToMd'); -const Note = require('@joplinapp/lib/models/Note'); -const { MarkupToHtml } = require('@joplinapp/renderer'); +const HtmlToMd = require('@joplin/lib/HtmlToMd'); +const Note = require('@joplin/lib/models/Note'); +const { MarkupToHtml } = require('@joplin/renderer'); export async function htmlToMarkdown(markupLanguage: number, html: string, originalCss:string): Promise { let newBody = ''; diff --git a/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts b/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts index f1e1a9b2d..896dfae93 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts @@ -1,14 +1,14 @@ -import shim from '@joplinapp/lib/shim'; -const Setting = require('@joplinapp/lib/models/Setting').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Resource = require('@joplinapp/lib/models/Resource.js'); +import shim from '@joplin/lib/shim'; +const Setting = require('@joplin/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Resource = require('@joplin/lib/models/Resource.js'); const bridge = require('electron').remote.require('./bridge').default; -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js'); -const { reg } = require('@joplinapp/lib/registry.js'); -const joplinRendererUtils = require('@joplinapp/renderer').utils; +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js'); +const { reg } = require('@joplin/lib/registry.js'); +const joplinRendererUtils = require('@joplin/renderer').utils; const { clipboard } = require('electron'); -const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime; +const mimeUtils = require('@joplin/lib/mime-utils.js').mime; const md5 = require('md5'); export async function handleResourceDownloadMode(noteBody: string) { diff --git a/packages/app-desktop/gui/NoteEditor/utils/types.ts b/packages/app-desktop/gui/NoteEditor/utils/types.ts index 836d395a1..733a89824 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/types.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/types.ts @@ -1,7 +1,7 @@ // eslint-disable-next-line no-unused-vars -import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue'; -import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; -import { PluginStates } from '@joplinapp/lib/services/plugins/reducer'; +import AsyncActionQueue from '@joplin/lib/AsyncActionQueue'; +import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils'; +import { PluginStates } from '@joplin/lib/services/plugins/reducer'; export interface ToolbarButtonInfos { [key:string]: ToolbarButtonInfo; diff --git a/packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts b/packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts index 476c16d07..f011ddd46 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useDropHandler.ts @@ -1,5 +1,5 @@ import { useCallback } from 'react'; -const Note = require('@joplinapp/lib/models/Note.js'); +const Note = require('@joplin/lib/models/Note.js'); interface HookDependencies { editorRef:any, diff --git a/packages/app-desktop/gui/NoteEditor/utils/useFolder.ts b/packages/app-desktop/gui/NoteEditor/utils/useFolder.ts index 2293712b1..e87e8e7d5 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useFolder.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useFolder.ts @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -const Folder = require('@joplinapp/lib/models/Folder'); +const Folder = require('@joplin/lib/models/Folder'); interface HookDependencies { folderId: string, diff --git a/packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts b/packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts index 90b678c72..551188a31 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useFormNote.ts @@ -1,17 +1,17 @@ import { useState, useEffect, useCallback } from 'react'; import { FormNote, defaultFormNote, ResourceInfos } from './types'; import { clearResourceCache, attachedResources } from './resourceHandling'; -import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue'; +import AsyncActionQueue from '@joplin/lib/AsyncActionQueue'; import { handleResourceDownloadMode } from './resourceHandling'; -const { MarkupToHtml } = require('@joplinapp/renderer'); -const HtmlToHtml = require('@joplinapp/renderer/HtmlToHtml'); +const { MarkupToHtml } = require('@joplin/renderer'); +const HtmlToHtml = require('@joplin/renderer/HtmlToHtml'); const usePrevious = require('../../hooks/usePrevious').default; -const Note = require('@joplinapp/lib/models/Note'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const { reg } = require('@joplinapp/lib/registry.js'); -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js'); -const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker.js'); -const ResourceEditWatcher = require('@joplinapp/lib/services/ResourceEditWatcher/index').default; +const Note = require('@joplin/lib/models/Note'); +const Setting = require('@joplin/lib/models/Setting').default; +const { reg } = require('@joplin/lib/registry.js'); +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js'); +const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker.js'); +const ResourceEditWatcher = require('@joplin/lib/services/ResourceEditWatcher/index').default; export interface OnLoadEvent { formNote: FormNote, diff --git a/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts b/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts index 538b8631b..cfbcee4ba 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useMarkupToHtml.ts @@ -1,12 +1,12 @@ -import { PluginStates } from '@joplinapp/lib/services/plugins/reducer'; -import contentScriptsToRendererRules from '@joplinapp/lib/services/plugins/utils/contentScriptsToRendererRules'; +import { PluginStates } from '@joplin/lib/services/plugins/reducer'; +import contentScriptsToRendererRules from '@joplin/lib/services/plugins/utils/contentScriptsToRendererRules'; import { useCallback, useMemo } from 'react'; import { ResourceInfos } from './types'; -import markupLanguageUtils from '@joplinapp/lib/markupLanguageUtils'; -import Setting from '@joplinapp/lib/models/Setting'; +import markupLanguageUtils from '@joplin/lib/markupLanguageUtils'; +import Setting from '@joplin/lib/models/Setting'; -const { themeStyle } = require('@joplinapp/lib/theme'); -const Note = require('@joplinapp/lib/models/Note'); +const { themeStyle } = require('@joplin/lib/theme'); +const Note = require('@joplin/lib/models/Note'); interface HookDependencies { themeId: number, diff --git a/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts b/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts index 429d02dc5..0bbea1793 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useMessageHandler.ts @@ -1,16 +1,16 @@ import { useCallback } from 'react'; import { FormNote } from './types'; import contextMenu from './contextMenu'; -import ResourceEditWatcher from '@joplinapp/lib/services/ResourceEditWatcher/index'; -import { _ } from '@joplinapp/lib/locale'; -const BaseItem = require('@joplinapp/lib/models/BaseItem'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Resource = require('@joplinapp/lib/models/Resource.js'); +import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index'; +import { _ } from '@joplin/lib/locale'; +const BaseItem = require('@joplin/lib/models/BaseItem'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Resource = require('@joplin/lib/models/Resource.js'); const bridge = require('electron').remote.require('./bridge').default; -const { urlDecode } = require('@joplinapp/lib/string-utils'); -const urlUtils = require('@joplinapp/lib/urlUtils'); -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher.js'); -const { reg } = require('@joplinapp/lib/registry.js'); +const { urlDecode } = require('@joplin/lib/string-utils'); +const urlUtils = require('@joplin/lib/urlUtils'); +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher.js'); +const { reg } = require('@joplin/lib/registry.js'); export default function useMessageHandler(scrollWhenReady:any, setScrollWhenReady:Function, editorRef:any, setLocalSearchResultCount:Function, dispatch:Function, formNote:FormNote) { return useCallback(async (event: any) => { diff --git a/packages/app-desktop/gui/NoteEditor/utils/useWindowCommandHandler.ts b/packages/app-desktop/gui/NoteEditor/utils/useWindowCommandHandler.ts index ad9a779f2..6b9c5c511 100644 --- a/packages/app-desktop/gui/NoteEditor/utils/useWindowCommandHandler.ts +++ b/packages/app-desktop/gui/NoteEditor/utils/useWindowCommandHandler.ts @@ -1,9 +1,9 @@ import { useEffect } from 'react'; import { FormNote, ScrollOptionTypes } from './types'; import editorCommandDeclarations from '../commands/editorCommandDeclarations'; -import CommandService, { CommandDeclaration, CommandRuntime, CommandContext } from '@joplinapp/lib/services/CommandService'; -const time = require('@joplinapp/lib/time').default; -const { reg } = require('@joplinapp/lib/registry.js'); +import CommandService, { CommandDeclaration, CommandRuntime, CommandContext } from '@joplin/lib/services/CommandService'; +const time = require('@joplin/lib/time').default; +const { reg } = require('@joplin/lib/registry.js'); const commandsWithDependencies = [ require('../commands/showLocalSearch'), diff --git a/packages/app-desktop/gui/NoteList/NoteList.tsx b/packages/app-desktop/gui/NoteList/NoteList.tsx index a3c9e2994..28b69387f 100644 --- a/packages/app-desktop/gui/NoteList/NoteList.tsx +++ b/packages/app-desktop/gui/NoteList/NoteList.tsx @@ -1,20 +1,20 @@ import { AppState } from '../../app'; -import eventManager from '@joplinapp/lib/eventManager'; +import eventManager from '@joplin/lib/eventManager'; import NoteListUtils from '../utils/NoteListUtils'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { ItemList } = require('../ItemList.min.js'); const React = require('react'); const { connect } = require('react-redux'); -const time = require('@joplinapp/lib/time').default; -const { themeStyle } = require('@joplinapp/lib/theme'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const time = require('@joplin/lib/time').default; +const { themeStyle } = require('@joplin/lib/theme'); +const BaseModel = require('@joplin/lib/BaseModel').default; const bridge = require('electron').remote.require('./bridge').default; -const Note = require('@joplinapp/lib/models/Note'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note'); +const Setting = require('@joplin/lib/models/Setting').default; const NoteListItem = require('../NoteListItem').default; -const CommandService = require('@joplinapp/lib/services/CommandService.js').default; +const CommandService = require('@joplin/lib/services/CommandService.js').default; const styled = require('styled-components').default; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; const commands = [ require('./commands/focusElementNoteList'), diff --git a/packages/app-desktop/gui/NoteList/commands/focusElementNoteList.ts b/packages/app-desktop/gui/NoteList/commands/focusElementNoteList.ts index 896c7e806..0ff359c18 100644 --- a/packages/app-desktop/gui/NoteList/commands/focusElementNoteList.ts +++ b/packages/app-desktop/gui/NoteList/commands/focusElementNoteList.ts @@ -1,6 +1,6 @@ -import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; -import { stateUtils } from '@joplinapp/lib/reducer'; +import { CommandRuntime, CommandDeclaration, CommandContext } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; +import { stateUtils } from '@joplin/lib/reducer'; export const declaration:CommandDeclaration = { name: 'focusElementNoteList', diff --git a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx index f7835e9c6..24843f144 100644 --- a/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx +++ b/packages/app-desktop/gui/NoteListControls/NoteListControls.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { useEffect, useRef } from 'react'; import SearchBar from '../SearchBar/SearchBar'; import Button, { ButtonLevel } from '../Button/Button'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import CommandService from '@joplin/lib/services/CommandService'; import { runtime as focusSearchRuntime } from './commands/focusSearch'; const styled = require('styled-components').default; diff --git a/packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts b/packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts index abd5b3dfe..2aba10149 100644 --- a/packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts +++ b/packages/app-desktop/gui/NoteListControls/commands/focusSearch.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'focusSearch', diff --git a/packages/app-desktop/gui/NoteListItem.tsx b/packages/app-desktop/gui/NoteListItem.tsx index 170b3d487..2d770c46f 100644 --- a/packages/app-desktop/gui/NoteListItem.tsx +++ b/packages/app-desktop/gui/NoteListItem.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { useRef, forwardRef, useImperativeHandle, useCallback } from 'react'; -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); const Mark = require('mark.js/dist/mark.min.js'); -const markJsUtils = require('@joplinapp/lib/markJsUtils'); -const Note = require('@joplinapp/lib/models/Note'); -const { replaceRegexDiacritics, pregQuote } = require('@joplinapp/lib/string-utils'); +const markJsUtils = require('@joplin/lib/markJsUtils'); +const Note = require('@joplin/lib/models/Note'); +const { replaceRegexDiacritics, pregQuote } = require('@joplin/lib/string-utils'); const styled = require('styled-components').default; const StyledRoot = styled.div` diff --git a/packages/app-desktop/gui/NotePropertiesDialog.jsx b/packages/app-desktop/gui/NotePropertiesDialog.jsx index 7ea668128..0d5983019 100644 --- a/packages/app-desktop/gui/NotePropertiesDialog.jsx +++ b/packages/app-desktop/gui/NotePropertiesDialog.jsx @@ -1,13 +1,13 @@ const React = require('react'); -const { _ } = require('@joplinapp/lib/locale'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const time = require('@joplinapp/lib/time').default; +const { _ } = require('@joplin/lib/locale'); +const { themeStyle } = require('@joplin/lib/theme'); +const time = require('@joplin/lib/time').default; const DialogButtonRow = require('./DialogButtonRow.min'); const Datetime = require('react-datetime'); -const Note = require('@joplinapp/lib/models/Note'); +const Note = require('@joplin/lib/models/Note'); const formatcoords = require('formatcoords'); const bridge = require('electron').remote.require('./bridge').default; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; class NotePropertiesDialog extends React.Component { constructor() { diff --git a/packages/app-desktop/gui/NoteRevisionViewer.jsx b/packages/app-desktop/gui/NoteRevisionViewer.jsx index c5d11c265..1d032d2ce 100644 --- a/packages/app-desktop/gui/NoteRevisionViewer.jsx +++ b/packages/app-desktop/gui/NoteRevisionViewer.jsx @@ -1,21 +1,21 @@ const React = require('react'); const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const { _ } = require('@joplinapp/lib/locale'); +const { themeStyle } = require('@joplin/lib/theme'); +const { _ } = require('@joplin/lib/locale'); const NoteTextViewer = require('./NoteTextViewer').default; const HelpButton = require('./HelpButton.min'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Revision = require('@joplinapp/lib/models/Revision'); -const urlUtils = require('@joplinapp/lib/urlUtils'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const RevisionService = require('@joplinapp/lib/services/RevisionService'); -const shared = require('@joplinapp/lib/components/shared/note-screen-shared.js'); -const { MarkupToHtml } = require('@joplinapp/renderer'); -const time = require('@joplinapp/lib/time').default; +const BaseModel = require('@joplin/lib/BaseModel').default; +const Revision = require('@joplin/lib/models/Revision'); +const urlUtils = require('@joplin/lib/urlUtils'); +const Setting = require('@joplin/lib/models/Setting').default; +const RevisionService = require('@joplin/lib/services/RevisionService'); +const shared = require('@joplin/lib/components/shared/note-screen-shared.js'); +const { MarkupToHtml } = require('@joplin/renderer'); +const time = require('@joplin/lib/time').default; const ReactTooltip = require('react-tooltip'); -const { urlDecode, substrWithEllipsis } = require('@joplinapp/lib/string-utils'); +const { urlDecode, substrWithEllipsis } = require('@joplin/lib/string-utils'); const bridge = require('electron').remote.require('./bridge').default; -const markupLanguageUtils = require('@joplinapp/lib/markupLanguageUtils').default; +const markupLanguageUtils = require('@joplin/lib/markupLanguageUtils').default; class NoteRevisionViewerComponent extends React.PureComponent { constructor() { diff --git a/packages/app-desktop/gui/NoteSearchBar.jsx b/packages/app-desktop/gui/NoteSearchBar.jsx index 0106b393c..749d2120d 100644 --- a/packages/app-desktop/gui/NoteSearchBar.jsx +++ b/packages/app-desktop/gui/NoteSearchBar.jsx @@ -1,7 +1,7 @@ const React = require('react'); const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const { _ } = require('@joplinapp/lib/locale'); +const { themeStyle } = require('@joplin/lib/theme'); +const { _ } = require('@joplin/lib/locale'); class NoteSearchBarComponent extends React.Component { constructor() { diff --git a/packages/app-desktop/gui/NoteStatusBar.jsx b/packages/app-desktop/gui/NoteStatusBar.jsx index 5e7357cb6..7fbc02f04 100644 --- a/packages/app-desktop/gui/NoteStatusBar.jsx +++ b/packages/app-desktop/gui/NoteStatusBar.jsx @@ -1,7 +1,7 @@ const React = require('react'); const { connect } = require('react-redux'); -const time = require('@joplinapp/lib/time').default; -const { themeStyle } = require('@joplinapp/lib/theme'); +const time = require('@joplin/lib/time').default; +const { themeStyle } = require('@joplin/lib/theme'); class NoteStatusBarComponent extends React.Component { style() { diff --git a/packages/app-desktop/gui/NoteTextViewer.tsx b/packages/app-desktop/gui/NoteTextViewer.tsx index b00bd8800..dc1ce60f5 100644 --- a/packages/app-desktop/gui/NoteTextViewer.tsx +++ b/packages/app-desktop/gui/NoteTextViewer.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; const { connect } = require('react-redux'); -const { reg } = require('@joplinapp/lib/registry.js'); +const { reg } = require('@joplin/lib/registry.js'); interface Props { onDomReady: Function, diff --git a/packages/app-desktop/gui/NoteToolbar/NoteToolbar.tsx b/packages/app-desktop/gui/NoteToolbar/NoteToolbar.tsx index dcc40f9bb..152836f45 100644 --- a/packages/app-desktop/gui/NoteToolbar/NoteToolbar.tsx +++ b/packages/app-desktop/gui/NoteToolbar/NoteToolbar.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import CommandService from '@joplin/lib/services/CommandService'; import ToolbarBase from '../ToolbarBase'; -import { utils as pluginUtils } from '@joplinapp/lib/services/plugins/reducer'; -import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; -import stateToWhenClauseContext from '@joplinapp/lib/services/commands/stateToWhenClauseContext'; +import { utils as pluginUtils } from '@joplin/lib/services/plugins/reducer'; +import ToolbarButtonUtils, { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils'; +import stateToWhenClauseContext from '@joplin/lib/services/commands/stateToWhenClauseContext'; const { connect } = require('react-redux'); -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); interface NoteToolbarProps { themeId: number, diff --git a/packages/app-desktop/gui/OneDriveLoginScreen.tsx b/packages/app-desktop/gui/OneDriveLoginScreen.tsx index 3d309ae70..c16f896dd 100644 --- a/packages/app-desktop/gui/OneDriveLoginScreen.tsx +++ b/packages/app-desktop/gui/OneDriveLoginScreen.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; import ButtonBar from './ConfigScreen/ButtonBar'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); -const { reg } = require('@joplinapp/lib/registry.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const { reg } = require('@joplin/lib/registry.js'); +const Setting = require('@joplin/lib/models/Setting').default; const bridge = require('electron').remote.require('./bridge').default; -const { themeStyle } = require('@joplinapp/lib/theme'); -const { OneDriveApiNodeUtils } = require('@joplinapp/lib/onedrive-api-node-utils.js'); +const { themeStyle } = require('@joplin/lib/theme'); +const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js'); interface Props { themeId: string, diff --git a/packages/app-desktop/gui/PromptDialog.jsx b/packages/app-desktop/gui/PromptDialog.jsx index efb262182..70d036306 100644 --- a/packages/app-desktop/gui/PromptDialog.jsx +++ b/packages/app-desktop/gui/PromptDialog.jsx @@ -1,7 +1,7 @@ const React = require('react'); -const { _ } = require('@joplinapp/lib/locale'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const time = require('@joplinapp/lib/time').default; +const { _ } = require('@joplin/lib/locale'); +const { themeStyle } = require('@joplin/lib/theme'); +const time = require('@joplin/lib/time').default; const Datetime = require('react-datetime'); const CreatableSelect = require('react-select/lib/Creatable').default; const Select = require('react-select').default; diff --git a/packages/app-desktop/gui/ResourceScreen.tsx b/packages/app-desktop/gui/ResourceScreen.tsx index 94e9d779e..f2fe2200d 100644 --- a/packages/app-desktop/gui/ResourceScreen.tsx +++ b/packages/app-desktop/gui/ResourceScreen.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import ButtonBar from './ConfigScreen/ButtonBar'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); const bridge = require('electron').remote.require('./bridge').default; const prettyBytes = require('pretty-bytes'); -const Resource = require('@joplinapp/lib/models/Resource.js'); +const Resource = require('@joplin/lib/models/Resource.js'); interface Style { width: number diff --git a/packages/app-desktop/gui/Root.tsx b/packages/app-desktop/gui/Root.tsx index 3b50b5afd..b893fbe79 100644 --- a/packages/app-desktop/gui/Root.tsx +++ b/packages/app-desktop/gui/Root.tsx @@ -5,21 +5,21 @@ import StatusScreen from './StatusScreen/StatusScreen'; import OneDriveLoginScreen from './OneDriveLoginScreen'; import DropboxLoginScreen from './DropboxLoginScreen'; import ErrorBoundary from './ErrorBoundary'; -import { themeStyle } from '@joplinapp/lib/theme'; +import { themeStyle } from '@joplin/lib/theme'; import { Size } from './ResizableLayout/ResizableLayout'; import MenuBar from './MenuBar'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const React = require('react'); const { render } = require('react-dom'); const { connect, Provider } = require('react-redux'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const shim = require('@joplinapp/lib/shim').default; +const Setting = require('@joplin/lib/models/Setting').default; +const shim = require('@joplin/lib/shim').default; shim.setReact(React); const { ImportScreen } = require('./ImportScreen.min.js'); const { ResourceScreen } = require('./ResourceScreen.js'); const { Navigator } = require('./Navigator.min.js'); -const WelcomeUtils = require('@joplinapp/lib/WelcomeUtils'); +const WelcomeUtils = require('@joplin/lib/WelcomeUtils'); const { ThemeProvider, StyleSheetManager, createGlobalStyle } = require('styled-components'); const bridge = require('electron').remote.require('./bridge').default; diff --git a/packages/app-desktop/gui/Root_UpgradeSyncTarget.tsx b/packages/app-desktop/gui/Root_UpgradeSyncTarget.tsx index 7addf366d..809aa6a1b 100644 --- a/packages/app-desktop/gui/Root_UpgradeSyncTarget.tsx +++ b/packages/app-desktop/gui/Root_UpgradeSyncTarget.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { useEffect } from 'react'; -import useSyncTargetUpgrade, { SyncTargetUpgradeResult } from '@joplinapp/lib/services/synchronizer/gui/useSyncTargetUpgrade'; +import useSyncTargetUpgrade, { SyncTargetUpgradeResult } from '@joplin/lib/services/synchronizer/gui/useSyncTargetUpgrade'; const { render } = require('react-dom'); const ipcRenderer = require('electron').ipcRenderer; -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; const bridge = require('electron').remote.require('./bridge').default; function useAppCloseHandler(upgradeResult:SyncTargetUpgradeResult) { diff --git a/packages/app-desktop/gui/SearchBar/SearchBar.tsx b/packages/app-desktop/gui/SearchBar/SearchBar.tsx index db4c858e8..3a83f92de 100644 --- a/packages/app-desktop/gui/SearchBar/SearchBar.tsx +++ b/packages/app-desktop/gui/SearchBar/SearchBar.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { useState, useCallback, useEffect } from 'react'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import CommandService from '@joplin/lib/services/CommandService'; import useSearch from './hooks/useSearch'; import { Root, SearchInput, SearchButton, SearchButtonIcon } from './styles'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); interface Props { diff --git a/packages/app-desktop/gui/SearchBar/hooks/useSearch.ts b/packages/app-desktop/gui/SearchBar/hooks/useSearch.ts index 43d14ecba..523b614dd 100644 --- a/packages/app-desktop/gui/SearchBar/hooks/useSearch.ts +++ b/packages/app-desktop/gui/SearchBar/hooks/useSearch.ts @@ -1,5 +1,5 @@ import { useEffect } from 'react'; -import CommandService from '@joplinapp/lib/services/CommandService'; +import CommandService from '@joplin/lib/services/CommandService'; const debounce = require('debounce'); export default function useSearch(query:string) { diff --git a/packages/app-desktop/gui/ShareNoteDialog.tsx b/packages/app-desktop/gui/ShareNoteDialog.tsx index ec4103ff7..7b0212d96 100644 --- a/packages/app-desktop/gui/ShareNoteDialog.tsx +++ b/packages/app-desktop/gui/ShareNoteDialog.tsx @@ -1,14 +1,14 @@ import * as React from 'react'; import { useState, useEffect } from 'react'; -import JoplinServerApi from '@joplinapp/lib/JoplinServerApi'; +import JoplinServerApi from '@joplin/lib/JoplinServerApi'; -import { _, _n } from '@joplinapp/lib/locale'; -const { themeStyle, buildStyle } = require('@joplinapp/lib/theme'); +import { _, _n } from '@joplin/lib/locale'; +const { themeStyle, buildStyle } = require('@joplin/lib/theme'); const DialogButtonRow = require('./DialogButtonRow.min'); -const Note = require('@joplinapp/lib/models/Note'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const BaseItem = require('@joplinapp/lib/models/BaseItem'); -const { reg } = require('@joplinapp/lib/registry.js'); +const Note = require('@joplin/lib/models/Note'); +const Setting = require('@joplin/lib/models/Setting').default; +const BaseItem = require('@joplin/lib/models/BaseItem'); +const { reg } = require('@joplin/lib/registry.js'); const { clipboard } = require('electron'); interface ShareNoteDialogProps { diff --git a/packages/app-desktop/gui/SideBar/SideBar.tsx b/packages/app-desktop/gui/SideBar/SideBar.tsx index d00a7cdf2..77c34f2da 100644 --- a/packages/app-desktop/gui/SideBar/SideBar.tsx +++ b/packages/app-desktop/gui/SideBar/SideBar.tsx @@ -1,26 +1,26 @@ import * as React from 'react'; import { StyledRoot, StyledAddButton, StyledHeader, StyledHeaderIcon, StyledAllNotesIcon, StyledHeaderLabel, StyledListItem, StyledListItemAnchor, StyledExpandLink, StyledNoteCount, StyledSyncReportText, StyledSyncReport, StyledSynchronizeButton } from './styles'; import { ButtonLevel } from '../Button/Button'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import InteropService from '@joplinapp/lib/services/interop/InteropService'; -import Synchronizer from '@joplinapp/lib/Synchronizer'; -import Setting from '@joplinapp/lib/models/Setting'; -import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils'; +import CommandService from '@joplin/lib/services/CommandService'; +import InteropService from '@joplin/lib/services/interop/InteropService'; +import Synchronizer from '@joplin/lib/Synchronizer'; +import Setting from '@joplin/lib/models/Setting'; +import MenuUtils from '@joplin/lib/services/commands/MenuUtils'; import InteropServiceHelper from '../../InteropServiceHelper'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); -const shared = require('@joplinapp/lib/components/shared/side-menu-shared.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const shared = require('@joplin/lib/components/shared/side-menu-shared.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const { themeStyle } = require('@joplin/lib/theme'); const bridge = require('electron').remote.require('./bridge').default; const Menu = bridge().Menu; const MenuItem = bridge().MenuItem; -const { substrWithEllipsis } = require('@joplinapp/lib/string-utils'); -const { ALL_NOTES_FILTER_ID } = require('@joplinapp/lib/reserved-ids'); +const { substrWithEllipsis } = require('@joplin/lib/string-utils'); +const { ALL_NOTES_FILTER_ID } = require('@joplin/lib/reserved-ids'); interface Props { themeId: number, diff --git a/packages/app-desktop/gui/SideBar/commands/focusElementSideBar.ts b/packages/app-desktop/gui/SideBar/commands/focusElementSideBar.ts index cfdd9e6b3..dc40a4b6a 100644 --- a/packages/app-desktop/gui/SideBar/commands/focusElementSideBar.ts +++ b/packages/app-desktop/gui/SideBar/commands/focusElementSideBar.ts @@ -1,5 +1,5 @@ -import { CommandRuntime, CommandDeclaration } from '@joplinapp/lib/services/CommandService'; -import { _ } from '@joplinapp/lib/locale'; +import { CommandRuntime, CommandDeclaration } from '@joplin/lib/services/CommandService'; +import { _ } from '@joplin/lib/locale'; export const declaration:CommandDeclaration = { name: 'focusElementSideBar', diff --git a/packages/app-desktop/gui/StatusScreen/StatusScreen.tsx b/packages/app-desktop/gui/StatusScreen/StatusScreen.tsx index bfe058709..1251521dc 100644 --- a/packages/app-desktop/gui/StatusScreen/StatusScreen.tsx +++ b/packages/app-desktop/gui/StatusScreen/StatusScreen.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; import { useState, useEffect } from 'react'; import ButtonBar from '../ConfigScreen/ButtonBar'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { connect } = require('react-redux'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; const bridge = require('electron').remote.require('./bridge').default; -const { themeStyle } = require('@joplinapp/lib/theme'); -const { ReportService } = require('@joplinapp/lib/services/report.js'); +const { themeStyle } = require('@joplin/lib/theme'); +const { ReportService } = require('@joplin/lib/services/report.js'); const fs = require('fs-extra'); interface Props { diff --git a/packages/app-desktop/gui/TagItem.jsx b/packages/app-desktop/gui/TagItem.jsx index 7fd0f95d7..e4c7258c9 100644 --- a/packages/app-desktop/gui/TagItem.jsx +++ b/packages/app-desktop/gui/TagItem.jsx @@ -1,6 +1,6 @@ const React = require('react'); const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); class TagItemComponent extends React.Component { render() { diff --git a/packages/app-desktop/gui/TagList.tsx b/packages/app-desktop/gui/TagList.tsx index bcab4a96e..941bc138d 100644 --- a/packages/app-desktop/gui/TagList.tsx +++ b/packages/app-desktop/gui/TagList.tsx @@ -3,7 +3,7 @@ import { useMemo } from 'react'; import { AppState } from '../app'; const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); const TagItem = require('./TagItem.min.js'); interface Props { diff --git a/packages/app-desktop/gui/ToggleEditorsButton/ToggleEditorsButton.tsx b/packages/app-desktop/gui/ToggleEditorsButton/ToggleEditorsButton.tsx index c14568baf..4e356c20d 100644 --- a/packages/app-desktop/gui/ToggleEditorsButton/ToggleEditorsButton.tsx +++ b/packages/app-desktop/gui/ToggleEditorsButton/ToggleEditorsButton.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import styles_ from './styles'; -import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; +import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils'; export enum Value { Markdown = 'markdown', diff --git a/packages/app-desktop/gui/ToggleEditorsButton/styles/index.ts b/packages/app-desktop/gui/ToggleEditorsButton/styles/index.ts index 5daace210..bea46d43c 100644 --- a/packages/app-desktop/gui/ToggleEditorsButton/styles/index.ts +++ b/packages/app-desktop/gui/ToggleEditorsButton/styles/index.ts @@ -1,5 +1,5 @@ import { Props, Value } from '../ToggleEditorsButton'; -const { buildStyle } = require('@joplinapp/lib/theme'); +const { buildStyle } = require('@joplin/lib/theme'); export default function styles(props:Props) { return buildStyle(['ToggleEditorsButton', props.value], props.themeId, (theme: any) => { diff --git a/packages/app-desktop/gui/ToolbarBase.tsx b/packages/app-desktop/gui/ToolbarBase.tsx index 94e9b3903..1ba7bc755 100644 --- a/packages/app-desktop/gui/ToolbarBase.tsx +++ b/packages/app-desktop/gui/ToolbarBase.tsx @@ -2,7 +2,7 @@ import ToolbarButton from './ToolbarButton/ToolbarButton'; import ToggleEditorsButton, { Value } from './ToggleEditorsButton/ToggleEditorsButton'; const React = require('react'); const { connect } = require('react-redux'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); const ToolbarSpace = require('./ToolbarSpace.min.js'); interface Props { diff --git a/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx b/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx index 600ee8a12..31eda5510 100644 --- a/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx +++ b/packages/app-desktop/gui/ToolbarButton/ToolbarButton.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { ToolbarButtonInfo } from '@joplinapp/lib/services/commands/ToolbarButtonUtils'; +import { ToolbarButtonInfo } from '@joplin/lib/services/commands/ToolbarButtonUtils'; import { StyledRoot, StyledIconSpan, StyledIconI } from './styles'; interface Props { diff --git a/packages/app-desktop/gui/ToolbarSpace.jsx b/packages/app-desktop/gui/ToolbarSpace.jsx index 81443dd55..8430ec0c2 100644 --- a/packages/app-desktop/gui/ToolbarSpace.jsx +++ b/packages/app-desktop/gui/ToolbarSpace.jsx @@ -1,5 +1,5 @@ const React = require('react'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); class ToolbarSpace extends React.Component { render() { diff --git a/packages/app-desktop/gui/style/ConfigMenuBar.js b/packages/app-desktop/gui/style/ConfigMenuBar.js index 2d601150e..ea9ee05d7 100644 --- a/packages/app-desktop/gui/style/ConfigMenuBar.js +++ b/packages/app-desktop/gui/style/ConfigMenuBar.js @@ -1,5 +1,5 @@ const { createSelector } = require('reselect'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); const themeSelector = (state, props) => themeStyle(props.themeId); diff --git a/packages/app-desktop/gui/style/ExtensionBadge.js b/packages/app-desktop/gui/style/ExtensionBadge.js index 2ed8c2359..53149aa65 100644 --- a/packages/app-desktop/gui/style/ExtensionBadge.js +++ b/packages/app-desktop/gui/style/ExtensionBadge.js @@ -1,5 +1,5 @@ const { createSelector } = require('reselect'); -const { themeStyle } = require('@joplinapp/lib/theme'); +const { themeStyle } = require('@joplin/lib/theme'); const themeSelector = (state, props) => themeStyle(props.themeId); diff --git a/packages/app-desktop/gui/utils/NoteListUtils.ts b/packages/app-desktop/gui/utils/NoteListUtils.ts index 31c097fec..5cdfd2afc 100644 --- a/packages/app-desktop/gui/utils/NoteListUtils.ts +++ b/packages/app-desktop/gui/utils/NoteListUtils.ts @@ -1,18 +1,18 @@ -import { utils as pluginUtils, PluginStates } from '@joplinapp/lib/services/plugins/reducer'; -import CommandService from '@joplinapp/lib/services/CommandService'; -import eventManager from '@joplinapp/lib/eventManager'; -import InteropService from '@joplinapp/lib/services/interop/InteropService'; -import MenuUtils from '@joplinapp/lib/services/commands/MenuUtils'; +import { utils as pluginUtils, PluginStates } from '@joplin/lib/services/plugins/reducer'; +import CommandService from '@joplin/lib/services/CommandService'; +import eventManager from '@joplin/lib/eventManager'; +import InteropService from '@joplin/lib/services/interop/InteropService'; +import MenuUtils from '@joplin/lib/services/commands/MenuUtils'; import InteropServiceHelper from '../../InteropServiceHelper'; -import { _ } from '@joplinapp/lib/locale'; -import { MenuItemLocation } from '@joplinapp/lib/services/plugins/api/types'; +import { _ } from '@joplin/lib/locale'; +import { MenuItemLocation } from '@joplin/lib/services/plugins/api/types'; -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const BaseModel = require('@joplin/lib/BaseModel').default; const bridge = require('electron').remote.require('./bridge').default; const Menu = bridge().Menu; const MenuItem = bridge().MenuItem; -const Note = require('@joplinapp/lib/models/Note'); -const { substrWithEllipsis } = require('@joplinapp/lib/string-utils'); +const Note = require('@joplin/lib/models/Note'); +const { substrWithEllipsis } = require('@joplin/lib/string-utils'); interface ContextMenuProps { notes: any[], diff --git a/packages/app-desktop/gulpfile.js b/packages/app-desktop/gulpfile.js index 7bb40fd18..6b0e2de16 100644 --- a/packages/app-desktop/gulpfile.js +++ b/packages/app-desktop/gulpfile.js @@ -1,5 +1,5 @@ const gulp = require('gulp'); -const utils = require('@joplinapp/tools/gulp/utils'); +const utils = require('@joplin/tools/gulp/utils'); const fs = require('fs-extra'); const tasks = { @@ -19,11 +19,11 @@ const tasks = { fn: require('./tools/electronRebuild.js'), }, // compileExtensions: { - // fn: require('@joplinapp/tools/gulp/tasks/compileExtensions.js'), + // fn: require('@joplin/tools/gulp/tasks/compileExtensions.js'), // }, - // copyLib: require('@joplinapp/tools/gulp/tasks/copyLib'), - tsc: require('@joplinapp/tools/gulp/tasks/tsc'), - updateIgnoredTypeScriptBuild: require('@joplinapp/tools/gulp/tasks/updateIgnoredTypeScriptBuild'), + // copyLib: require('@joplin/tools/gulp/tasks/copyLib'), + tsc: require('@joplin/tools/gulp/tasks/tsc'), + updateIgnoredTypeScriptBuild: require('@joplin/tools/gulp/tasks/updateIgnoredTypeScriptBuild'), linkReact: { fn: async () => { diff --git a/packages/app-desktop/main-html.js b/packages/app-desktop/main-html.js index 7340f8682..a0c564e0b 100644 --- a/packages/app-desktop/main-html.js +++ b/packages/app-desktop/main-html.js @@ -11,22 +11,22 @@ __REACT_DEVTOOLS_GLOBAL_HOOK__ = { }; const app = require('./app').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const MasterKey = require('@joplinapp/lib/models/MasterKey'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Revision = require('@joplinapp/lib/models/Revision.js'); -const Logger = require('@joplinapp/lib/Logger').default; -const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default; -const shim = require('@joplinapp/lib/shim').default; -const { shimInit } = require('@joplinapp/lib/shim-init-node.js'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const MasterKey = require('@joplin/lib/models/MasterKey'); +const Setting = require('@joplin/lib/models/Setting').default; +const Revision = require('@joplin/lib/models/Revision.js'); +const Logger = require('@joplin/lib/Logger').default; +const FsDriverNode = require('@joplin/lib/fs-driver-node').default; +const shim = require('@joplin/lib/shim').default; +const { shimInit } = require('@joplin/lib/shim-init-node.js'); +const EncryptionService = require('@joplin/lib/services/EncryptionService'); const bridge = require('electron').remote.require('./bridge').default; -const { FileApiDriverLocal } = require('@joplinapp/lib/file-api-driver-local.js'); +const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local.js'); if (bridge().env() === 'dev') { const newConsole = function(oldConsole) { diff --git a/packages/app-desktop/main.js b/packages/app-desktop/main.js index 44bb474cb..6bae660d8 100644 --- a/packages/app-desktop/main.js +++ b/packages/app-desktop/main.js @@ -3,9 +3,9 @@ const electronApp = require('electron').app; const ElectronAppWrapper = require('./ElectronAppWrapper').default; const { initBridge } = require('./bridge'); -const Logger = require('@joplinapp/lib/Logger').default; -const FsDriverNode = require('@joplinapp/lib/fs-driver-node').default; -const envFromArgs = require('@joplinapp/lib/envFromArgs'); +const Logger = require('@joplin/lib/Logger').default; +const FsDriverNode = require('@joplin/lib/fs-driver-node').default; +const envFromArgs = require('@joplin/lib/envFromArgs'); process.on('unhandledRejection', (reason, p) => { console.error('Unhandled promise rejection', p, 'reason:', reason); diff --git a/packages/app-desktop/package-lock.json b/packages/app-desktop/package-lock.json index 0c43fb95c..637657010 100644 --- a/packages/app-desktop/package-lock.json +++ b/packages/app-desktop/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/app-desktop", + "name": "@joplin/app-desktop", "version": "1.4.6", "lockfileVersion": 1, "requires": true, diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index 2ef12ab43..fc4e128ac 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/app-desktop", + "name": "@joplin/app-desktop", "version": "1.4.6", "description": "Joplin for Desktop", "main": "main.js", @@ -90,7 +90,7 @@ "@types/node": "^14.14.6", "@types/react": "16.9.55", "@types/react-redux": "^7.1.9", - "@joplinapp/tools": "^1.0.9", + "@joplin/tools": "^1.0.9", "ajv": "^6.5.0", "app-builder-bin": "^1.9.11", "babel-cli": "^6.26.0", @@ -110,8 +110,8 @@ }, "dependencies": { "@fortawesome/fontawesome-free": "^5.13.0", - "@joplinapp/lib": "^1.0.9", - "@joplinapp/renderer": "^1.0.17", + "@joplin/lib": "^1.0.9", + "@joplin/renderer": "^1.0.17", "async-mutex": "^0.1.3", "codemirror": "^5.56.0", "color": "^3.1.2", diff --git a/packages/app-desktop/plugins/GotoAnything.tsx b/packages/app-desktop/plugins/GotoAnything.tsx index b4a7a0414..2f1b78491 100644 --- a/packages/app-desktop/plugins/GotoAnything.tsx +++ b/packages/app-desktop/plugins/GotoAnything.tsx @@ -1,22 +1,22 @@ import * as React from 'react'; import { AppState } from '../app'; -import CommandService, { SearchResult as CommandSearchResult } from '@joplinapp/lib/services/CommandService'; -import KeymapService from '@joplinapp/lib/services/KeymapService'; -import shim from '@joplinapp/lib/shim'; +import CommandService, { SearchResult as CommandSearchResult } from '@joplin/lib/services/CommandService'; +import KeymapService from '@joplin/lib/services/KeymapService'; +import shim from '@joplin/lib/shim'; const { connect } = require('react-redux'); -const { _ } = require('@joplinapp/lib/locale'); -const { themeStyle } = require('@joplinapp/lib/theme'); -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const Tag = require('@joplinapp/lib/models/Tag'); -const Folder = require('@joplinapp/lib/models/Folder'); -const Note = require('@joplinapp/lib/models/Note'); +const { _ } = require('@joplin/lib/locale'); +const { themeStyle } = require('@joplin/lib/theme'); +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const Tag = require('@joplin/lib/models/Tag'); +const Folder = require('@joplin/lib/models/Folder'); +const Note = require('@joplin/lib/models/Note'); const { ItemList } = require('../gui/ItemList.min'); const HelpButton = require('../gui/HelpButton.min'); -const { surroundKeywords, nextWhitespaceIndex, removeDiacritics } = require('@joplinapp/lib/string-utils.js'); -const { mergeOverlappingIntervals } = require('@joplinapp/lib/ArrayUtils.js'); -const markupLanguageUtils = require('@joplinapp/lib/markupLanguageUtils').default; +const { surroundKeywords, nextWhitespaceIndex, removeDiacritics } = require('@joplin/lib/string-utils.js'); +const { mergeOverlappingIntervals } = require('@joplin/lib/ArrayUtils.js'); +const markupLanguageUtils = require('@joplin/lib/markupLanguageUtils').default; const PLUGIN_NAME = 'gotoAnything'; diff --git a/packages/app-desktop/services/plugins/PlatformImplementation.ts b/packages/app-desktop/services/plugins/PlatformImplementation.ts index fb3504faa..1e1fb78c4 100644 --- a/packages/app-desktop/services/plugins/PlatformImplementation.ts +++ b/packages/app-desktop/services/plugins/PlatformImplementation.ts @@ -1,4 +1,4 @@ -// import { EditorCommand } from '@joplinapp/lib/services/plugins/api/types'; +// import { EditorCommand } from '@joplin/lib/services/plugins/api/types'; import bridge from '../bridge'; diff --git a/packages/app-desktop/services/plugins/PluginRunner.ts b/packages/app-desktop/services/plugins/PluginRunner.ts index d6997c20c..20d015b81 100644 --- a/packages/app-desktop/services/plugins/PluginRunner.ts +++ b/packages/app-desktop/services/plugins/PluginRunner.ts @@ -1,11 +1,11 @@ -import Plugin from '@joplinapp/lib/services/plugins/Plugin'; -import BasePluginRunner from '@joplinapp/lib/services/plugins/BasePluginRunner'; -import executeSandboxCall from '@joplinapp/lib/services/plugins/utils/executeSandboxCall'; -import Global from '@joplinapp/lib/services/plugins/api/Global'; +import Plugin from '@joplin/lib/services/plugins/Plugin'; +import BasePluginRunner from '@joplin/lib/services/plugins/BasePluginRunner'; +import executeSandboxCall from '@joplin/lib/services/plugins/utils/executeSandboxCall'; +import Global from '@joplin/lib/services/plugins/api/Global'; import bridge from '../bridge'; -import Setting from '@joplinapp/lib/models/Setting'; -import { EventHandlers } from '@joplinapp/lib/services/plugins/utils/mapEventHandlersToIds'; -import shim from '@joplinapp/lib/shim'; +import Setting from '@joplin/lib/models/Setting'; +import { EventHandlers } from '@joplin/lib/services/plugins/utils/mapEventHandlersToIds'; +import shim from '@joplin/lib/shim'; const ipcRenderer = require('electron').ipcRenderer; enum PluginMessageTarget { diff --git a/packages/app-desktop/services/plugins/UserWebviewDialog.tsx b/packages/app-desktop/services/plugins/UserWebviewDialog.tsx index 9996b4078..0496f9a92 100644 --- a/packages/app-desktop/services/plugins/UserWebviewDialog.tsx +++ b/packages/app-desktop/services/plugins/UserWebviewDialog.tsx @@ -1,6 +1,6 @@ -import { ButtonSpec } from '@joplinapp/lib/services/plugins/api/types'; -import PluginService from '@joplinapp/lib/services/plugins/PluginService'; -import WebviewController from '@joplinapp/lib/services/plugins/WebviewController'; +import { ButtonSpec } from '@joplin/lib/services/plugins/api/types'; +import PluginService from '@joplin/lib/services/plugins/PluginService'; +import WebviewController from '@joplin/lib/services/plugins/WebviewController'; import * as React from 'react'; import UserWebview, { Props as UserWebviewProps } from './UserWebview'; import UserWebviewDialogButtonBar from './UserWebviewDialogButtonBar'; diff --git a/packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx b/packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx index e7d95ee6c..fc3ae96b5 100644 --- a/packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx +++ b/packages/app-desktop/services/plugins/UserWebviewDialogButtonBar.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import Button from '../../gui/Button/Button'; -import { _ } from '@joplinapp/lib/locale'; -import { ButtonSpec } from '@joplinapp/lib/services/plugins/api/types'; +import { _ } from '@joplin/lib/locale'; +import { ButtonSpec } from '@joplin/lib/services/plugins/api/types'; const styled = require('styled-components').default; const { space } = require('styled-system'); diff --git a/packages/app-desktop/services/plugins/hooks/useThemeCss.ts b/packages/app-desktop/services/plugins/hooks/useThemeCss.ts index 4af3dd988..098e8c64e 100644 --- a/packages/app-desktop/services/plugins/hooks/useThemeCss.ts +++ b/packages/app-desktop/services/plugins/hooks/useThemeCss.ts @@ -1,8 +1,8 @@ import { useEffect, useState } from 'react'; -import { themeStyle } from '@joplinapp/lib/theme'; -import shim from '@joplinapp/lib/shim'; -const Setting = require('@joplinapp/lib/models/Setting').default; -const { camelCaseToDash, formatCssSize } = require('@joplinapp/lib/string-utils'); +import { themeStyle } from '@joplin/lib/theme'; +import shim from '@joplin/lib/shim'; +const Setting = require('@joplin/lib/models/Setting').default; +const { camelCaseToDash, formatCssSize } = require('@joplin/lib/string-utils'); interface HookDependencies { pluginId: string, diff --git a/packages/app-desktop/services/plugins/plugin_index.js b/packages/app-desktop/services/plugins/plugin_index.js index c98ea819e..d22fd5f03 100644 --- a/packages/app-desktop/services/plugins/plugin_index.js +++ b/packages/app-desktop/services/plugins/plugin_index.js @@ -1,6 +1,6 @@ (function(globalObject) { // TODO: Not sure if that will work once packaged in Electron - const sandboxProxy = require('../../node_modules/@joplinapp/lib/services/plugins/sandboxProxy.js').default; + const sandboxProxy = require('../../node_modules/@joplin/lib/services/plugins/sandboxProxy.js').default; const ipcRenderer = require('electron').ipcRenderer; const urlParams = new URLSearchParams(window.location.search); diff --git a/packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.ts b/packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.ts index 04fe1806c..c2ae4debc 100644 --- a/packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.ts +++ b/packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.ts @@ -1,6 +1,6 @@ // Provides spell checking feature via the native Electron built-in spell checker -import SpellCheckerServiceDriverBase from '@joplinapp/lib/services/spellChecker/SpellCheckerServiceDriverBase'; +import SpellCheckerServiceDriverBase from '@joplin/lib/services/spellChecker/SpellCheckerServiceDriverBase'; import bridge from '../bridge'; export default class SpellCheckerServiceDriverNative extends SpellCheckerServiceDriverBase { diff --git a/packages/app-desktop/tools/compileScripts.js b/packages/app-desktop/tools/compileScripts.js index 8731ce9ea..b6c7b1577 100644 --- a/packages/app-desktop/tools/compileScripts.js +++ b/packages/app-desktop/tools/compileScripts.js @@ -47,7 +47,7 @@ module.exports = function() { convertJsx(`${__dirname}/../gui/NoteList`); convertJsx(`${__dirname}/../plugins`); - // TODO: should get from node_modules @joplinapp/lib + // TODO: should get from node_modules @joplin/lib const libContent = [ fs.readFileSync(`${basePath}/packages/lib/string-utils-common.js`, 'utf8'), fs.readFileSync(`${basePath}/packages/lib/markJsUtils.js`, 'utf8'), diff --git a/packages/app-desktop/tools/copyPluginAssets.js b/packages/app-desktop/tools/copyPluginAssets.js index 200d05753..177034564 100644 --- a/packages/app-desktop/tools/copyPluginAssets.js +++ b/packages/app-desktop/tools/copyPluginAssets.js @@ -1,8 +1,8 @@ -const utils = require('@joplinapp/tools/gulp/utils'); +const utils = require('@joplin/tools/gulp/utils'); async function main() { const rootDir = `${__dirname}/..`; - // TODO: should take from node_modules/@joplinapp/renderer + // TODO: should take from node_modules/@joplin/renderer const sourceDir = `${rootDir}/../../packages/renderer/assets`; const destDirs = [ `${rootDir}/gui/note-viewer/pluginAssets`, diff --git a/packages/app-desktop/tools/copyTinyMceLangs.js b/packages/app-desktop/tools/copyTinyMceLangs.js index 352493320..e7b1a8f00 100644 --- a/packages/app-desktop/tools/copyTinyMceLangs.js +++ b/packages/app-desktop/tools/copyTinyMceLangs.js @@ -1,6 +1,6 @@ const fs = require('fs-extra'); const glob = require('glob'); -const utils = require('@joplinapp/tools/gulp/utils'); +const utils = require('@joplin/tools/gulp/utils'); async function main() { const sourceDir = `${__dirname}/../../../Assets/TinyMCE/langs`; diff --git a/packages/app-mobile/MarkdownEditor/MarkdownEditor.js b/packages/app-mobile/MarkdownEditor/MarkdownEditor.js index b603756e5..61a44d5f1 100644 --- a/packages/app-mobile/MarkdownEditor/MarkdownEditor.js +++ b/packages/app-mobile/MarkdownEditor/MarkdownEditor.js @@ -13,7 +13,7 @@ import { Image, } from 'react-native'; import { renderFormatButtons } from './renderButtons'; -import NoteBodyViewer from '@joplinapp/lib/components/NoteBodyViewer/NoteBodyViewer'; +import NoteBodyViewer from '@joplin/lib/components/NoteBodyViewer/NoteBodyViewer'; const styles = StyleSheet.create({ buttonContainer: { diff --git a/packages/app-mobile/MarkdownEditor/applyListFormat.js b/packages/app-mobile/MarkdownEditor/applyListFormat.js index 6acb4fd0b..069cde54a 100644 --- a/packages/app-mobile/MarkdownEditor/applyListFormat.js +++ b/packages/app-mobile/MarkdownEditor/applyListFormat.js @@ -1,5 +1,5 @@ import { replaceBetween } from './utils'; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; export default ({ getState, item, setState }) => { let { text } = getState(); diff --git a/packages/app-mobile/MarkdownEditor/applyWebLinkFormat.js b/packages/app-mobile/MarkdownEditor/applyWebLinkFormat.js index 8d1a8c043..f5666f152 100644 --- a/packages/app-mobile/MarkdownEditor/applyWebLinkFormat.js +++ b/packages/app-mobile/MarkdownEditor/applyWebLinkFormat.js @@ -2,7 +2,7 @@ import { isStringWebLink, replaceBetween } from './utils'; export const writeUrlTextHere = 'https://example.com'; export const writeTextHereString = 'Write some text here'; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars export default ({ getState, item, setState }) => { diff --git a/packages/app-mobile/MarkdownEditor/applyWrapFormat.js b/packages/app-mobile/MarkdownEditor/applyWrapFormat.js index 127ec1fe2..78cf8836c 100644 --- a/packages/app-mobile/MarkdownEditor/applyWrapFormat.js +++ b/packages/app-mobile/MarkdownEditor/applyWrapFormat.js @@ -1,5 +1,5 @@ import { replaceBetween } from './utils'; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; export default ({ getState, item, setState }) => { const { text, selection } = getState(); diff --git a/packages/app-mobile/MarkdownEditor/applyWrapFormatNewLines.js b/packages/app-mobile/MarkdownEditor/applyWrapFormatNewLines.js index 215f38e60..6d0eaef12 100644 --- a/packages/app-mobile/MarkdownEditor/applyWrapFormatNewLines.js +++ b/packages/app-mobile/MarkdownEditor/applyWrapFormatNewLines.js @@ -1,5 +1,5 @@ import { replaceBetween } from './utils'; -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; export default ({ getState, item, setState }) => { const { text, selection } = getState(); diff --git a/packages/app-mobile/PluginAssetsLoader.ts b/packages/app-mobile/PluginAssetsLoader.ts index 6a01a4f8c..67cde4f84 100644 --- a/packages/app-mobile/PluginAssetsLoader.ts +++ b/packages/app-mobile/PluginAssetsLoader.ts @@ -1,8 +1,8 @@ -import shim from '@joplinapp/lib/shim'; -const { dirname } = require('@joplinapp/lib/path-utils'); -const Setting = require('@joplinapp/lib/models/Setting').default; +import shim from '@joplin/lib/shim'; +const { dirname } = require('@joplin/lib/path-utils'); +const Setting = require('@joplin/lib/models/Setting').default; const pluginAssets = require('./pluginAssets/index'); -const KvStore = require('@joplinapp/lib/services/KvStore.js'); +const KvStore = require('@joplin/lib/services/KvStore.js'); export default class PluginAssetsLoader { diff --git a/packages/app-mobile/components/CameraView.tsx b/packages/app-mobile/components/CameraView.tsx index a621b7ab5..e93ead856 100644 --- a/packages/app-mobile/components/CameraView.tsx +++ b/packages/app-mobile/components/CameraView.tsx @@ -4,9 +4,9 @@ const Component = React.Component; const { connect } = require('react-redux'); const { View, TouchableOpacity, Text, Dimensions } = require('react-native'); const Icon = require('react-native-vector-icons/Ionicons').default; -const { _ } = require('@joplinapp/lib/locale'); -const shim = require('@joplinapp/lib/shim').default; -const Setting = require('@joplinapp/lib/models/Setting').default; +const { _ } = require('@joplin/lib/locale'); +const shim = require('@joplin/lib/shim').default; +const Setting = require('@joplin/lib/models/Setting').default; Icon.loadFont(); diff --git a/packages/app-mobile/components/ModalDialog.js b/packages/app-mobile/components/ModalDialog.js index d6cc6a88f..62657dc64 100644 --- a/packages/app-mobile/components/ModalDialog.js +++ b/packages/app-mobile/components/ModalDialog.js @@ -1,7 +1,7 @@ const React = require('react'); const { Text, Modal, View, StyleSheet, Button } = require('react-native'); const { themeStyle } = require('./global-style.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class ModalDialog extends React.Component { constructor() { diff --git a/packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.tsx b/packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.tsx index b4ecd0c96..e9772eae6 100644 --- a/packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.tsx +++ b/packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.tsx @@ -1,6 +1,6 @@ import { useRef, useMemo, useCallback } from 'react'; -import Setting from '@joplinapp/lib/models/Setting'; +import Setting from '@joplin/lib/models/Setting'; import useSource from './hooks/useSource'; import useOnMessage from './hooks/useOnMessage'; import useOnResourceLongPress from './hooks/useOnResourceLongPress'; @@ -10,7 +10,7 @@ const { View } = require('react-native'); const { WebView } = require('react-native-webview'); const { themeStyle } = require('../global-style.js'); const BackButtonDialogBox = require('../BackButtonDialogBox').default; -const { reg } = require('@joplinapp/lib/registry.js'); +const { reg } = require('@joplin/lib/registry.js'); interface Props { themeId: number, diff --git a/packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.ts b/packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.ts index 5b65bbe25..713019771 100644 --- a/packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.ts +++ b/packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.ts @@ -1,5 +1,5 @@ import { useCallback } from 'react'; -const shared = require('@joplinapp/lib/components/shared/note-screen-shared'); +const shared = require('@joplin/lib/components/shared/note-screen-shared'); export default function useOnMessage(onCheckboxChange:Function, noteBody:string, onMarkForDownload:Function, onJoplinLinkClick:Function, onResourceLongPress:Function) { return useCallback((event:any) => { diff --git a/packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.ts b/packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.ts index dee8a3514..fdf5c1142 100644 --- a/packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.ts +++ b/packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.ts @@ -1,12 +1,12 @@ import { useCallback } from 'react'; -import Setting from '@joplinapp/lib/models/Setting'; -import shim from '@joplinapp/lib/shim'; +import Setting from '@joplin/lib/models/Setting'; +import shim from '@joplin/lib/shim'; const { ToastAndroid } = require('react-native'); -const { _ } = require('@joplinapp/lib/locale.js'); -const { reg } = require('@joplinapp/lib/registry.js'); +const { _ } = require('@joplin/lib/locale.js'); +const { reg } = require('@joplin/lib/registry.js'); const { dialogs } = require('../../../utils/dialogs.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); +const Resource = require('@joplin/lib/models/Resource.js'); const Share = require('react-native-share').default; export default function useOnResourceLongPress(onJoplinLinkClick:Function, dialogBoxRef:any) { diff --git a/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts b/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts index f253c03db..40d5affd1 100644 --- a/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts +++ b/packages/app-mobile/components/NoteBodyViewer/hooks/useSource.ts @@ -1,9 +1,9 @@ import { useEffect, useState, useMemo } from 'react'; -import shim from '@joplinapp/lib/shim'; -import Setting from '@joplinapp/lib/models/Setting'; +import shim from '@joplin/lib/shim'; +import Setting from '@joplin/lib/models/Setting'; const { themeStyle } = require('../../global-style.js'); -const markupLanguageUtils = require('@joplinapp/lib/markupLanguageUtils').default; -const { assetsToHeaders } = require('@joplinapp/renderer'); +const markupLanguageUtils = require('@joplin/lib/markupLanguageUtils').default; +const { assetsToHeaders } = require('@joplin/renderer'); interface Source { uri: string, diff --git a/packages/app-mobile/components/SelectDateTimeDialog.tsx b/packages/app-mobile/components/SelectDateTimeDialog.tsx index ee367caa9..f9a91e4e2 100644 --- a/packages/app-mobile/components/SelectDateTimeDialog.tsx +++ b/packages/app-mobile/components/SelectDateTimeDialog.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; -import { themeStyle } from '@joplinapp/lib/theme'; -import { _ } from '@joplinapp/lib/locale'; +import { themeStyle } from '@joplin/lib/theme'; +import { _ } from '@joplin/lib/locale'; const { View, Button, Text } = require('react-native'); const PopupDialog = require('react-native-popup-dialog').default; const { DialogTitle, DialogButton } = require('react-native-popup-dialog'); -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const DateTimePickerModal = require('react-native-modal-datetime-picker').default; export default class SelectDateTimeDialog extends React.PureComponent { diff --git a/packages/app-mobile/components/action-button.js b/packages/app-mobile/components/action-button.js index a36a62d3f..ec9d32237 100644 --- a/packages/app-mobile/components/action-button.js +++ b/packages/app-mobile/components/action-button.js @@ -1,11 +1,11 @@ const React = require('react'); const { StyleSheet } = require('react-native'); -const Note = require('@joplinapp/lib/models/Note'); +const Note = require('@joplin/lib/models/Note'); const Icon = require('react-native-vector-icons/Ionicons').default; const ReactNativeActionButton = require('react-native-action-button').default; const { connect } = require('react-redux'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); Icon.loadFont(); diff --git a/packages/app-mobile/components/global-style.js b/packages/app-mobile/components/global-style.js index 905830897..adcd73402 100644 --- a/packages/app-mobile/components/global-style.js +++ b/packages/app-mobile/components/global-style.js @@ -1,6 +1,6 @@ -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; const { Platform } = require('react-native'); -const { themeById } = require('@joplinapp/lib/theme'); +const { themeById } = require('@joplin/lib/theme'); const baseStyle = { appearance: 'light', diff --git a/packages/app-mobile/components/note-item.js b/packages/app-mobile/components/note-item.js index e6977d4b5..9a61c35eb 100644 --- a/packages/app-mobile/components/note-item.js +++ b/packages/app-mobile/components/note-item.js @@ -3,8 +3,8 @@ const Component = React.Component; const { connect } = require('react-redux'); const { Text, TouchableOpacity, View, StyleSheet } = require('react-native'); const { Checkbox } = require('./checkbox.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const time = require('@joplinapp/lib/time').default; +const Note = require('@joplin/lib/models/Note.js'); +const time = require('@joplin/lib/time').default; const { themeStyle } = require('./global-style.js'); class NoteItemComponent extends Component { diff --git a/packages/app-mobile/components/note-list.js b/packages/app-mobile/components/note-list.js index c791993bc..29226c3e3 100644 --- a/packages/app-mobile/components/note-list.js +++ b/packages/app-mobile/components/note-list.js @@ -2,9 +2,9 @@ const React = require('react'); const Component = React.Component; const { connect } = require('react-redux'); const { FlatList, Text, StyleSheet, Button, View } = require('react-native'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { NoteItem } = require('./note-item.js'); -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { themeStyle } = require('./global-style.js'); class NoteListComponent extends Component { diff --git a/packages/app-mobile/components/screen-header.js b/packages/app-mobile/components/screen-header.js index a451485f8..406147ca1 100644 --- a/packages/app-mobile/components/screen-header.js +++ b/packages/app-mobile/components/screen-header.js @@ -4,12 +4,12 @@ const { connect } = require('react-redux'); const { View, Text, StyleSheet, TouchableOpacity, Image, ScrollView, Dimensions } = require('react-native'); const Icon = require('react-native-vector-icons/Ionicons').default; const { BackButtonService } = require('../services/back-button.js'); -const NavService = require('@joplinapp/lib/services/NavService.js'); +const NavService = require('@joplin/lib/services/NavService.js'); const { Menu, MenuOptions, MenuOption, MenuTrigger } = require('react-native-popup-menu'); -const { _ } = require('@joplinapp/lib/locale'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); +const { _ } = require('@joplin/lib/locale'); +const Setting = require('@joplin/lib/models/Setting').default; +const Note = require('@joplin/lib/models/Note.js'); +const Folder = require('@joplin/lib/models/Folder.js'); const { themeStyle } = require('./global-style.js'); const { Dropdown } = require('./Dropdown.js'); const { dialogs } = require('../utils/dialogs.js'); diff --git a/packages/app-mobile/components/screens/Note.tsx b/packages/app-mobile/components/screens/Note.tsx index dd4e14844..3230fbbb7 100644 --- a/packages/app-mobile/components/screens/Note.tsx +++ b/packages/app-mobile/components/screens/Note.tsx @@ -1,8 +1,8 @@ -import AsyncActionQueue from '@joplinapp/lib/AsyncActionQueue'; -import UndoRedoService from '@joplinapp/lib/services/UndoRedoService'; -import uuid from '@joplinapp/lib/uuid'; -import Setting from '@joplinapp/lib/models/Setting'; -import shim from '@joplinapp/lib/shim'; +import AsyncActionQueue from '@joplin/lib/AsyncActionQueue'; +import UndoRedoService from '@joplin/lib/services/UndoRedoService'; +import uuid from '@joplin/lib/uuid'; +import Setting from '@joplin/lib/models/Setting'; +import shim from '@joplin/lib/shim'; import NoteBodyViewer from '../NoteBodyViewer/NoteBodyViewer'; import checkPermissions from '../../utils/checkPermissions'; @@ -10,39 +10,39 @@ const FileViewer = require('react-native-file-viewer').default; const React = require('react'); const { Platform, Keyboard, View, TextInput, StyleSheet, Linking, Image, Share, PermissionsAndroid } = require('react-native'); const { connect } = require('react-redux'); -// const { MarkdownEditor } = require('@joplinapp/lib/../MarkdownEditor/index.js'); +// const { MarkdownEditor } = require('@joplin/lib/../MarkdownEditor/index.js'); const RNFS = require('react-native-fs'); -const Note = require('@joplinapp/lib/models/Note.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); +const Note = require('@joplin/lib/models/Note.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const Folder = require('@joplin/lib/models/Folder.js'); const Clipboard = require('@react-native-community/clipboard').default; const md5 = require('md5'); const { BackButtonService } = require('../../services/back-button.js'); -const NavService = require('@joplinapp/lib/services/NavService.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const NavService = require('@joplin/lib/services/NavService.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; const { ActionButton } = require('../action-button.js'); -const { fileExtension, safeFileExtension } = require('@joplinapp/lib/path-utils'); -const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime; +const { fileExtension, safeFileExtension } = require('@joplin/lib/path-utils'); +const mimeUtils = require('@joplin/lib/mime-utils.js').mime; const { ScreenHeader } = require('../screen-header.js'); const NoteTagsDialog = require('./NoteTagsDialog'); -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { Checkbox } = require('../checkbox.js'); -const { _ } = require('@joplinapp/lib/locale'); -const { reg } = require('@joplinapp/lib/registry.js'); -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher'); +const { _ } = require('@joplin/lib/locale'); +const { reg } = require('@joplin/lib/registry.js'); +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher'); const { BaseScreenComponent } = require('../base-screen.js'); const { themeStyle, editorFont } = require('../global-style.js'); const { dialogs } = require('../../utils/dialogs.js'); const DialogBox = require('react-native-dialogbox').default; const DocumentPicker = require('react-native-document-picker').default; const ImageResizer = require('react-native-image-resizer').default; -const shared = require('@joplinapp/lib/components/shared/note-screen-shared.js'); +const shared = require('@joplin/lib/components/shared/note-screen-shared.js'); const ImagePicker = require('react-native-image-picker').default; const SelectDateTimeDialog = require('../SelectDateTimeDialog').default; const ShareExtension = require('../../utils/ShareExtension.js').default; const CameraView = require('../CameraView').default; -const urlUtils = require('@joplinapp/lib/urlUtils'); +const urlUtils = require('@joplin/lib/urlUtils'); const emptyArray:any[] = []; diff --git a/packages/app-mobile/components/screens/NoteTagsDialog.js b/packages/app-mobile/components/screens/NoteTagsDialog.js index 6c9223d15..319aee27b 100644 --- a/packages/app-mobile/components/screens/NoteTagsDialog.js +++ b/packages/app-mobile/components/screens/NoteTagsDialog.js @@ -2,8 +2,8 @@ const React = require('react'); const { StyleSheet, View, Text, FlatList, TouchableOpacity, TextInput } = require('react-native'); const { connect } = require('react-redux'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const { _ } = require('@joplinapp/lib/locale'); +const Tag = require('@joplin/lib/models/Tag.js'); +const { _ } = require('@joplin/lib/locale'); const { themeStyle } = require('../global-style.js'); const Icon = require('react-native-vector-icons/Ionicons').default; const ModalDialog = require('../ModalDialog'); diff --git a/packages/app-mobile/components/screens/UpgradeSyncTargetScreen.tsx b/packages/app-mobile/components/screens/UpgradeSyncTargetScreen.tsx index aa669a9f2..950da800c 100644 --- a/packages/app-mobile/components/screens/UpgradeSyncTargetScreen.tsx +++ b/packages/app-mobile/components/screens/UpgradeSyncTargetScreen.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; -import useSyncTargetUpgrade from '@joplinapp/lib/services/synchronizer/gui/useSyncTargetUpgrade'; -import { _ } from '@joplinapp/lib/locale'; +import useSyncTargetUpgrade from '@joplin/lib/services/synchronizer/gui/useSyncTargetUpgrade'; +import { _ } from '@joplin/lib/locale'; const { View, Text, ScrollView } = require('react-native'); const { connect } = require('react-redux'); diff --git a/packages/app-mobile/components/screens/config.js b/packages/app-mobile/components/screens/config.js index fb240fac5..882d49f0a 100644 --- a/packages/app-mobile/components/screens/config.js +++ b/packages/app-mobile/components/screens/config.js @@ -3,20 +3,20 @@ const React = require('react'); const { Platform, TouchableOpacity, Linking, View, Switch, StyleSheet, Text, Button, ScrollView, TextInput, Alert, PermissionsAndroid } = require('react-native'); const { connect } = require('react-redux'); const { ScreenHeader } = require('../screen-header.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { BaseScreenComponent } = require('../base-screen.js'); const { Dropdown } = require('../Dropdown.js'); const { themeStyle } = require('../global-style.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; -const shared = require('@joplinapp/lib/components/shared/config-shared.js'); -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry'); -const { reg } = require('@joplinapp/lib/registry.js'); -const NavService = require('@joplinapp/lib/services/NavService.js'); +const Setting = require('@joplin/lib/models/Setting').default; +const shared = require('@joplin/lib/components/shared/config-shared.js'); +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry'); +const { reg } = require('@joplin/lib/registry.js'); +const NavService = require('@joplin/lib/services/NavService.js'); const VersionInfo = require('react-native-version-info').default; -const { ReportService } = require('@joplinapp/lib/services/report.js'); -const time = require('@joplinapp/lib/time').default; -const shim = require('@joplinapp/lib/shim').default; -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); +const { ReportService } = require('@joplin/lib/services/report.js'); +const time = require('@joplin/lib/time').default; +const shim = require('@joplin/lib/shim').default; +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); const RNFS = require('react-native-fs'); const checkPermissions = require('../../utils/checkPermissions.js').default; diff --git a/packages/app-mobile/components/screens/dropbox-login.js b/packages/app-mobile/components/screens/dropbox-login.js index 56b92b7b7..d3204daa7 100644 --- a/packages/app-mobile/components/screens/dropbox-login.js +++ b/packages/app-mobile/components/screens/dropbox-login.js @@ -3,11 +3,11 @@ const React = require('react'); const { View, Button, Text, TextInput, TouchableOpacity, StyleSheet, ScrollView } = require('react-native'); const { connect } = require('react-redux'); const { ScreenHeader } = require('../screen-header.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { BaseScreenComponent } = require('../base-screen.js'); const DialogBox = require('react-native-dialogbox').default; const { dialogs } = require('../../utils/dialogs.js'); -const Shared = require('@joplinapp/lib/components/shared/dropbox-login-shared'); +const Shared = require('@joplin/lib/components/shared/dropbox-login-shared'); const { themeStyle } = require('../global-style.js'); class DropboxLoginScreenComponent extends BaseScreenComponent { diff --git a/packages/app-mobile/components/screens/encryption-config.js b/packages/app-mobile/components/screens/encryption-config.js index d1f84dcac..d915d2b90 100644 --- a/packages/app-mobile/components/screens/encryption-config.js +++ b/packages/app-mobile/components/screens/encryption-config.js @@ -1,14 +1,14 @@ const React = require('react'); const { TextInput, TouchableOpacity, Linking, View, StyleSheet, Text, Button, ScrollView } = require('react-native'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); +const EncryptionService = require('@joplin/lib/services/EncryptionService'); const { connect } = require('react-redux'); const { ScreenHeader } = require('../screen-header.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { BaseScreenComponent } = require('../base-screen.js'); const { themeStyle } = require('../global-style.js'); -const time = require('@joplinapp/lib/time').default; -const shared = require('@joplinapp/lib/components/shared/encryption-config-shared.js'); +const time = require('@joplin/lib/time').default; +const shared = require('@joplin/lib/components/shared/encryption-config-shared.js'); const { dialogs } = require('../../utils/dialogs.js'); const DialogBox = require('react-native-dialogbox').default; diff --git a/packages/app-mobile/components/screens/folder.js b/packages/app-mobile/components/screens/folder.js index b9789e6e0..a43a65a06 100644 --- a/packages/app-mobile/components/screens/folder.js +++ b/packages/app-mobile/components/screens/folder.js @@ -2,13 +2,13 @@ const React = require('react'); const { View, TextInput, StyleSheet } = require('react-native'); const { connect } = require('react-redux'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; const { ScreenHeader } = require('../screen-header.js'); const { BaseScreenComponent } = require('../base-screen.js'); const { dialogs } = require('../../utils/dialogs.js'); const { themeStyle } = require('../global-style.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class FolderScreenComponent extends BaseScreenComponent { static navigationOptions() { diff --git a/packages/app-mobile/components/screens/log.js b/packages/app-mobile/components/screens/log.js index 327787a7d..41241a896 100644 --- a/packages/app-mobile/components/screens/log.js +++ b/packages/app-mobile/components/screens/log.js @@ -2,13 +2,13 @@ const React = require('react'); const { FlatList, View, Text, Button, StyleSheet, Platform } = require('react-native'); const { connect } = require('react-redux'); -const { reg } = require('@joplinapp/lib/registry.js'); +const { reg } = require('@joplin/lib/registry.js'); const { ScreenHeader } = require('../screen-header.js'); -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { themeStyle } = require('../global-style.js'); -const Logger = require('@joplinapp/lib/Logger').default; +const Logger = require('@joplin/lib/Logger').default; const { BaseScreenComponent } = require('../base-screen.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); class LogScreenComponent extends BaseScreenComponent { static navigationOptions() { diff --git a/packages/app-mobile/components/screens/notes.js b/packages/app-mobile/components/screens/notes.js index 10fdbd7ee..55875c497 100644 --- a/packages/app-mobile/components/screens/notes.js +++ b/packages/app-mobile/components/screens/notes.js @@ -1,16 +1,16 @@ const React = require('react'); const { AppState, View, StyleSheet } = require('react-native'); -const { stateUtils } = require('@joplinapp/lib/reducer'); +const { stateUtils } = require('@joplin/lib/reducer'); const { connect } = require('react-redux'); const { NoteList } = require('../note-list.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const Note = require('@joplinapp/lib/models/Note.js'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Folder = require('@joplin/lib/models/Folder.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const Note = require('@joplin/lib/models/Note.js'); +const Setting = require('@joplin/lib/models/Setting').default; const { themeStyle } = require('../global-style.js'); const { ScreenHeader } = require('../screen-header.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { ActionButton } = require('../action-button.js'); const { dialogs } = require('../../utils/dialogs.js'); const DialogBox = require('react-native-dialogbox').default; diff --git a/packages/app-mobile/components/screens/onedrive-login.js b/packages/app-mobile/components/screens/onedrive-login.js index f70bdf708..3259f6ae1 100644 --- a/packages/app-mobile/components/screens/onedrive-login.js +++ b/packages/app-mobile/components/screens/onedrive-login.js @@ -5,12 +5,12 @@ const { Button } = require('react-native'); const { WebView } = require('react-native-webview'); const { connect } = require('react-redux'); const { ScreenHeader } = require('../screen-header.js'); -const { reg } = require('@joplinapp/lib/registry.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { reg } = require('@joplin/lib/registry.js'); +const { _ } = require('@joplin/lib/locale'); const { BaseScreenComponent } = require('../base-screen.js'); -const parseUri = require('@joplinapp/lib/parseUri'); +const parseUri = require('@joplin/lib/parseUri'); const { themeStyle } = require('../global-style.js'); -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; class OneDriveLoginScreenComponent extends BaseScreenComponent { static navigationOptions() { diff --git a/packages/app-mobile/components/screens/search.js b/packages/app-mobile/components/screens/search.js index 9198209fe..12e269c7e 100644 --- a/packages/app-mobile/components/screens/search.js +++ b/packages/app-mobile/components/screens/search.js @@ -4,14 +4,14 @@ const { StyleSheet, View, TextInput, FlatList, TouchableHighlight } = require('r const { connect } = require('react-redux'); const { ScreenHeader } = require('../screen-header.js'); const Icon = require('react-native-vector-icons/Ionicons').default; -const { _ } = require('@joplinapp/lib/locale'); -const Note = require('@joplinapp/lib/models/Note.js'); +const { _ } = require('@joplin/lib/locale'); +const Note = require('@joplin/lib/models/Note.js'); const { NoteItem } = require('../note-item.js'); const { BaseScreenComponent } = require('../base-screen.js'); const { themeStyle } = require('../global-style.js'); const DialogBox = require('react-native-dialogbox').default; -const SearchEngineUtils = require('@joplinapp/lib/services/searchengine/SearchEngineUtils'); -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); +const SearchEngineUtils = require('@joplin/lib/services/searchengine/SearchEngineUtils'); +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); Icon.loadFont(); diff --git a/packages/app-mobile/components/screens/status.js b/packages/app-mobile/components/screens/status.js index 2a1513122..3a4a46605 100644 --- a/packages/app-mobile/components/screens/status.js +++ b/packages/app-mobile/components/screens/status.js @@ -1,11 +1,11 @@ const React = require('react'); const { View, Text, Button, FlatList } = require('react-native'); -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; const { connect } = require('react-redux'); const { ScreenHeader } = require('../screen-header.js'); -const { ReportService } = require('@joplinapp/lib/services/report.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { ReportService } = require('@joplin/lib/services/report.js'); +const { _ } = require('@joplin/lib/locale'); const { BaseScreenComponent } = require('../base-screen.js'); const { themeStyle } = require('../global-style.js'); diff --git a/packages/app-mobile/components/screens/tags.js b/packages/app-mobile/components/screens/tags.js index e9e5498b1..aa44978fa 100644 --- a/packages/app-mobile/components/screens/tags.js +++ b/packages/app-mobile/components/screens/tags.js @@ -2,10 +2,10 @@ const React = require('react'); const { View, Text, FlatList, StyleSheet, TouchableOpacity } = require('react-native'); const { connect } = require('react-redux'); -const Tag = require('@joplinapp/lib/models/Tag.js'); +const Tag = require('@joplin/lib/models/Tag.js'); const { themeStyle } = require('../global-style.js'); const { ScreenHeader } = require('../screen-header.js'); -const { _ } = require('@joplinapp/lib/locale'); +const { _ } = require('@joplin/lib/locale'); const { BaseScreenComponent } = require('../base-screen.js'); class TagsScreenComponent extends BaseScreenComponent { diff --git a/packages/app-mobile/components/side-menu-content.js b/packages/app-mobile/components/side-menu-content.js index b372cf713..e13cfb04c 100644 --- a/packages/app-mobile/components/side-menu-content.js +++ b/packages/app-mobile/components/side-menu-content.js @@ -3,12 +3,12 @@ const Component = React.Component; const { Easing, Animated, TouchableOpacity, Text, StyleSheet, ScrollView, View, Alert } = require('react-native'); const { connect } = require('react-redux'); const Icon = require('react-native-vector-icons/Ionicons').default; -const Folder = require('@joplinapp/lib/models/Folder.js'); -const Synchronizer = require('@joplinapp/lib/Synchronizer').default; -const NavService = require('@joplinapp/lib/services/NavService.js'); -const { _ } = require('@joplinapp/lib/locale'); +const Folder = require('@joplin/lib/models/Folder.js'); +const Synchronizer = require('@joplin/lib/Synchronizer').default; +const NavService = require('@joplin/lib/services/NavService.js'); +const { _ } = require('@joplin/lib/locale'); const { themeStyle } = require('./global-style.js'); -const shared = require('@joplinapp/lib/components/shared/side-menu-shared.js'); +const shared = require('@joplin/lib/components/shared/side-menu-shared.js'); Icon.loadFont(); diff --git a/packages/app-mobile/gulpfile.js b/packages/app-mobile/gulpfile.js index 35631f3a7..852bc30ba 100644 --- a/packages/app-mobile/gulpfile.js +++ b/packages/app-mobile/gulpfile.js @@ -1,6 +1,6 @@ const gulp = require('gulp'); const fs = require('fs-extra'); -const utils = require('@joplinapp/tools/gulp/utils'); +const utils = require('@joplin/tools/gulp/utils'); const tasks = { encodeAssets: { diff --git a/packages/app-mobile/metro.config.js b/packages/app-mobile/metro.config.js index 4636622fd..03ec41caa 100644 --- a/packages/app-mobile/metro.config.js +++ b/packages/app-mobile/metro.config.js @@ -39,10 +39,10 @@ module.exports = { // * module as they would be imported when the module is actually used. // { - '@joplinapp/lib': path.resolve(__dirname, '../lib/'), - '@joplinapp/renderer': path.resolve(__dirname, '../renderer/'), - '@joplinapp/tools': path.resolve(__dirname, '../tools/'), - '@joplinapp/fork-htmlparser2': path.resolve(__dirname, '../fork-htmlparser2/'), + '@joplin/lib': path.resolve(__dirname, '../lib/'), + '@joplin/renderer': path.resolve(__dirname, '../renderer/'), + '@joplin/tools': path.resolve(__dirname, '../tools/'), + '@joplin/fork-htmlparser2': path.resolve(__dirname, '../fork-htmlparser2/'), }, { get: (target, name) => { diff --git a/packages/app-mobile/package-lock.json b/packages/app-mobile/package-lock.json index eb25b6138..ba8e27733 100644 --- a/packages/app-mobile/package-lock.json +++ b/packages/app-mobile/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/app-mobile", + "name": "@joplin/app-mobile", "version": "0.8.9", "lockfileVersion": 1, "requires": true, diff --git a/packages/app-mobile/package.json b/packages/app-mobile/package.json index 3b2c944c7..ac677226c 100644 --- a/packages/app-mobile/package.json +++ b/packages/app-mobile/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/app-mobile", + "name": "@joplin/app-mobile", "description": "Joplin for Mobile", "license": "MIT", "version": "0.8.9", @@ -13,8 +13,8 @@ "postinstall": "jetify && npm run build" }, "dependencies": { - "@joplinapp/lib": "^1.0.9", - "@joplinapp/renderer": "^1.0.17", + "@joplin/lib": "^1.0.9", + "@joplin/renderer": "^1.0.17", "@react-native-community/clipboard": "^1.5.0", "@react-native-community/datetimepicker": "^3.0.3", "@react-native-community/geolocation": "^2.0.2", @@ -58,7 +58,7 @@ "valid-url": "^1.0.9" }, "devDependencies": { - "@joplinapp/tools": "^1.0.9", + "@joplin/tools": "^1.0.9", "@babel/core": "^7.11.6", "@babel/runtime": "^7.11.2", "@types/node": "^14.14.6", diff --git a/packages/app-mobile/root.js b/packages/app-mobile/root.js index 7757b61f8..9dedc4b7c 100644 --- a/packages/app-mobile/root.js +++ b/packages/app-mobile/root.js @@ -3,39 +3,39 @@ import PluginAssetsLoader from './PluginAssetsLoader'; const React = require('react'); const { AppState, Keyboard, NativeModules, BackHandler, Animated, View, StatusBar } = require('react-native'); -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; shim.setReact(React); const SafeAreaView = require('./components/SafeAreaView'); const { connect, Provider } = require('react-redux'); const { BackButtonService } = require('./services/back-button.js'); -const NavService = require('@joplinapp/lib/services/NavService.js'); -const AlarmService = require('@joplinapp/lib/services/AlarmService.js').default; +const NavService = require('@joplin/lib/services/NavService.js'); +const AlarmService = require('@joplin/lib/services/AlarmService.js').default; const AlarmServiceDriver = require('./services/AlarmServiceDriver').default; -const Alarm = require('@joplinapp/lib/models/Alarm').default; +const Alarm = require('@joplin/lib/models/Alarm').default; const { createStore, applyMiddleware } = require('redux'); -const reduxSharedMiddleware = require('@joplinapp/lib/components/shared/reduxSharedMiddleware'); +const reduxSharedMiddleware = require('@joplin/lib/components/shared/reduxSharedMiddleware'); const { shimInit } = require('./utils/shim-init-react.js'); -const time = require('@joplinapp/lib/time').default; +const time = require('@joplin/lib/time').default; const { AppNav } = require('./components/app-nav.js'); -const Logger = require('@joplinapp/lib/Logger').default; -const Note = require('@joplinapp/lib/models/Note.js'); -const Folder = require('@joplinapp/lib/models/Folder.js'); -const BaseSyncTarget = require('@joplinapp/lib/BaseSyncTarget.js'); -const { FoldersScreenUtils } = require('@joplinapp/lib/folders-screen-utils.js'); -const Resource = require('@joplinapp/lib/models/Resource.js'); -const Tag = require('@joplinapp/lib/models/Tag.js'); -const NoteTag = require('@joplinapp/lib/models/NoteTag.js'); -const BaseItem = require('@joplinapp/lib/models/BaseItem.js'); -const MasterKey = require('@joplinapp/lib/models/MasterKey.js'); -const Revision = require('@joplinapp/lib/models/Revision.js'); -const BaseModel = require('@joplinapp/lib/BaseModel').default; -const BaseService = require('@joplinapp/lib/services/BaseService').default; -const ResourceService = require('@joplinapp/lib/services/ResourceService'); -const RevisionService = require('@joplinapp/lib/services/RevisionService'); -const KvStore = require('@joplinapp/lib/services/KvStore'); -const { JoplinDatabase } = require('@joplinapp/lib/joplin-database.js'); -const { Database } = require('@joplinapp/lib/database.js'); +const Logger = require('@joplin/lib/Logger').default; +const Note = require('@joplin/lib/models/Note.js'); +const Folder = require('@joplin/lib/models/Folder.js'); +const BaseSyncTarget = require('@joplin/lib/BaseSyncTarget.js'); +const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js'); +const Resource = require('@joplin/lib/models/Resource.js'); +const Tag = require('@joplin/lib/models/Tag.js'); +const NoteTag = require('@joplin/lib/models/NoteTag.js'); +const BaseItem = require('@joplin/lib/models/BaseItem.js'); +const MasterKey = require('@joplin/lib/models/MasterKey.js'); +const Revision = require('@joplin/lib/models/Revision.js'); +const BaseModel = require('@joplin/lib/BaseModel').default; +const BaseService = require('@joplin/lib/services/BaseService').default; +const ResourceService = require('@joplin/lib/services/ResourceService'); +const RevisionService = require('@joplin/lib/services/RevisionService'); +const KvStore = require('@joplin/lib/services/KvStore'); +const { JoplinDatabase } = require('@joplin/lib/joplin-database.js'); +const { Database } = require('@joplin/lib/database.js'); const { NotesScreen } = require('./components/screens/notes.js'); const { TagsScreen } = require('./components/screens/tags.js'); const NoteScreen = require('./components/screens/Note').default; @@ -48,38 +48,38 @@ const { OneDriveLoginScreen } = require('./components/screens/onedrive-login.js' const { EncryptionConfigScreen } = require('./components/screens/encryption-config.js'); const { DropboxLoginScreen } = require('./components/screens/dropbox-login.js'); const UpgradeSyncTargetScreen = require('./components/screens/UpgradeSyncTargetScreen').default; -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; const { MenuContext } = require('react-native-popup-menu'); const { SideMenu } = require('./components/side-menu.js'); const { SideMenuContent } = require('./components/side-menu-content.js'); const { SideMenuContentNote } = require('./components/side-menu-content-note.js'); const { DatabaseDriverReactNative } = require('./utils/database-driver-react-native'); -const { reg } = require('@joplinapp/lib/registry.js'); -const { setLocale, closestSupportedLocale, defaultLocale } = require('@joplinapp/lib/locale'); +const { reg } = require('@joplin/lib/registry.js'); +const { setLocale, closestSupportedLocale, defaultLocale } = require('@joplin/lib/locale'); const RNFetchBlob = require('rn-fetch-blob').default; -const PoorManIntervals = require('@joplinapp/lib/PoorManIntervals').default; -const reducer = require('@joplinapp/lib/reducer').default; -const { defaultState } = require('@joplinapp/lib/reducer'); -const { FileApiDriverLocal } = require('@joplinapp/lib/file-api-driver-local.js'); +const PoorManIntervals = require('@joplin/lib/PoorManIntervals').default; +const reducer = require('@joplin/lib/reducer').default; +const { defaultState } = require('@joplin/lib/reducer'); +const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local.js'); const DropdownAlert = require('react-native-dropdownalert').default; const ShareExtension = require('./utils/ShareExtension.js').default; const handleShared = require('./utils/shareHandler').default; -const ResourceFetcher = require('@joplinapp/lib/services/ResourceFetcher'); -const SearchEngine = require('@joplinapp/lib/services/searchengine/SearchEngine'); -const WelcomeUtils = require('@joplinapp/lib/WelcomeUtils'); +const ResourceFetcher = require('@joplin/lib/services/ResourceFetcher'); +const SearchEngine = require('@joplin/lib/services/searchengine/SearchEngine'); +const WelcomeUtils = require('@joplin/lib/WelcomeUtils'); const { themeStyle } = require('./components/global-style.js'); -const uuid = require('@joplinapp/lib/uuid').default; +const uuid = require('@joplin/lib/uuid').default; -const { loadKeychainServiceAndSettings } = require('@joplinapp/lib/services/SettingUtils'); -const KeychainServiceDriverMobile = require('@joplinapp/lib/services/keychain/KeychainServiceDriver.mobile').default; +const { loadKeychainServiceAndSettings } = require('@joplin/lib/services/SettingUtils'); +const KeychainServiceDriverMobile = require('@joplin/lib/services/keychain/KeychainServiceDriver.mobile').default; -const SyncTargetRegistry = require('@joplinapp/lib/SyncTargetRegistry.js'); -const SyncTargetOneDrive = require('@joplinapp/lib/SyncTargetOneDrive.js'); -const SyncTargetFilesystem = require('@joplinapp/lib/SyncTargetFilesystem.js'); -const SyncTargetNextcloud = require('@joplinapp/lib/SyncTargetNextcloud.js'); -const SyncTargetWebDAV = require('@joplinapp/lib/SyncTargetWebDAV.js'); -const SyncTargetDropbox = require('@joplinapp/lib/SyncTargetDropbox.js'); -const SyncTargetAmazonS3 = require('@joplinapp/lib/SyncTargetAmazonS3.js'); +const SyncTargetRegistry = require('@joplin/lib/SyncTargetRegistry.js'); +const SyncTargetOneDrive = require('@joplin/lib/SyncTargetOneDrive.js'); +const SyncTargetFilesystem = require('@joplin/lib/SyncTargetFilesystem.js'); +const SyncTargetNextcloud = require('@joplin/lib/SyncTargetNextcloud.js'); +const SyncTargetWebDAV = require('@joplin/lib/SyncTargetWebDAV.js'); +const SyncTargetDropbox = require('@joplin/lib/SyncTargetDropbox.js'); +const SyncTargetAmazonS3 = require('@joplin/lib/SyncTargetAmazonS3.js'); SyncTargetRegistry.addClass(SyncTargetOneDrive); SyncTargetRegistry.addClass(SyncTargetNextcloud); @@ -89,9 +89,9 @@ SyncTargetRegistry.addClass(SyncTargetFilesystem); SyncTargetRegistry.addClass(SyncTargetAmazonS3); const FsDriverRN = require('./utils/fs-driver-rn.js').FsDriverRN; -const DecryptionWorker = require('@joplinapp/lib/services/DecryptionWorker'); -const EncryptionService = require('@joplinapp/lib/services/EncryptionService'); -const MigrationService = require('@joplinapp/lib/services/MigrationService'); +const DecryptionWorker = require('@joplin/lib/services/DecryptionWorker'); +const EncryptionService = require('@joplin/lib/services/EncryptionService'); +const MigrationService = require('@joplin/lib/services/MigrationService'); let storeDispatch = function() {}; @@ -403,7 +403,7 @@ async function initialize(dispatch) { reg.setShowErrorMessageBoxHandler((message) => { alert(message); }); BaseService.logger_ = mainLogger; - // require('@joplinapp/lib/ntpDate').setLogger(reg.logger()); + // require('@joplin/lib/ntpDate').setLogger(reg.logger()); reg.logger().info('===================================='); reg.logger().info(`Starting application ${Setting.value('appId')} (${Setting.value('env')})`); diff --git a/packages/app-mobile/services/AlarmServiceDriver.android.ts b/packages/app-mobile/services/AlarmServiceDriver.android.ts index 10417a55c..1c9113272 100644 --- a/packages/app-mobile/services/AlarmServiceDriver.android.ts +++ b/packages/app-mobile/services/AlarmServiceDriver.android.ts @@ -1,5 +1,5 @@ -import Logger from '@joplinapp/lib/Logger'; -import { Notification } from '@joplinapp/lib/models/Alarm'; +import Logger from '@joplin/lib/Logger'; +import { Notification } from '@joplin/lib/models/Alarm'; const ReactNativeAN = require('react-native-alarm-notification').default; diff --git a/packages/app-mobile/services/AlarmServiceDriver.ios.ts b/packages/app-mobile/services/AlarmServiceDriver.ios.ts index d221c61f5..9f121d6f6 100644 --- a/packages/app-mobile/services/AlarmServiceDriver.ios.ts +++ b/packages/app-mobile/services/AlarmServiceDriver.ios.ts @@ -1,5 +1,5 @@ -import { Notification } from '@joplinapp/lib/models/Alarm'; -import Logger from '@joplinapp/lib/Logger'; +import { Notification } from '@joplin/lib/models/Alarm'; +import Logger from '@joplin/lib/Logger'; const PushNotificationIOS = require('@react-native-community/push-notification-ios').default; export default class AlarmServiceDriver { diff --git a/packages/app-mobile/setUpQuickActions.ts b/packages/app-mobile/setUpQuickActions.ts index 6e4de1b96..0ad5866c9 100644 --- a/packages/app-mobile/setUpQuickActions.ts +++ b/packages/app-mobile/setUpQuickActions.ts @@ -2,10 +2,10 @@ // to disable buggy type-checking, maybe because this // class is undocumented. import * as QuickActions from 'react-native-quick-actions'; -import { _ } from '@joplinapp/lib/locale'; +import { _ } from '@joplin/lib/locale'; const { DeviceEventEmitter } = require('react-native'); -const Note = require('@joplinapp/lib/models/Note.js'); -const { reg } = require('@joplinapp/lib/registry.js'); +const Note = require('@joplin/lib/models/Note.js'); +const { reg } = require('@joplin/lib/registry.js'); type TData = { type: string diff --git a/packages/app-mobile/tools/buildReactNativeInjectedJs.js b/packages/app-mobile/tools/buildReactNativeInjectedJs.js index df3100f83..c4ca6ee9f 100644 --- a/packages/app-mobile/tools/buildReactNativeInjectedJs.js +++ b/packages/app-mobile/tools/buildReactNativeInjectedJs.js @@ -17,7 +17,7 @@ async function copyJs(name, filePath) { async function main() { await fs.mkdirp(outputDir); - await copyJs('webviewLib', `${rnDir}/node_modules/@joplinapp/lib/renderers/webviewLib.js`); + await copyJs('webviewLib', `${rnDir}/node_modules/@joplin/lib/renderers/webviewLib.js`); } module.exports = main; diff --git a/packages/app-mobile/tools/encodeAssets.js b/packages/app-mobile/tools/encodeAssets.js index da2294217..b855c89f4 100644 --- a/packages/app-mobile/tools/encodeAssets.js +++ b/packages/app-mobile/tools/encodeAssets.js @@ -1,4 +1,4 @@ -const utils = require('@joplinapp/tools/gulp/utils'); +const utils = require('@joplin/tools/gulp/utils'); const fs = require('fs-extra'); const md5 = require('md5'); @@ -47,7 +47,7 @@ async function main() { await fs.mkdirp(outputDir); const encodedFiles = []; - const sourceAssetDir = `${rootDir}/node_modules/@joplinapp/renderer/assets`; + const sourceAssetDir = `${rootDir}/node_modules/@joplin/renderer/assets`; const files = walk(sourceAssetDir); for (const file of files) { diff --git a/packages/app-mobile/tools/prepareRelease.js b/packages/app-mobile/tools/prepareRelease.js index 8d564711a..d969fee1b 100644 --- a/packages/app-mobile/tools/prepareRelease.js +++ b/packages/app-mobile/tools/prepareRelease.js @@ -3,8 +3,8 @@ // Android `assembleRelease` handles symlinks properly so maybe this is not // needed after all ¯\_(ツ)_/¯ -const { copyDir } = require('@joplinapp/tools/gulp/utils'); -const { rootDir, deleteLink, toSystemSlashes } = require('@joplinapp/tools/tool-utils'); +const { copyDir } = require('@joplin/tools/gulp/utils'); +const { rootDir, deleteLink, toSystemSlashes } = require('@joplin/tools/tool-utils'); const mobileDir = `${rootDir}/packages/app-mobile`; module.exports = async function() { @@ -15,7 +15,7 @@ module.exports = async function() { 'renderer', ]; - const destDir = `${mobileDir}/node_modules/@joplinapp`; + const destDir = `${mobileDir}/node_modules/@joplin`; for (const dir of dirsToCopy) { const destPath = toSystemSlashes(`${destDir}/${dir}`); diff --git a/packages/app-mobile/utils/fs-driver-rn.js b/packages/app-mobile/utils/fs-driver-rn.js index 9dbdfee61..08c4f1c55 100644 --- a/packages/app-mobile/utils/fs-driver-rn.js +++ b/packages/app-mobile/utils/fs-driver-rn.js @@ -1,5 +1,5 @@ const RNFS = require('react-native-fs'); -const FsDriverBase = require('@joplinapp/lib/fs-driver-base'); +const FsDriverBase = require('@joplin/lib/fs-driver-base'); const RNFetchBlob = require('rn-fetch-blob').default; class FsDriverRN extends FsDriverBase { diff --git a/packages/app-mobile/utils/geolocation-react.js b/packages/app-mobile/utils/geolocation-react.js index 98c1a609c..9d53df909 100644 --- a/packages/app-mobile/utils/geolocation-react.js +++ b/packages/app-mobile/utils/geolocation-react.js @@ -1,6 +1,6 @@ import Geolocation from '@react-native-community/geolocation'; -const Setting = require('@joplinapp/lib/models/Setting').default; +const Setting = require('@joplin/lib/models/Setting').default; class GeolocationReact { static currentPosition_testResponse() { diff --git a/packages/app-mobile/utils/shareHandler.ts b/packages/app-mobile/utils/shareHandler.ts index 6c037f35e..556086790 100644 --- a/packages/app-mobile/utils/shareHandler.ts +++ b/packages/app-mobile/utils/shareHandler.ts @@ -1,7 +1,7 @@ import ShareExtension, { SharedData } from './ShareExtension'; -import shim from '@joplinapp/lib/shim'; +import shim from '@joplin/lib/shim'; -const Note = require('@joplinapp/lib/models/Note.js'); +const Note = require('@joplin/lib/models/Note.js'); const checkPermissions = require('./checkPermissions.js').default; const { ToastAndroid } = require('react-native'); const { PermissionsAndroid } = require('react-native'); diff --git a/packages/app-mobile/utils/shim-init-react.js b/packages/app-mobile/utils/shim-init-react.js index fadb1ae36..210a19b19 100644 --- a/packages/app-mobile/utils/shim-init-react.js +++ b/packages/app-mobile/utils/shim-init-react.js @@ -1,24 +1,24 @@ -const shim = require('@joplinapp/lib/shim').default; +const shim = require('@joplin/lib/shim').default; const { GeolocationReact } = require('./geolocation-react.js'); -const PoorManIntervals = require('@joplinapp/lib/PoorManIntervals').default; +const PoorManIntervals = require('@joplin/lib/PoorManIntervals').default; const RNFetchBlob = require('rn-fetch-blob').default; const { generateSecureRandom } = require('react-native-securerandom'); const FsDriverRN = require('./fs-driver-rn.js').FsDriverRN; const urlValidator = require('valid-url'); const { Buffer } = require('buffer'); const { Linking, Platform } = require('react-native'); -const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime; -const { basename, fileExtension } = require('@joplinapp/lib/path-utils'); -const uuid = require('@joplinapp/lib/uuid').default; -const Resource = require('@joplinapp/lib/models/Resource'); +const mimeUtils = require('@joplin/lib/mime-utils.js').mime; +const { basename, fileExtension } = require('@joplin/lib/path-utils'); +const uuid = require('@joplin/lib/uuid').default; +const Resource = require('@joplin/lib/models/Resource'); const injectedJs = { - webviewLib: require('@joplinapp/lib/rnInjectedJs/webviewLib'), + webviewLib: require('@joplin/lib/rnInjectedJs/webviewLib'), }; function shimInit() { shim.Geolocation = GeolocationReact; - shim.sjclModule = require('@joplinapp/lib/vendor/sjcl-rn.js'); + shim.sjclModule = require('@joplin/lib/vendor/sjcl-rn.js'); shim.fsDriver = () => { if (!shim.fsDriver_) shim.fsDriver_ = new FsDriverRN(); diff --git a/packages/fork-htmlparser2/package-lock.json b/packages/fork-htmlparser2/package-lock.json index 8db812d3f..0635c8991 100644 --- a/packages/fork-htmlparser2/package-lock.json +++ b/packages/fork-htmlparser2/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/fork-htmlparser2", + "name": "@joplin/fork-htmlparser2", "version": "4.1.8", "lockfileVersion": 1, "requires": true, diff --git a/packages/fork-htmlparser2/package.json b/packages/fork-htmlparser2/package.json index 7dadb4c9f..7fbae12b7 100644 --- a/packages/fork-htmlparser2/package.json +++ b/packages/fork-htmlparser2/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/fork-htmlparser2", + "name": "@joplin/fork-htmlparser2", "description": "Fast & forgiving HTML/XML/RSS parser", "version": "4.1.8", "author": "Felix Boehm ", diff --git a/packages/fork-sax/package-lock.json b/packages/fork-sax/package-lock.json index c30f76025..810f69e2f 100644 --- a/packages/fork-sax/package-lock.json +++ b/packages/fork-sax/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/fork-sax", + "name": "@joplin/fork-sax", "version": "1.2.12", "lockfileVersion": 1, "requires": true, diff --git a/packages/fork-sax/package.json b/packages/fork-sax/package.json index 8fe280595..ebd054cce 100644 --- a/packages/fork-sax/package.json +++ b/packages/fork-sax/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/fork-sax", + "name": "@joplin/fork-sax", "description": "An evented streaming XML parser in JavaScript", "author": "Isaac Z. Schlueter (http://blog.izs.me/)", "version": "1.2.12", diff --git a/packages/lib/README.md b/packages/lib/README.md index 3bf35aef4..90c6e23dc 100644 --- a/packages/lib/README.md +++ b/packages/lib/README.md @@ -1,4 +1,4 @@ -# @joplinapp/lib +# @joplin/lib Library shared between all applications. diff --git a/packages/lib/htmlUtils.js b/packages/lib/htmlUtils.js index acd0b6f06..f4a5a7a56 100644 --- a/packages/lib/htmlUtils.js +++ b/packages/lib/htmlUtils.js @@ -1,7 +1,7 @@ const urlUtils = require('./urlUtils.js'); const Entities = require('html-entities').AllHtmlEntities; const htmlentities = new Entities().encode; -const htmlparser2 = require('@joplinapp/fork-htmlparser2'); +const htmlparser2 = require('@joplin/fork-htmlparser2'); // [\s\S] instead of . for multiline matching // https://stackoverflow.com/a/16119722/561309 diff --git a/packages/lib/import-enex-html-gen.js b/packages/lib/import-enex-html-gen.js index 36eb52548..6151d172e 100644 --- a/packages/lib/import-enex-html-gen.js +++ b/packages/lib/import-enex-html-gen.js @@ -62,7 +62,7 @@ function enexXmlToHtml_(stream, resources) { return new Promise((resolve) => { const options = {}; const strict = false; - const saxStream = require('@joplinapp/fork-sax').createStream(strict, options); + const saxStream = require('@joplin/fork-sax').createStream(strict, options); const section = { type: 'text', diff --git a/packages/lib/import-enex-md-gen.js b/packages/lib/import-enex-md-gen.js index 7e521d236..5dc058202 100644 --- a/packages/lib/import-enex-md-gen.js +++ b/packages/lib/import-enex-md-gen.js @@ -430,7 +430,7 @@ function enexXmlToMdArray(stream, resources) { const options = {}; const strict = false; - const saxStream = require('@joplinapp/fork-sax').createStream(strict, options); + const saxStream = require('@joplin/fork-sax').createStream(strict, options); let section = { type: 'text', diff --git a/packages/lib/import-enex.js b/packages/lib/import-enex.js index 2d2750711..2c84ada48 100644 --- a/packages/lib/import-enex.js +++ b/packages/lib/import-enex.js @@ -5,7 +5,7 @@ const Note = require('./models/Note.js'); const Tag = require('./models/Tag.js'); const Resource = require('./models/Resource.js'); const Setting = require('./models/Setting').default; -const { MarkupToHtml } = require('@joplinapp/renderer'); +const { MarkupToHtml } = require('@joplin/renderer'); const { enexXmlToMd } = require('./import-enex-md-gen.js'); const { enexXmlToHtml } = require('./import-enex-html-gen.js'); const time = require('./time').default; @@ -272,7 +272,7 @@ function importEnex(parentFolderId, filePath, importOptions = null) { const options = {}; const strict = true; - const saxStream = require('@joplinapp/fork-sax').createStream(strict, options); + const saxStream = require('@joplin/fork-sax').createStream(strict, options); const nodes = []; // LIFO list of nodes so that we know in which node we are in the onText event let note = null; diff --git a/packages/lib/markdownUtils.ts b/packages/lib/markdownUtils.ts index 060b8ded0..5d1a161fe 100644 --- a/packages/lib/markdownUtils.ts +++ b/packages/lib/markdownUtils.ts @@ -1,7 +1,7 @@ const stringPadding = require('string-padding'); const urlUtils = require('./urlUtils'); const MarkdownIt = require('markdown-it'); -const { setupLinkify } = require('@joplinapp/renderer'); +const { setupLinkify } = require('@joplin/renderer'); // Taken from codemirror/addon/edit/continuelist.js const listRegex = /^(\s*)([*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]\s))(\s*)/; diff --git a/packages/lib/markupLanguageUtils.ts b/packages/lib/markupLanguageUtils.ts index 2c28cfec7..c3b141f87 100644 --- a/packages/lib/markupLanguageUtils.ts +++ b/packages/lib/markupLanguageUtils.ts @@ -1,7 +1,7 @@ import markdownUtils from './markdownUtils'; import Setting from './models/Setting'; import shim from './shim'; -import MarkupToHtml, { MarkupLanguage } from '@joplinapp/renderer/MarkupToHtml'; +import MarkupToHtml, { MarkupLanguage } from '@joplin/renderer/MarkupToHtml'; const htmlUtils = require('./htmlUtils'); const Resource = require('./models/Resource'); diff --git a/packages/lib/models/Note.js b/packages/lib/models/Note.js index ff62e6a71..91c7ae661 100644 --- a/packages/lib/models/Note.js +++ b/packages/lib/models/Note.js @@ -12,7 +12,7 @@ const ArrayUtils = require('../ArrayUtils.js'); const lodash = require('lodash'); const urlUtils = require('../urlUtils.js'); const markdownUtils = require('../markdownUtils').default; -const { MarkupToHtml } = require('@joplinapp/renderer'); +const { MarkupToHtml } = require('@joplin/renderer'); const { ALL_NOTES_FILTER_ID } = require('../reserved-ids'); class Note extends BaseItem { diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index 359464aba..ab8d894d1 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/lib", + "name": "@joplin/lib", "version": "1.0.9", "lockfileVersion": 1, "requires": true, diff --git a/packages/lib/package.json b/packages/lib/package.json index 02fce4950..d2f34eb4a 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/lib", + "name": "@joplin/lib", "version": "1.0.9", "description": "> TODO: description", "author": "Laurent Cozic ", @@ -17,9 +17,9 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplinapp/fork-htmlparser2": "^4.1.8", - "@joplinapp/fork-sax": "^1.2.12", - "@joplinapp/renderer": "^1.0.17", + "@joplin/fork-htmlparser2": "^4.1.8", + "@joplin/fork-sax": "^1.2.12", + "@joplin/renderer": "^1.0.17", "async-mutex": "^0.1.3", "aws-sdk": "^2.588.0", "base-64": "^0.1.0", diff --git a/packages/lib/services/commands/stateToWhenClauseContext.ts b/packages/lib/services/commands/stateToWhenClauseContext.ts index f31099d84..648964c2e 100644 --- a/packages/lib/services/commands/stateToWhenClauseContext.ts +++ b/packages/lib/services/commands/stateToWhenClauseContext.ts @@ -2,7 +2,7 @@ import { stateUtils } from '../../reducer'; const BaseModel = require('../../BaseModel').default; const Folder = require('../../models/Folder'); -const MarkupToHtml = require('@joplinapp/renderer/MarkupToHtml').default; +const MarkupToHtml = require('@joplin/renderer/MarkupToHtml').default; export default function stateToWhenClauseContext(state:any) { const noteId = state.selectedNoteIds.length === 1 ? state.selectedNoteIds[0] : null; diff --git a/packages/lib/services/interop/InteropService_Exporter_Html.ts b/packages/lib/services/interop/InteropService_Exporter_Html.ts index 5e45e8521..892e3200a 100644 --- a/packages/lib/services/interop/InteropService_Exporter_Html.ts +++ b/packages/lib/services/interop/InteropService_Exporter_Html.ts @@ -9,7 +9,7 @@ const { themeStyle } = require('../../theme'); const { dirname } = require('../../path-utils'); const { escapeHtml } = require('../../string-utils.js'); const markupLanguageUtils = require('../../markupLanguageUtils').default; -const { assetsToHeaders } = require('@joplinapp/renderer'); +const { assetsToHeaders } = require('@joplin/renderer'); export default class InteropService_Exporter_Html extends InteropService_Exporter_Base { diff --git a/packages/lib/services/interop/InteropService_Importer_Md.ts b/packages/lib/services/interop/InteropService_Importer_Md.ts index 3024721af..59103c394 100644 --- a/packages/lib/services/interop/InteropService_Importer_Md.ts +++ b/packages/lib/services/interop/InteropService_Importer_Md.ts @@ -9,7 +9,7 @@ const shim = require('../../shim').default; const { extractImageUrls } = require('../../markdownUtils').default; const { unique } = require('../../ArrayUtils'); const { pregQuote } = require('../../string-utils-common'); -const { MarkupToHtml } = require('@joplinapp/renderer'); +const { MarkupToHtml } = require('@joplin/renderer'); export default class InteropService_Importer_Md extends InteropService_Importer_Base { async exec(result:ImportExportResult) { diff --git a/packages/lib/services/plugins/utils/contentScriptsToRendererRules.ts b/packages/lib/services/plugins/utils/contentScriptsToRendererRules.ts index d21095e8f..fb63163dd 100644 --- a/packages/lib/services/plugins/utils/contentScriptsToRendererRules.ts +++ b/packages/lib/services/plugins/utils/contentScriptsToRendererRules.ts @@ -1,5 +1,5 @@ import { PluginStates } from '../reducer'; -import { ExtraRendererRule } from '@joplinapp/renderer/MdToHtml'; +import { ExtraRendererRule } from '@joplin/renderer/MdToHtml'; import { ContentScriptType } from '../api/types'; export default function contentScriptsToRendererRules(plugins:PluginStates):ExtraRendererRule[] { diff --git a/packages/lib/services/rest/routes/notes.ts b/packages/lib/services/rest/routes/notes.ts index 7851bc74b..fb12540ce 100644 --- a/packages/lib/services/rest/routes/notes.ts +++ b/packages/lib/services/rest/routes/notes.ts @@ -25,7 +25,7 @@ const ArrayUtils = require('../../../ArrayUtils.js'); const { netUtils } = require('../../../net-utils'); const { fileExtension, safeFileExtension, safeFilename, filename } = require('../../../path-utils'); const uri2path = require('file-uri-to-path'); -const { MarkupToHtml } = require('@joplinapp/renderer'); +const { MarkupToHtml } = require('@joplin/renderer'); const { ErrorNotFound } = require('../errors'); let htmlToMdParser_:any = null; diff --git a/packages/renderer/HtmlToHtml.js b/packages/renderer/HtmlToHtml.js index 44aeb10a1..e2c7a3806 100644 --- a/packages/renderer/HtmlToHtml.js +++ b/packages/renderer/HtmlToHtml.js @@ -3,8 +3,8 @@ const utils = require('./utils'); // const noteStyle = require('./noteStyle').default; // TODO: fix -// const Setting = require('@joplinapp/lib/models/Setting').default; -// const { themeStyle } = require('@joplinapp/lib/theme'); +// const Setting = require('@joplin/lib/models/Setting').default; +// const { themeStyle } = require('@joplin/lib/theme'); const InMemoryCache = require('./InMemoryCache').default; const md5 = require('md5'); diff --git a/packages/renderer/htmlUtils.js b/packages/renderer/htmlUtils.js index 08c244701..d80fa23c2 100644 --- a/packages/renderer/htmlUtils.js +++ b/packages/renderer/htmlUtils.js @@ -1,6 +1,6 @@ const Entities = require('html-entities').AllHtmlEntities; const htmlentities = new Entities().encode; -const htmlparser2 = require('@joplinapp/fork-htmlparser2'); +const htmlparser2 = require('@joplin/fork-htmlparser2'); // [\s\S] instead of . for multiline matching // https://stackoverflow.com/a/16119722/561309 @@ -70,7 +70,7 @@ class HtmlUtils { return selfClosingElements.includes(tagName.toLowerCase()); } - // TODO: copied from @joplinapp/lib + // TODO: copied from @joplin/lib stripHtml(html) { const output = []; diff --git a/packages/renderer/package-lock.json b/packages/renderer/package-lock.json index 836bedc87..05cc44b45 100644 --- a/packages/renderer/package-lock.json +++ b/packages/renderer/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/renderer", + "name": "@joplin/renderer", "version": "1.0.17", "lockfileVersion": 1, "requires": true, diff --git a/packages/renderer/package.json b/packages/renderer/package.json index ad8c0ca5d..acdfa87e9 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/renderer", + "name": "@joplin/renderer", "version": "1.0.17", "description": "The Joplin note renderer, used the mobile and desktop application", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/app-mobile/lib/joplin-renderer", @@ -22,7 +22,7 @@ "typescript": "^4.0.5" }, "dependencies": { - "@joplinapp/fork-htmlparser2": "^4.1.8", + "@joplin/fork-htmlparser2": "^4.1.8", "font-awesome-filetypes": "^2.1.0", "fs-extra": "^8.1.0", "highlight.js": "^10.2.1", diff --git a/packages/tools/README.md b/packages/tools/README.md index 246c8c1fd..a23928259 100644 --- a/packages/tools/README.md +++ b/packages/tools/README.md @@ -1,3 +1,3 @@ -# @joplinapp/tools +# @joplin/tools Various Joplin-related tools and helpers to build the apps, the website, etc. \ No newline at end of file diff --git a/packages/tools/build-release-stats.js b/packages/tools/build-release-stats.js index e0ff3391b..0c7f85f1a 100644 --- a/packages/tools/build-release-stats.js +++ b/packages/tools/build-release-stats.js @@ -2,8 +2,8 @@ const fetch = require('node-fetch'); const fs = require('fs-extra'); -const { dirname } = require('@joplinapp/lib/path-utils'); -const markdownUtils = require('@joplinapp/lib/markdownUtils').default; +const { dirname } = require('@joplin/lib/path-utils'); +const markdownUtils = require('@joplin/lib/markdownUtils').default; const rootDir = dirname(dirname(__dirname)); diff --git a/packages/tools/build-translation.js b/packages/tools/build-translation.js index be74c1b00..6574495e7 100644 --- a/packages/tools/build-translation.js +++ b/packages/tools/build-translation.js @@ -7,7 +7,7 @@ const rootDir = `${__dirname}/../..`; -const markdownUtils = require('@joplinapp/lib/markdownUtils').default; +const markdownUtils = require('@joplin/lib/markdownUtils').default; const fs = require('fs-extra'); const gettextParser = require('gettext-parser'); @@ -15,7 +15,7 @@ const localesDir = `${__dirname}/locales`; const libDir = `${rootDir}/packages/lib`; const { execCommand, isMac, insertContentIntoFile, filename, fileExtension } = require('./tool-utils.js'); -const { countryDisplayName, countryCodeOnly } = require('@joplinapp/lib/locale'); +const { countryDisplayName, countryCodeOnly } = require('@joplin/lib/locale'); function parsePoFile(filePath) { const content = fs.readFileSync(filePath); diff --git a/packages/tools/build-welcome.js b/packages/tools/build-welcome.js index e55eef599..adbca70a6 100644 --- a/packages/tools/build-welcome.js +++ b/packages/tools/build-welcome.js @@ -1,7 +1,7 @@ const fs = require('fs-extra'); const dirname = require('path').dirname; -const { fileExtension, basename } = require('@joplinapp/lib/path-utils'); -const markdownUtils = require('@joplinapp/lib/markdownUtils').default; +const { fileExtension, basename } = require('@joplin/lib/path-utils'); +const markdownUtils = require('@joplin/lib/markdownUtils').default; const rootDir = dirname(dirname(__dirname)); const welcomeDir = `${rootDir}/readme/welcome`; diff --git a/packages/tools/fetchPatreonPosts.js b/packages/tools/fetchPatreonPosts.js index 68334c9a7..173f88aa2 100644 --- a/packages/tools/fetchPatreonPosts.js +++ b/packages/tools/fetchPatreonPosts.js @@ -4,15 +4,15 @@ const fetch = require('node-fetch'); const fs = require('fs-extra'); const { patreonOauthToken } = require('./tool-utils'); -const HtmlToMd = require('@joplinapp/lib/HtmlToMd'); -const { dirname, filename, basename } = require('@joplinapp/lib/path-utils'); -const markdownUtils = require('@joplinapp/lib/markdownUtils').default; -const mimeUtils = require('@joplinapp/lib/mime-utils.js').mime; -const { netUtils } = require('@joplinapp/lib/net-utils'); -const shim = require('@joplinapp/lib/shim').default; +const HtmlToMd = require('@joplin/lib/HtmlToMd'); +const { dirname, filename, basename } = require('@joplin/lib/path-utils'); +const markdownUtils = require('@joplin/lib/markdownUtils').default; +const mimeUtils = require('@joplin/lib/mime-utils.js').mime; +const { netUtils } = require('@joplin/lib/net-utils'); +const shim = require('@joplin/lib/shim').default; const moment = require('moment'); -const { pregQuote } = require('@joplinapp/lib/string-utils'); -const { shimInit } = require('@joplinapp/lib/shim-init-node.js'); +const { pregQuote } = require('@joplin/lib/string-utils'); +const { shimInit } = require('@joplin/lib/shim-init-node.js'); shimInit(); diff --git a/packages/tools/generate-images.js b/packages/tools/generate-images.js index 7ef662f1f..3bcba15dc 100644 --- a/packages/tools/generate-images.js +++ b/packages/tools/generate-images.js @@ -2,7 +2,7 @@ const dirname = require('path').dirname; const sharp = require('sharp'); const fs = require('fs-extra'); const { execCommand } = require('./tool-utils.js'); -const { fileExtension } = require('@joplinapp/lib/path-utils'); +const { fileExtension } = require('@joplin/lib/path-utils'); const sources = [ { diff --git a/packages/tools/package-lock.json b/packages/tools/package-lock.json index de9378039..6c2fbff2a 100644 --- a/packages/tools/package-lock.json +++ b/packages/tools/package-lock.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/tools", + "name": "@joplin/tools", "version": "1.0.9", "lockfileVersion": 1, "requires": true, diff --git a/packages/tools/package.json b/packages/tools/package.json index e5a2fc417..e8e085be9 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,5 +1,5 @@ { - "name": "@joplinapp/tools", + "name": "@joplin/tools", "version": "1.0.9", "description": "Various tools for Joplin", "main": "index.js", @@ -16,7 +16,7 @@ }, "license": "MIT", "dependencies": { - "@joplinapp/lib": "^1.0.9", + "@joplin/lib": "^1.0.9", "execa": "^4.1.0", "fs-extra": "^4.0.3", "gettext-parser": "^1.3.0", diff --git a/packages/tools/update-readme-download.js b/packages/tools/update-readme-download.js index 6a2cc6146..2e957e763 100644 --- a/packages/tools/update-readme-download.js +++ b/packages/tools/update-readme-download.js @@ -3,7 +3,7 @@ const fs = require('fs-extra'); const request = require('request'); -const { fileExtension } = require('@joplinapp/lib/path-utils'); +const { fileExtension } = require('@joplin/lib/path-utils'); const url = 'https://api.github.com/repos/laurent22/joplin/releases/latest'; const readmePath = `${__dirname}/../../README.md`;