From c50181f0a6b3514c62eec256b61c8bcda577157b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Tue, 25 Jul 2023 14:51:01 +0100 Subject: [PATCH] Tools: Fixed updateIgnored so that it works consistently across platforms --- .eslintignore | 170 +++++++++--------- .gitignore | 170 +++++++++--------- .../tasks/updateIgnoredTypeScriptBuild.js | 24 +-- packages/utils/fs.ts | 12 ++ packages/utils/package.json | 4 +- yarn.lock | 1 + 6 files changed, 189 insertions(+), 192 deletions(-) create mode 100644 packages/utils/fs.ts diff --git a/.eslintignore b/.eslintignore index fd19091f3..fb2f23ece 100644 --- a/.eslintignore +++ b/.eslintignore @@ -82,8 +82,8 @@ packages/app-cli/app/LinkSelector.js packages/app-cli/app/base-command.js packages/app-cli/app/command-done.test.js packages/app-cli/app/command-e2ee.js -packages/app-cli/app/command-mkbook.js packages/app-cli/app/command-mkbook.test.js +packages/app-cli/app/command-mkbook.js packages/app-cli/app/command-settingschema.js packages/app-cli/app/command-sync.js packages/app-cli/app/command-testing.js @@ -106,9 +106,9 @@ packages/app-cli/tests/testUtils.js packages/app-cli/tools/populateDatabase.js packages/app-desktop/ElectronAppWrapper.js packages/app-desktop/InteropServiceHelper.js -packages/app-desktop/app.js -packages/app-desktop/app.reducer.js packages/app-desktop/app.reducer.test.js +packages/app-desktop/app.reducer.js +packages/app-desktop/app.js packages/app-desktop/bridge.js packages/app-desktop/checkForUpdates.js packages/app-desktop/commands/copyDevCommand.js @@ -136,8 +136,8 @@ packages/app-desktop/gui/ConfigScreen/Sidebar.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js -packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.js +packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js packages/app-desktop/gui/Dialog.js packages/app-desktop/gui/DialogButtonRow.js packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js @@ -219,8 +219,8 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js -packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js +packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.js @@ -248,8 +248,8 @@ packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.js packages/app-desktop/gui/NoteEditor/commands/showRevisions.js packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.js packages/app-desktop/gui/NoteEditor/styles/index.js -packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js +packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js packages/app-desktop/gui/NoteEditor/utils/contextMenu.js packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js packages/app-desktop/gui/NoteEditor/utils/index.js @@ -290,17 +290,17 @@ packages/app-desktop/gui/ResizableLayout/utils/findItemByKey.js packages/app-desktop/gui/ResizableLayout/utils/isTempContainer.js packages/app-desktop/gui/ResizableLayout/utils/iterateItems.js packages/app-desktop/gui/ResizableLayout/utils/layoutItemProp.js -packages/app-desktop/gui/ResizableLayout/utils/movements.js packages/app-desktop/gui/ResizableLayout/utils/movements.test.js -packages/app-desktop/gui/ResizableLayout/utils/persist.js +packages/app-desktop/gui/ResizableLayout/utils/movements.js packages/app-desktop/gui/ResizableLayout/utils/persist.test.js +packages/app-desktop/gui/ResizableLayout/utils/persist.js packages/app-desktop/gui/ResizableLayout/utils/removeItem.js packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.js packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.js packages/app-desktop/gui/ResizableLayout/utils/style.js packages/app-desktop/gui/ResizableLayout/utils/types.js -packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.js packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.test.js +packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.js packages/app-desktop/gui/ResizableLayout/utils/useWindowResizeEvent.js packages/app-desktop/gui/ResizableLayout/utils/validateLayout.js packages/app-desktop/gui/ResourceScreen.js @@ -359,14 +359,14 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js packages/app-desktop/services/restart.js packages/app-desktop/services/share/invitationRespond.js -packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js -packages/app-desktop/services/sortOrder/notesSortOrderUtils.js +packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js +packages/app-desktop/services/sortOrder/notesSortOrderUtils.js packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js packages/app-desktop/tools/notarizeMacApp.js -packages/app-desktop/utils/checkForUpdatesUtils.js packages/app-desktop/utils/checkForUpdatesUtils.test.js +packages/app-desktop/utils/checkForUpdatesUtils.js packages/app-desktop/utils/markupLanguageUtils.js packages/app-mobile/PluginAssetsLoader.js packages/app-mobile/components/ActionButton.js @@ -381,17 +381,17 @@ packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.js packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.js packages/app-mobile/components/NoteBodyViewer/hooks/useSource.js -packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.js +packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.bulletedVsChecklist.test.js -packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.test.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.toggleList.test.js -packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.js +packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.test.js -packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.js +packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.test.js +packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.js packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.js packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.js packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.js @@ -422,12 +422,12 @@ packages/app-mobile/components/app-nav.js packages/app-mobile/components/biometrics/BiometricPopup.js packages/app-mobile/components/biometrics/biometricAuthenticate.js packages/app-mobile/components/biometrics/sensorInfo.js -packages/app-mobile/components/getResponsiveValue.js packages/app-mobile/components/getResponsiveValue.test.js +packages/app-mobile/components/getResponsiveValue.js packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.js packages/app-mobile/components/screens/ConfigScreen/ConfigScreenButton.js -packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.js packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.test.js +packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.js packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/exportAllFolders.js packages/app-mobile/components/screens/ConfigScreen/configScreenStyles.js packages/app-mobile/components/screens/Note.js @@ -459,19 +459,19 @@ packages/app-mobile/utils/setupNotifications.js packages/app-mobile/utils/shareHandler.js packages/app-mobile/utils/types.js packages/fork-htmlparser2/src/CollectingHandler.js -packages/fork-htmlparser2/src/FeedHandler.js packages/fork-htmlparser2/src/FeedHandler.spec.js +packages/fork-htmlparser2/src/FeedHandler.js packages/fork-htmlparser2/src/MultiplexHandler.js -packages/fork-htmlparser2/src/Parser.js packages/fork-htmlparser2/src/Parser.spec.js +packages/fork-htmlparser2/src/Parser.js packages/fork-htmlparser2/src/Tokenizer.js -packages/fork-htmlparser2/src/WritableStream.js packages/fork-htmlparser2/src/WritableStream.spec.js +packages/fork-htmlparser2/src/WritableStream.js packages/fork-htmlparser2/src/__fixtures__/test-helper.js packages/fork-htmlparser2/src/__tests__/events.js packages/fork-htmlparser2/src/__tests__/stream.js -packages/fork-htmlparser2/src/index.js packages/fork-htmlparser2/src/index.spec.js +packages/fork-htmlparser2/src/index.js packages/generator-joplin/generators/app/templates/api/index.js packages/generator-joplin/generators/app/templates/api/types.js packages/generator-joplin/generators/app/templates/api_index.js @@ -484,19 +484,19 @@ packages/lib/BaseModel.js packages/lib/BaseSyncTarget.js packages/lib/ClipperServer.js packages/lib/CssUtils.js -packages/lib/EventDispatcher.js packages/lib/EventDispatcher.test.js +packages/lib/EventDispatcher.js packages/lib/HtmlToMd.js -packages/lib/InMemoryCache.js packages/lib/InMemoryCache.test.js +packages/lib/InMemoryCache.js packages/lib/JoplinDatabase.js packages/lib/JoplinError.js packages/lib/JoplinServerApi.js packages/lib/Logger.js packages/lib/ObjectUtils.js packages/lib/PoorManIntervals.js -packages/lib/RotatingLogs.js packages/lib/RotatingLogs.test.js +packages/lib/RotatingLogs.js packages/lib/SyncTargetJoplinCloud.js packages/lib/SyncTargetJoplinServer.js packages/lib/SyncTargetNone.js @@ -506,8 +506,8 @@ packages/lib/Synchronizer.js packages/lib/TaskQueue.js packages/lib/WelcomeUtils.js packages/lib/array.js -packages/lib/callbackUrlUtils.js packages/lib/callbackUrlUtils.test.js +packages/lib/callbackUrlUtils.js packages/lib/commands/historyBackward.js packages/lib/commands/historyForward.js packages/lib/commands/index.js @@ -535,41 +535,41 @@ packages/lib/geolocation-node.js packages/lib/hooks/useAsyncEffect.js packages/lib/hooks/useElementSize.js packages/lib/hooks/useEventListener.js -packages/lib/htmlUtils.js packages/lib/htmlUtils.test.js +packages/lib/htmlUtils.js packages/lib/htmlUtils2.test.js -packages/lib/import-enex-md-gen.js packages/lib/import-enex-md-gen.test.js +packages/lib/import-enex-md-gen.js packages/lib/import-enex.js -packages/lib/locale.js packages/lib/locale.test.js -packages/lib/markdownUtils.js +packages/lib/locale.js packages/lib/markdownUtils.test.js +packages/lib/markdownUtils.js packages/lib/markdownUtils2.test.js packages/lib/markupLanguageUtils.js packages/lib/migrations/42.js packages/lib/models/Alarm.js packages/lib/models/BaseItem.js -packages/lib/models/Folder.js packages/lib/models/Folder.sharing.test.js packages/lib/models/Folder.test.js -packages/lib/models/ItemChange.js +packages/lib/models/Folder.js packages/lib/models/ItemChange.test.js -packages/lib/models/MasterKey.js +packages/lib/models/ItemChange.js packages/lib/models/MasterKey.test.js +packages/lib/models/MasterKey.js packages/lib/models/Migration.js -packages/lib/models/Note.js packages/lib/models/Note.test.js +packages/lib/models/Note.js packages/lib/models/NoteResource.js packages/lib/models/NoteTag.js -packages/lib/models/Resource.js packages/lib/models/Resource.test.js +packages/lib/models/Resource.js packages/lib/models/ResourceLocalState.js -packages/lib/models/Revision.js packages/lib/models/Revision.test.js +packages/lib/models/Revision.js packages/lib/models/Search.js -packages/lib/models/Setting.js packages/lib/models/Setting.test.js +packages/lib/models/Setting.js packages/lib/models/SmartFilter.js packages/lib/models/Tag.js packages/lib/models/dateTimeFormats.test.js @@ -579,20 +579,20 @@ packages/lib/models/utils/paginatedFeed.js packages/lib/models/utils/paginationToSql.js packages/lib/models/utils/readOnly.js packages/lib/models/utils/types.js -packages/lib/models/utils/userData.js packages/lib/models/utils/userData.test.js +packages/lib/models/utils/userData.js packages/lib/net-utils.js packages/lib/ntp.js packages/lib/onedrive-api.js packages/lib/path-utils.js packages/lib/reducer.js -packages/lib/registry.js packages/lib/registry.test.js +packages/lib/registry.js packages/lib/services/AlarmService.js packages/lib/services/AlarmServiceDriverNode.js packages/lib/services/BaseService.js -packages/lib/services/CommandService.js packages/lib/services/CommandService.test.js +packages/lib/services/CommandService.js packages/lib/services/DecryptionWorker.js packages/lib/services/ExternalEditWatcher.js packages/lib/services/ExternalEditWatcher/utils.js @@ -608,14 +608,14 @@ packages/lib/services/ReportService.js packages/lib/services/ResourceEditWatcher/index.js packages/lib/services/ResourceEditWatcher/reducer.js packages/lib/services/ResourceFetcher.js -packages/lib/services/ResourceService.js packages/lib/services/ResourceService.test.js -packages/lib/services/RevisionService.js +packages/lib/services/ResourceService.js packages/lib/services/RevisionService.test.js +packages/lib/services/RevisionService.js packages/lib/services/SettingUtils.js packages/lib/services/UndoRedoService.js -packages/lib/services/WhenClause.js packages/lib/services/WhenClause.test.js +packages/lib/services/WhenClause.js packages/lib/services/commands/MenuUtils.js packages/lib/services/commands/ToolbarButtonUtils.js packages/lib/services/commands/commandsToMarkdownTable.js @@ -626,40 +626,40 @@ packages/lib/services/commands/stateToWhenClauseContext.js packages/lib/services/contextkey/contextkey.js packages/lib/services/database/types.js packages/lib/services/debug/populateDatabase.js -packages/lib/services/e2ee/EncryptionService.js packages/lib/services/e2ee/EncryptionService.test.js +packages/lib/services/e2ee/EncryptionService.js packages/lib/services/e2ee/RSA.node.js -packages/lib/services/e2ee/ppk.js packages/lib/services/e2ee/ppk.test.js +packages/lib/services/e2ee/ppk.js packages/lib/services/e2ee/ppkTestUtils.js packages/lib/services/e2ee/types.js -packages/lib/services/e2ee/utils.js packages/lib/services/e2ee/utils.test.js -packages/lib/services/interop/InteropService.js +packages/lib/services/e2ee/utils.js packages/lib/services/interop/InteropService.test.js +packages/lib/services/interop/InteropService.js packages/lib/services/interop/InteropService_Exporter_Base.js packages/lib/services/interop/InteropService_Exporter_Custom.js -packages/lib/services/interop/InteropService_Exporter_Html.js packages/lib/services/interop/InteropService_Exporter_Html.test.js +packages/lib/services/interop/InteropService_Exporter_Html.js packages/lib/services/interop/InteropService_Exporter_Jex.js -packages/lib/services/interop/InteropService_Exporter_Md.js packages/lib/services/interop/InteropService_Exporter_Md.test.js -packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js +packages/lib/services/interop/InteropService_Exporter_Md.js packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js +packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js packages/lib/services/interop/InteropService_Exporter_Raw.js packages/lib/services/interop/InteropService_Importer_Base.js packages/lib/services/interop/InteropService_Importer_Custom.js packages/lib/services/interop/InteropService_Importer_EnexToHtml.js packages/lib/services/interop/InteropService_Importer_EnexToMd.js packages/lib/services/interop/InteropService_Importer_Jex.js -packages/lib/services/interop/InteropService_Importer_Md.js packages/lib/services/interop/InteropService_Importer_Md.test.js -packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js +packages/lib/services/interop/InteropService_Importer_Md.js packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js -packages/lib/services/interop/InteropService_Importer_Raw.js +packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js packages/lib/services/interop/InteropService_Importer_Raw.test.js -packages/lib/services/interop/Module.js +packages/lib/services/interop/InteropService_Importer_Raw.js packages/lib/services/interop/Module.test.js +packages/lib/services/interop/Module.js packages/lib/services/interop/types.js packages/lib/services/joplinServer/personalizedUserContentBaseUrl.js packages/lib/services/keychain/KeychainService.js @@ -706,23 +706,23 @@ packages/lib/services/plugins/utils/makeListener.js packages/lib/services/plugins/utils/manifestFromObject.js packages/lib/services/plugins/utils/mapEventHandlersToIds.js packages/lib/services/plugins/utils/types.js -packages/lib/services/plugins/utils/validatePluginId.js packages/lib/services/plugins/utils/validatePluginId.test.js -packages/lib/services/plugins/utils/validatePluginVersion.js +packages/lib/services/plugins/utils/validatePluginId.js packages/lib/services/plugins/utils/validatePluginVersion.test.js -packages/lib/services/profileConfig/index.js +packages/lib/services/plugins/utils/validatePluginVersion.js packages/lib/services/profileConfig/index.test.js +packages/lib/services/profileConfig/index.js packages/lib/services/profileConfig/initProfile.js packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.js packages/lib/services/profileConfig/splitGlobalAndLocalSettings.js packages/lib/services/profileConfig/types.js -packages/lib/services/rest/Api.js packages/lib/services/rest/Api.test.js +packages/lib/services/rest/Api.js packages/lib/services/rest/ApiResponse.js packages/lib/services/rest/actionApi.desktop.js packages/lib/services/rest/routes/auth.js -packages/lib/services/rest/routes/events.js packages/lib/services/rest/routes/events.test.js +packages/lib/services/rest/routes/events.js packages/lib/services/rest/routes/folders.js packages/lib/services/rest/routes/master_keys.js packages/lib/services/rest/routes/notes.js @@ -740,26 +740,26 @@ packages/lib/services/rest/utils/readonlyProperties.js packages/lib/services/rest/utils/requestFields.js packages/lib/services/rest/utils/requestPaginationOptions.js packages/lib/services/searchengine/SearchEngine.js -packages/lib/services/searchengine/SearchEngineUtils.js packages/lib/services/searchengine/SearchEngineUtils.test.js +packages/lib/services/searchengine/SearchEngineUtils.js packages/lib/services/searchengine/SearchFilter.test.js -packages/lib/services/searchengine/filterParser.js packages/lib/services/searchengine/filterParser.test.js -packages/lib/services/searchengine/gotoAnythingStyleQuery.js +packages/lib/services/searchengine/filterParser.js packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js +packages/lib/services/searchengine/gotoAnythingStyleQuery.js packages/lib/services/searchengine/queryBuilder.js -packages/lib/services/share/ShareService.js packages/lib/services/share/ShareService.test.js +packages/lib/services/share/ShareService.js packages/lib/services/share/reducer.js packages/lib/services/spellChecker/SpellCheckerService.js packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.js -packages/lib/services/style/cssToTheme.js packages/lib/services/style/cssToTheme.test.js +packages/lib/services/style/cssToTheme.js packages/lib/services/style/loadCssToTheme.js -packages/lib/services/style/themeToCss.js packages/lib/services/style/themeToCss.test.js -packages/lib/services/synchronizer/ItemUploader.js +packages/lib/services/style/themeToCss.js packages/lib/services/synchronizer/ItemUploader.test.js +packages/lib/services/synchronizer/ItemUploader.js packages/lib/services/synchronizer/LockHandler.js packages/lib/services/synchronizer/MigrationHandler.js packages/lib/services/synchronizer/Synchronizer.basics.test.js @@ -776,8 +776,8 @@ packages/lib/services/synchronizer/migrations/1.js packages/lib/services/synchronizer/migrations/2.js packages/lib/services/synchronizer/migrations/3.js packages/lib/services/synchronizer/syncDebugLog.js -packages/lib/services/synchronizer/syncInfoUtils.js packages/lib/services/synchronizer/syncInfoUtils.test.js +packages/lib/services/synchronizer/syncInfoUtils.js packages/lib/services/synchronizer/synchronizer_LockHandler.test.js packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js packages/lib/services/synchronizer/tools.js @@ -804,11 +804,11 @@ packages/lib/time.js packages/lib/utils/credentialFiles.js packages/lib/utils/joplinCloud.js packages/lib/utils/userFetcher.js -packages/lib/utils/webDAVUtils.js packages/lib/utils/webDAVUtils.test.js +packages/lib/utils/webDAVUtils.js packages/lib/uuid.js -packages/lib/versionInfo.js packages/lib/versionInfo.test.js +packages/lib/versionInfo.js packages/pdf-viewer/FullViewer.js packages/pdf-viewer/Page.js packages/pdf-viewer/PdfDocument.js @@ -829,17 +829,17 @@ packages/pdf-viewer/ui/IconButtons.js packages/pdf-viewer/ui/ZoomControls.js packages/plugin-repo-cli/commands/updateRelease.js packages/plugin-repo-cli/index.js -packages/plugin-repo-cli/lib/checkIfPluginCanBeAdded.js packages/plugin-repo-cli/lib/checkIfPluginCanBeAdded.test.js -packages/plugin-repo-cli/lib/errorsHaveChanged.js +packages/plugin-repo-cli/lib/checkIfPluginCanBeAdded.js packages/plugin-repo-cli/lib/errorsHaveChanged.test.js -packages/plugin-repo-cli/lib/gitCompareUrl.js +packages/plugin-repo-cli/lib/errorsHaveChanged.js packages/plugin-repo-cli/lib/gitCompareUrl.test.js -packages/plugin-repo-cli/lib/overrideUtils.js +packages/plugin-repo-cli/lib/gitCompareUrl.js packages/plugin-repo-cli/lib/overrideUtils.test.js +packages/plugin-repo-cli/lib/overrideUtils.js packages/plugin-repo-cli/lib/types.js -packages/plugin-repo-cli/lib/updateReadme.js packages/plugin-repo-cli/lib/updateReadme.test.js +packages/plugin-repo-cli/lib/updateReadme.js packages/plugin-repo-cli/lib/utils.js packages/plugins/ToggleSidebars/api/index.js packages/plugins/ToggleSidebars/api/types.js @@ -849,10 +849,10 @@ packages/renderer/HtmlToHtml.js packages/renderer/InMemoryCache.js packages/renderer/MarkupToHtml.js packages/renderer/MdToHtml.js -packages/renderer/MdToHtml/createEventHandlingAttrs.js packages/renderer/MdToHtml/createEventHandlingAttrs.test.js -packages/renderer/MdToHtml/linkReplacement.js +packages/renderer/MdToHtml/createEventHandlingAttrs.js packages/renderer/MdToHtml/linkReplacement.test.js +packages/renderer/MdToHtml/linkReplacement.js packages/renderer/MdToHtml/renderMedia.js packages/renderer/MdToHtml/rules/checkbox.js packages/renderer/MdToHtml/rules/code_inline.js @@ -871,26 +871,26 @@ packages/renderer/MdToHtml/setupLinkify.js packages/renderer/MdToHtml/validateLinks.js packages/renderer/headerAnchor.js packages/renderer/highlight.js -packages/renderer/htmlUtils.js packages/renderer/htmlUtils.test.js +packages/renderer/htmlUtils.js packages/renderer/index.js packages/renderer/noteStyle.js packages/renderer/pathUtils.js packages/renderer/utils.js packages/tools/build-release-stats.js packages/tools/build-welcome.js -packages/tools/buildServerDocker.js packages/tools/buildServerDocker.test.js -packages/tools/bundleDefaultPlugins.js +packages/tools/buildServerDocker.js packages/tools/bundleDefaultPlugins.test.js +packages/tools/bundleDefaultPlugins.js packages/tools/checkIgnoredFiles.js -packages/tools/checkLibPaths.js packages/tools/checkLibPaths.test.js +packages/tools/checkLibPaths.js packages/tools/convertThemesToCss.js packages/tools/generate-database-types.js packages/tools/generate-images.js -packages/tools/git-changelog.js packages/tools/git-changelog.test.js +packages/tools/git-changelog.js packages/tools/licenseChecker.js packages/tools/release-android.js packages/tools/release-cli.js @@ -902,8 +902,8 @@ packages/tools/setupNewRelease.js packages/tools/spellcheck.js packages/tools/tagServerLatest.js packages/tools/tool-utils.js -packages/tools/update-readme-download.js packages/tools/update-readme-download.test.js +packages/tools/update-readme-download.js packages/tools/update-readme-sponsors.js packages/tools/updateMarkdownDoc.js packages/tools/utils/discourse.js @@ -913,14 +913,14 @@ packages/tools/website/build.js packages/tools/website/buildTranslations.js packages/tools/website/updateDownloadPage.js packages/tools/website/updateNews.js -packages/tools/website/utils/applyTranslations.js packages/tools/website/utils/applyTranslations.test.js -packages/tools/website/utils/convertLinksToLocale.js +packages/tools/website/utils/applyTranslations.js packages/tools/website/utils/convertLinksToLocale.test.js +packages/tools/website/utils/convertLinksToLocale.js packages/tools/website/utils/frontMatter.js packages/tools/website/utils/news.js -packages/tools/website/utils/openGraph.js packages/tools/website/utils/openGraph.test.js +packages/tools/website/utils/openGraph.js packages/tools/website/utils/parser.js packages/tools/website/utils/pressCarousel.js packages/tools/website/utils/processTranslations.js diff --git a/.gitignore b/.gitignore index cbdf72cd2..ec6be3b52 100644 --- a/.gitignore +++ b/.gitignore @@ -67,8 +67,8 @@ packages/app-cli/app/LinkSelector.js packages/app-cli/app/base-command.js packages/app-cli/app/command-done.test.js packages/app-cli/app/command-e2ee.js -packages/app-cli/app/command-mkbook.js packages/app-cli/app/command-mkbook.test.js +packages/app-cli/app/command-mkbook.js packages/app-cli/app/command-settingschema.js packages/app-cli/app/command-sync.js packages/app-cli/app/command-testing.js @@ -91,9 +91,9 @@ packages/app-cli/tests/testUtils.js packages/app-cli/tools/populateDatabase.js packages/app-desktop/ElectronAppWrapper.js packages/app-desktop/InteropServiceHelper.js -packages/app-desktop/app.js -packages/app-desktop/app.reducer.js packages/app-desktop/app.reducer.test.js +packages/app-desktop/app.reducer.js +packages/app-desktop/app.js packages/app-desktop/bridge.js packages/app-desktop/checkForUpdates.js packages/app-desktop/commands/copyDevCommand.js @@ -121,8 +121,8 @@ packages/app-desktop/gui/ConfigScreen/Sidebar.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginBox.js packages/app-desktop/gui/ConfigScreen/controls/plugins/PluginsStates.js packages/app-desktop/gui/ConfigScreen/controls/plugins/SearchPlugins.js -packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.test.js +packages/app-desktop/gui/ConfigScreen/controls/plugins/useOnInstallHandler.js packages/app-desktop/gui/Dialog.js packages/app-desktop/gui/DialogButtonRow.js packages/app-desktop/gui/DialogButtonRow/useKeyboardHandler.js @@ -204,8 +204,8 @@ packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/styles/index.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js -packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js +packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useEditorSearch.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useExternalPlugins.js packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useJoplinCommands.js @@ -233,8 +233,8 @@ packages/app-desktop/gui/NoteEditor/commands/showLocalSearch.js packages/app-desktop/gui/NoteEditor/commands/showRevisions.js packages/app-desktop/gui/NoteEditor/editorCommandDeclarations.js packages/app-desktop/gui/NoteEditor/styles/index.js -packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.test.js +packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js packages/app-desktop/gui/NoteEditor/utils/contextMenu.js packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js packages/app-desktop/gui/NoteEditor/utils/index.js @@ -275,17 +275,17 @@ packages/app-desktop/gui/ResizableLayout/utils/findItemByKey.js packages/app-desktop/gui/ResizableLayout/utils/isTempContainer.js packages/app-desktop/gui/ResizableLayout/utils/iterateItems.js packages/app-desktop/gui/ResizableLayout/utils/layoutItemProp.js -packages/app-desktop/gui/ResizableLayout/utils/movements.js packages/app-desktop/gui/ResizableLayout/utils/movements.test.js -packages/app-desktop/gui/ResizableLayout/utils/persist.js +packages/app-desktop/gui/ResizableLayout/utils/movements.js packages/app-desktop/gui/ResizableLayout/utils/persist.test.js +packages/app-desktop/gui/ResizableLayout/utils/persist.js packages/app-desktop/gui/ResizableLayout/utils/removeItem.js packages/app-desktop/gui/ResizableLayout/utils/removeKeylessItems.js packages/app-desktop/gui/ResizableLayout/utils/setLayoutItemProps.js packages/app-desktop/gui/ResizableLayout/utils/style.js packages/app-desktop/gui/ResizableLayout/utils/types.js -packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.js packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.test.js +packages/app-desktop/gui/ResizableLayout/utils/useLayoutItemSizes.js packages/app-desktop/gui/ResizableLayout/utils/useWindowResizeEvent.js packages/app-desktop/gui/ResizableLayout/utils/validateLayout.js packages/app-desktop/gui/ResourceScreen.js @@ -344,14 +344,14 @@ packages/app-desktop/services/plugins/hooks/useViewIsReady.js packages/app-desktop/services/plugins/hooks/useWebviewToPluginMessages.js packages/app-desktop/services/restart.js packages/app-desktop/services/share/invitationRespond.js -packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js packages/app-desktop/services/sortOrder/PerFolderSortOrderService.test.js -packages/app-desktop/services/sortOrder/notesSortOrderUtils.js +packages/app-desktop/services/sortOrder/PerFolderSortOrderService.js packages/app-desktop/services/sortOrder/notesSortOrderUtils.test.js +packages/app-desktop/services/sortOrder/notesSortOrderUtils.js packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js packages/app-desktop/tools/notarizeMacApp.js -packages/app-desktop/utils/checkForUpdatesUtils.js packages/app-desktop/utils/checkForUpdatesUtils.test.js +packages/app-desktop/utils/checkForUpdatesUtils.js packages/app-desktop/utils/markupLanguageUtils.js packages/app-mobile/PluginAssetsLoader.js packages/app-mobile/components/ActionButton.js @@ -366,17 +366,17 @@ packages/app-mobile/components/NoteBodyViewer/NoteBodyViewer.js packages/app-mobile/components/NoteBodyViewer/hooks/useOnMessage.js packages/app-mobile/components/NoteBodyViewer/hooks/useOnResourceLongPress.js packages/app-mobile/components/NoteBodyViewer/hooks/useSource.js -packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.test.js +packages/app-mobile/components/NoteEditor/CodeMirror/CodeMirror.js packages/app-mobile/components/NoteEditor/CodeMirror/decoratorExtension.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.bulletedVsChecklist.test.js -packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.test.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.toggleList.test.js -packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.js +packages/app-mobile/components/NoteEditor/CodeMirror/markdownCommands.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.test.js -packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.js +packages/app-mobile/components/NoteEditor/CodeMirror/markdownMathParser.js packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.test.js +packages/app-mobile/components/NoteEditor/CodeMirror/markdownReformatter.js packages/app-mobile/components/NoteEditor/CodeMirror/syntaxHighlightingLanguages.js packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/createEditor.js packages/app-mobile/components/NoteEditor/CodeMirror/testUtil/forceFullParse.js @@ -407,12 +407,12 @@ packages/app-mobile/components/app-nav.js packages/app-mobile/components/biometrics/BiometricPopup.js packages/app-mobile/components/biometrics/biometricAuthenticate.js packages/app-mobile/components/biometrics/sensorInfo.js -packages/app-mobile/components/getResponsiveValue.js packages/app-mobile/components/getResponsiveValue.test.js +packages/app-mobile/components/getResponsiveValue.js packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.js packages/app-mobile/components/screens/ConfigScreen/ConfigScreenButton.js -packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.js packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.test.js +packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/NoteExportButton.js packages/app-mobile/components/screens/ConfigScreen/NoteExportSection/exportAllFolders.js packages/app-mobile/components/screens/ConfigScreen/configScreenStyles.js packages/app-mobile/components/screens/Note.js @@ -444,19 +444,19 @@ packages/app-mobile/utils/setupNotifications.js packages/app-mobile/utils/shareHandler.js packages/app-mobile/utils/types.js packages/fork-htmlparser2/src/CollectingHandler.js -packages/fork-htmlparser2/src/FeedHandler.js packages/fork-htmlparser2/src/FeedHandler.spec.js +packages/fork-htmlparser2/src/FeedHandler.js packages/fork-htmlparser2/src/MultiplexHandler.js -packages/fork-htmlparser2/src/Parser.js packages/fork-htmlparser2/src/Parser.spec.js +packages/fork-htmlparser2/src/Parser.js packages/fork-htmlparser2/src/Tokenizer.js -packages/fork-htmlparser2/src/WritableStream.js packages/fork-htmlparser2/src/WritableStream.spec.js +packages/fork-htmlparser2/src/WritableStream.js packages/fork-htmlparser2/src/__fixtures__/test-helper.js packages/fork-htmlparser2/src/__tests__/events.js packages/fork-htmlparser2/src/__tests__/stream.js -packages/fork-htmlparser2/src/index.js packages/fork-htmlparser2/src/index.spec.js +packages/fork-htmlparser2/src/index.js packages/generator-joplin/generators/app/templates/api/index.js packages/generator-joplin/generators/app/templates/api/types.js packages/generator-joplin/generators/app/templates/api_index.js @@ -469,19 +469,19 @@ packages/lib/BaseModel.js packages/lib/BaseSyncTarget.js packages/lib/ClipperServer.js packages/lib/CssUtils.js -packages/lib/EventDispatcher.js packages/lib/EventDispatcher.test.js +packages/lib/EventDispatcher.js packages/lib/HtmlToMd.js -packages/lib/InMemoryCache.js packages/lib/InMemoryCache.test.js +packages/lib/InMemoryCache.js packages/lib/JoplinDatabase.js packages/lib/JoplinError.js packages/lib/JoplinServerApi.js packages/lib/Logger.js packages/lib/ObjectUtils.js packages/lib/PoorManIntervals.js -packages/lib/RotatingLogs.js packages/lib/RotatingLogs.test.js +packages/lib/RotatingLogs.js packages/lib/SyncTargetJoplinCloud.js packages/lib/SyncTargetJoplinServer.js packages/lib/SyncTargetNone.js @@ -491,8 +491,8 @@ packages/lib/Synchronizer.js packages/lib/TaskQueue.js packages/lib/WelcomeUtils.js packages/lib/array.js -packages/lib/callbackUrlUtils.js packages/lib/callbackUrlUtils.test.js +packages/lib/callbackUrlUtils.js packages/lib/commands/historyBackward.js packages/lib/commands/historyForward.js packages/lib/commands/index.js @@ -520,41 +520,41 @@ packages/lib/geolocation-node.js packages/lib/hooks/useAsyncEffect.js packages/lib/hooks/useElementSize.js packages/lib/hooks/useEventListener.js -packages/lib/htmlUtils.js packages/lib/htmlUtils.test.js +packages/lib/htmlUtils.js packages/lib/htmlUtils2.test.js -packages/lib/import-enex-md-gen.js packages/lib/import-enex-md-gen.test.js +packages/lib/import-enex-md-gen.js packages/lib/import-enex.js -packages/lib/locale.js packages/lib/locale.test.js -packages/lib/markdownUtils.js +packages/lib/locale.js packages/lib/markdownUtils.test.js +packages/lib/markdownUtils.js packages/lib/markdownUtils2.test.js packages/lib/markupLanguageUtils.js packages/lib/migrations/42.js packages/lib/models/Alarm.js packages/lib/models/BaseItem.js -packages/lib/models/Folder.js packages/lib/models/Folder.sharing.test.js packages/lib/models/Folder.test.js -packages/lib/models/ItemChange.js +packages/lib/models/Folder.js packages/lib/models/ItemChange.test.js -packages/lib/models/MasterKey.js +packages/lib/models/ItemChange.js packages/lib/models/MasterKey.test.js +packages/lib/models/MasterKey.js packages/lib/models/Migration.js -packages/lib/models/Note.js packages/lib/models/Note.test.js +packages/lib/models/Note.js packages/lib/models/NoteResource.js packages/lib/models/NoteTag.js -packages/lib/models/Resource.js packages/lib/models/Resource.test.js +packages/lib/models/Resource.js packages/lib/models/ResourceLocalState.js -packages/lib/models/Revision.js packages/lib/models/Revision.test.js +packages/lib/models/Revision.js packages/lib/models/Search.js -packages/lib/models/Setting.js packages/lib/models/Setting.test.js +packages/lib/models/Setting.js packages/lib/models/SmartFilter.js packages/lib/models/Tag.js packages/lib/models/dateTimeFormats.test.js @@ -564,20 +564,20 @@ packages/lib/models/utils/paginatedFeed.js packages/lib/models/utils/paginationToSql.js packages/lib/models/utils/readOnly.js packages/lib/models/utils/types.js -packages/lib/models/utils/userData.js packages/lib/models/utils/userData.test.js +packages/lib/models/utils/userData.js packages/lib/net-utils.js packages/lib/ntp.js packages/lib/onedrive-api.js packages/lib/path-utils.js packages/lib/reducer.js -packages/lib/registry.js packages/lib/registry.test.js +packages/lib/registry.js packages/lib/services/AlarmService.js packages/lib/services/AlarmServiceDriverNode.js packages/lib/services/BaseService.js -packages/lib/services/CommandService.js packages/lib/services/CommandService.test.js +packages/lib/services/CommandService.js packages/lib/services/DecryptionWorker.js packages/lib/services/ExternalEditWatcher.js packages/lib/services/ExternalEditWatcher/utils.js @@ -593,14 +593,14 @@ packages/lib/services/ReportService.js packages/lib/services/ResourceEditWatcher/index.js packages/lib/services/ResourceEditWatcher/reducer.js packages/lib/services/ResourceFetcher.js -packages/lib/services/ResourceService.js packages/lib/services/ResourceService.test.js -packages/lib/services/RevisionService.js +packages/lib/services/ResourceService.js packages/lib/services/RevisionService.test.js +packages/lib/services/RevisionService.js packages/lib/services/SettingUtils.js packages/lib/services/UndoRedoService.js -packages/lib/services/WhenClause.js packages/lib/services/WhenClause.test.js +packages/lib/services/WhenClause.js packages/lib/services/commands/MenuUtils.js packages/lib/services/commands/ToolbarButtonUtils.js packages/lib/services/commands/commandsToMarkdownTable.js @@ -611,40 +611,40 @@ packages/lib/services/commands/stateToWhenClauseContext.js packages/lib/services/contextkey/contextkey.js packages/lib/services/database/types.js packages/lib/services/debug/populateDatabase.js -packages/lib/services/e2ee/EncryptionService.js packages/lib/services/e2ee/EncryptionService.test.js +packages/lib/services/e2ee/EncryptionService.js packages/lib/services/e2ee/RSA.node.js -packages/lib/services/e2ee/ppk.js packages/lib/services/e2ee/ppk.test.js +packages/lib/services/e2ee/ppk.js packages/lib/services/e2ee/ppkTestUtils.js packages/lib/services/e2ee/types.js -packages/lib/services/e2ee/utils.js packages/lib/services/e2ee/utils.test.js -packages/lib/services/interop/InteropService.js +packages/lib/services/e2ee/utils.js packages/lib/services/interop/InteropService.test.js +packages/lib/services/interop/InteropService.js packages/lib/services/interop/InteropService_Exporter_Base.js packages/lib/services/interop/InteropService_Exporter_Custom.js -packages/lib/services/interop/InteropService_Exporter_Html.js packages/lib/services/interop/InteropService_Exporter_Html.test.js +packages/lib/services/interop/InteropService_Exporter_Html.js packages/lib/services/interop/InteropService_Exporter_Jex.js -packages/lib/services/interop/InteropService_Exporter_Md.js packages/lib/services/interop/InteropService_Exporter_Md.test.js -packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js +packages/lib/services/interop/InteropService_Exporter_Md.js packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.test.js +packages/lib/services/interop/InteropService_Exporter_Md_frontmatter.js packages/lib/services/interop/InteropService_Exporter_Raw.js packages/lib/services/interop/InteropService_Importer_Base.js packages/lib/services/interop/InteropService_Importer_Custom.js packages/lib/services/interop/InteropService_Importer_EnexToHtml.js packages/lib/services/interop/InteropService_Importer_EnexToMd.js packages/lib/services/interop/InteropService_Importer_Jex.js -packages/lib/services/interop/InteropService_Importer_Md.js packages/lib/services/interop/InteropService_Importer_Md.test.js -packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js +packages/lib/services/interop/InteropService_Importer_Md.js packages/lib/services/interop/InteropService_Importer_Md_frontmatter.test.js -packages/lib/services/interop/InteropService_Importer_Raw.js +packages/lib/services/interop/InteropService_Importer_Md_frontmatter.js packages/lib/services/interop/InteropService_Importer_Raw.test.js -packages/lib/services/interop/Module.js +packages/lib/services/interop/InteropService_Importer_Raw.js packages/lib/services/interop/Module.test.js +packages/lib/services/interop/Module.js packages/lib/services/interop/types.js packages/lib/services/joplinServer/personalizedUserContentBaseUrl.js packages/lib/services/keychain/KeychainService.js @@ -691,23 +691,23 @@ packages/lib/services/plugins/utils/makeListener.js packages/lib/services/plugins/utils/manifestFromObject.js packages/lib/services/plugins/utils/mapEventHandlersToIds.js packages/lib/services/plugins/utils/types.js -packages/lib/services/plugins/utils/validatePluginId.js packages/lib/services/plugins/utils/validatePluginId.test.js -packages/lib/services/plugins/utils/validatePluginVersion.js +packages/lib/services/plugins/utils/validatePluginId.js packages/lib/services/plugins/utils/validatePluginVersion.test.js -packages/lib/services/profileConfig/index.js +packages/lib/services/plugins/utils/validatePluginVersion.js packages/lib/services/profileConfig/index.test.js +packages/lib/services/profileConfig/index.js packages/lib/services/profileConfig/initProfile.js packages/lib/services/profileConfig/mergeGlobalAndLocalSettings.js packages/lib/services/profileConfig/splitGlobalAndLocalSettings.js packages/lib/services/profileConfig/types.js -packages/lib/services/rest/Api.js packages/lib/services/rest/Api.test.js +packages/lib/services/rest/Api.js packages/lib/services/rest/ApiResponse.js packages/lib/services/rest/actionApi.desktop.js packages/lib/services/rest/routes/auth.js -packages/lib/services/rest/routes/events.js packages/lib/services/rest/routes/events.test.js +packages/lib/services/rest/routes/events.js packages/lib/services/rest/routes/folders.js packages/lib/services/rest/routes/master_keys.js packages/lib/services/rest/routes/notes.js @@ -725,26 +725,26 @@ packages/lib/services/rest/utils/readonlyProperties.js packages/lib/services/rest/utils/requestFields.js packages/lib/services/rest/utils/requestPaginationOptions.js packages/lib/services/searchengine/SearchEngine.js -packages/lib/services/searchengine/SearchEngineUtils.js packages/lib/services/searchengine/SearchEngineUtils.test.js +packages/lib/services/searchengine/SearchEngineUtils.js packages/lib/services/searchengine/SearchFilter.test.js -packages/lib/services/searchengine/filterParser.js packages/lib/services/searchengine/filterParser.test.js -packages/lib/services/searchengine/gotoAnythingStyleQuery.js +packages/lib/services/searchengine/filterParser.js packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js +packages/lib/services/searchengine/gotoAnythingStyleQuery.js packages/lib/services/searchengine/queryBuilder.js -packages/lib/services/share/ShareService.js packages/lib/services/share/ShareService.test.js +packages/lib/services/share/ShareService.js packages/lib/services/share/reducer.js packages/lib/services/spellChecker/SpellCheckerService.js packages/lib/services/spellChecker/SpellCheckerServiceDriverBase.js -packages/lib/services/style/cssToTheme.js packages/lib/services/style/cssToTheme.test.js +packages/lib/services/style/cssToTheme.js packages/lib/services/style/loadCssToTheme.js -packages/lib/services/style/themeToCss.js packages/lib/services/style/themeToCss.test.js -packages/lib/services/synchronizer/ItemUploader.js +packages/lib/services/style/themeToCss.js packages/lib/services/synchronizer/ItemUploader.test.js +packages/lib/services/synchronizer/ItemUploader.js packages/lib/services/synchronizer/LockHandler.js packages/lib/services/synchronizer/MigrationHandler.js packages/lib/services/synchronizer/Synchronizer.basics.test.js @@ -761,8 +761,8 @@ packages/lib/services/synchronizer/migrations/1.js packages/lib/services/synchronizer/migrations/2.js packages/lib/services/synchronizer/migrations/3.js packages/lib/services/synchronizer/syncDebugLog.js -packages/lib/services/synchronizer/syncInfoUtils.js packages/lib/services/synchronizer/syncInfoUtils.test.js +packages/lib/services/synchronizer/syncInfoUtils.js packages/lib/services/synchronizer/synchronizer_LockHandler.test.js packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js packages/lib/services/synchronizer/tools.js @@ -789,11 +789,11 @@ packages/lib/time.js packages/lib/utils/credentialFiles.js packages/lib/utils/joplinCloud.js packages/lib/utils/userFetcher.js -packages/lib/utils/webDAVUtils.js packages/lib/utils/webDAVUtils.test.js +packages/lib/utils/webDAVUtils.js packages/lib/uuid.js -packages/lib/versionInfo.js packages/lib/versionInfo.test.js +packages/lib/versionInfo.js packages/pdf-viewer/FullViewer.js packages/pdf-viewer/Page.js packages/pdf-viewer/PdfDocument.js @@ -814,17 +814,17 @@ packages/pdf-viewer/ui/IconButtons.js packages/pdf-viewer/ui/ZoomControls.js packages/plugin-repo-cli/commands/updateRelease.js packages/plugin-repo-cli/index.js -packages/plugin-repo-cli/lib/checkIfPluginCanBeAdded.js packages/plugin-repo-cli/lib/checkIfPluginCanBeAdded.test.js -packages/plugin-repo-cli/lib/errorsHaveChanged.js +packages/plugin-repo-cli/lib/checkIfPluginCanBeAdded.js packages/plugin-repo-cli/lib/errorsHaveChanged.test.js -packages/plugin-repo-cli/lib/gitCompareUrl.js +packages/plugin-repo-cli/lib/errorsHaveChanged.js packages/plugin-repo-cli/lib/gitCompareUrl.test.js -packages/plugin-repo-cli/lib/overrideUtils.js +packages/plugin-repo-cli/lib/gitCompareUrl.js packages/plugin-repo-cli/lib/overrideUtils.test.js +packages/plugin-repo-cli/lib/overrideUtils.js packages/plugin-repo-cli/lib/types.js -packages/plugin-repo-cli/lib/updateReadme.js packages/plugin-repo-cli/lib/updateReadme.test.js +packages/plugin-repo-cli/lib/updateReadme.js packages/plugin-repo-cli/lib/utils.js packages/plugins/ToggleSidebars/api/index.js packages/plugins/ToggleSidebars/api/types.js @@ -834,10 +834,10 @@ packages/renderer/HtmlToHtml.js packages/renderer/InMemoryCache.js packages/renderer/MarkupToHtml.js packages/renderer/MdToHtml.js -packages/renderer/MdToHtml/createEventHandlingAttrs.js packages/renderer/MdToHtml/createEventHandlingAttrs.test.js -packages/renderer/MdToHtml/linkReplacement.js +packages/renderer/MdToHtml/createEventHandlingAttrs.js packages/renderer/MdToHtml/linkReplacement.test.js +packages/renderer/MdToHtml/linkReplacement.js packages/renderer/MdToHtml/renderMedia.js packages/renderer/MdToHtml/rules/checkbox.js packages/renderer/MdToHtml/rules/code_inline.js @@ -856,26 +856,26 @@ packages/renderer/MdToHtml/setupLinkify.js packages/renderer/MdToHtml/validateLinks.js packages/renderer/headerAnchor.js packages/renderer/highlight.js -packages/renderer/htmlUtils.js packages/renderer/htmlUtils.test.js +packages/renderer/htmlUtils.js packages/renderer/index.js packages/renderer/noteStyle.js packages/renderer/pathUtils.js packages/renderer/utils.js packages/tools/build-release-stats.js packages/tools/build-welcome.js -packages/tools/buildServerDocker.js packages/tools/buildServerDocker.test.js -packages/tools/bundleDefaultPlugins.js +packages/tools/buildServerDocker.js packages/tools/bundleDefaultPlugins.test.js +packages/tools/bundleDefaultPlugins.js packages/tools/checkIgnoredFiles.js -packages/tools/checkLibPaths.js packages/tools/checkLibPaths.test.js +packages/tools/checkLibPaths.js packages/tools/convertThemesToCss.js packages/tools/generate-database-types.js packages/tools/generate-images.js -packages/tools/git-changelog.js packages/tools/git-changelog.test.js +packages/tools/git-changelog.js packages/tools/licenseChecker.js packages/tools/release-android.js packages/tools/release-cli.js @@ -887,8 +887,8 @@ packages/tools/setupNewRelease.js packages/tools/spellcheck.js packages/tools/tagServerLatest.js packages/tools/tool-utils.js -packages/tools/update-readme-download.js packages/tools/update-readme-download.test.js +packages/tools/update-readme-download.js packages/tools/update-readme-sponsors.js packages/tools/updateMarkdownDoc.js packages/tools/utils/discourse.js @@ -898,14 +898,14 @@ packages/tools/website/build.js packages/tools/website/buildTranslations.js packages/tools/website/updateDownloadPage.js packages/tools/website/updateNews.js -packages/tools/website/utils/applyTranslations.js packages/tools/website/utils/applyTranslations.test.js -packages/tools/website/utils/convertLinksToLocale.js +packages/tools/website/utils/applyTranslations.js packages/tools/website/utils/convertLinksToLocale.test.js +packages/tools/website/utils/convertLinksToLocale.js packages/tools/website/utils/frontMatter.js packages/tools/website/utils/news.js -packages/tools/website/utils/openGraph.js packages/tools/website/utils/openGraph.test.js +packages/tools/website/utils/openGraph.js packages/tools/website/utils/parser.js packages/tools/website/utils/pressCarousel.js packages/tools/website/utils/processTranslations.js diff --git a/packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild.js b/packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild.js index 91d6b3e7b..0dfa29d60 100644 --- a/packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild.js +++ b/packages/tools/gulp/tasks/updateIgnoredTypeScriptBuild.js @@ -1,6 +1,6 @@ const utils = require('../utils'); -const glob = require('glob'); const rootDir = utils.rootDir(); +const { globSync } = require('@joplin/utils/fs'); module.exports = { src: '', @@ -11,7 +11,7 @@ module.exports = { // // https://github.com/isaacs/node-glob/issues/371 - const tsFiles = glob.sync('{**/*.ts,**/*.tsx}', { + const tsFiles = globSync('{**/*.ts,**/*.tsx}', { cwd: rootDir, ignore: [ '**/.git/**', @@ -32,7 +32,6 @@ module.exports = { 'packages/app-desktop/dist/**', 'packages/app-mobile/android/**', 'packages/app-mobile/ios/**', - // 'packages/fork-htmlparser2/**', 'packages/fork-sax/**', 'packages/lib/plugin_types/**', 'packages/server/**', @@ -52,29 +51,12 @@ module.exports = { return `${s.join('.')}.js`; }); - // const ignoredMapFiles = tsFiles.map(f => { - // const s = f.split('.'); - // s.pop(); - // return `${s.join('.')}.js.map`; - // }); - - // const ignoredDefFiles = tsFiles.map(f => { - // const s = f.split('.'); - // s.pop(); - // return `${s.join('.')}.d.ts`; - // }); - - // const ignoredFiles = ignoredJsFiles.concat(ignoredMapFiles).concat(ignoredDefFiles); - const ignoredFiles = ignoredJsFiles; - ignoredFiles.sort(); - const regex = /(# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD)[\s\S]*(# AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD)/; - const replacement = `$1\n${ignoredFiles.join('\n')}\n$2`; + const replacement = `$1\n${ignoredJsFiles.join('\n')}\n$2`; await Promise.all([ utils.replaceFileText(`${rootDir}/.gitignore`, regex, replacement), utils.replaceFileText(`${rootDir}/.eslintignore`, regex, replacement), - // utils.replaceFileText(`${rootDir}/.ignore`, regex, replacement), ]); }, }; diff --git a/packages/utils/fs.ts b/packages/utils/fs.ts new file mode 100644 index 000000000..a707362e8 --- /dev/null +++ b/packages/utils/fs.ts @@ -0,0 +1,12 @@ +/* eslint-disable import/prefer-default-export */ + +import { GlobOptionsWithFileTypesFalse, sync } from 'glob'; + +// Wraps glob.sync but with good default options so that it works across +// platforms and with consistent sorting. +export const globSync = (pattern: string | string[], options: GlobOptionsWithFileTypesFalse) => { + let output = sync(pattern, options); + output = output.map(f => f.replace(/\\/g, '/')); + output.sort(); + return output; +}; diff --git a/packages/utils/package.json b/packages/utils/package.json index c622e6833..2c9d6f0d6 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -5,7 +5,8 @@ "repository": "https://github.com/laurent22/joplin/tree/dev/packages/utils", "exports": { ".": "./dist/index.js", - "./net": "./dist/net.js" + "./net": "./dist/net.js", + "./fs": "./dist/fs.js" }, "publishConfig": { "access": "public" @@ -21,6 +22,7 @@ "dependencies": { "execa": "5.1.1", "fs-extra": "11.1.1", + "glob": "10.2.7", "node-fetch": "2.6.7" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 14b48ab12..03cb26901 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5035,6 +5035,7 @@ __metadata: "@types/node-fetch": 2.6.3 execa: 5.1.1 fs-extra: 11.1.1 + glob: 10.2.7 jest: 29.5.0 node-fetch: 2.6.7 ts-jest: 29.1.0