Android 2.14.7

Auto-updated using release-website.sh

.eslintignore

@@ -86,6 +86,7 @@ packages/lib/countable/Countable.js
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.js
+packages/app-cli/app/app.js
 packages/app-cli/app/base-command.js
 packages/app-cli/app/command-apidoc.js
 packages/app-cli/app/command-attach.js
@@ -246,7 +247,6 @@ packages/app-desktop/gui/Navigator.js
 packages/app-desktop/gui/NoteContentPropertiesDialog.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/setupVim.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js
@@ -294,6 +294,7 @@ 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
+packages/app-desktop/gui/NoteEditor/utils/markupRenderOptions.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.test.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.js
 packages/app-desktop/gui/NoteEditor/utils/types.js
@@ -414,6 +415,7 @@ packages/app-desktop/integration-tests/util/activateMainMenuItem.js
 packages/app-desktop/integration-tests/util/createStartupArgs.js
 packages/app-desktop/integration-tests/util/firstNonDevToolsWindow.js
 packages/app-desktop/integration-tests/util/setFilePickerResponse.js
+packages/app-desktop/integration-tests/util/setMessageBoxResponse.js
 packages/app-desktop/integration-tests/util/test.js
 packages/app-desktop/playwright.config.js
 packages/app-desktop/plugins/GotoAnything.js
@@ -444,6 +446,8 @@ packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/tools/copy7Zip.js
 packages/app-desktop/tools/notarizeMacApp.js
 packages/app-desktop/tools/renameReleaseAssets.js
+packages/app-desktop/utils/7zip/getPathToExecutable7Zip.js
+packages/app-desktop/utils/7zip/pathToBundled7Zip.js
 packages/app-desktop/utils/checkForUpdatesUtils.test.js
 packages/app-desktop/utils/checkForUpdatesUtils.js
 packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
@@ -486,10 +490,15 @@ packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarButton.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarOverflowRows.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useActionButtons.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useHeaderButtons.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useInlineFormattingButtons.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useListButtons.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/types.js
 packages/app-mobile/components/NoteEditor/NoteEditor.test.js
 packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
+packages/app-mobile/components/NoteEditor/hooks/useKeyboardVisible.js
 packages/app-mobile/components/NoteEditor/types.js
 packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
@@ -561,6 +570,7 @@ packages/default-plugins/build.js
 packages/default-plugins/buildDefaultPlugins.js
 packages/default-plugins/commands/buildAll.js
 packages/default-plugins/commands/editPatch.js
+packages/default-plugins/utils/getCurrentCommitHash.js
 packages/default-plugins/utils/getPathToPatchFileFor.js
 packages/default-plugins/utils/readRepositoryJson.js
 packages/default-plugins/utils/waitForCliInput.js
@@ -573,6 +583,8 @@ packages/editor/CodeMirror/configFromSettings.js
 packages/editor/CodeMirror/createEditor.test.js
 packages/editor/CodeMirror/createEditor.js
 packages/editor/CodeMirror/editorCommands/editorCommands.js
+packages/editor/CodeMirror/editorCommands/insertLineAfter.test.js
+packages/editor/CodeMirror/editorCommands/insertLineAfter.js
 packages/editor/CodeMirror/editorCommands/supportsCommand.js
 packages/editor/CodeMirror/editorCommands/swapLine.js
 packages/editor/CodeMirror/getScrollFraction.js
@@ -597,6 +609,7 @@ packages/editor/CodeMirror/testUtil/forceFullParse.js
 packages/editor/CodeMirror/testUtil/loadLanguages.js
 packages/editor/CodeMirror/theme.js
 packages/editor/CodeMirror/util/isInSyntaxNode.js
+packages/editor/CodeMirror/util/setupVim.js
 packages/editor/SelectionFormatting.js
 packages/editor/events.js
 packages/editor/types.js
@@ -662,9 +675,11 @@ packages/lib/components/shared/config/shouldShowMissingPasswordWarning.test.js
 packages/lib/components/shared/config/shouldShowMissingPasswordWarning.js
 packages/lib/components/shared/note-screen-shared.js
 packages/lib/components/shared/reduxSharedMiddleware.js
+packages/lib/components/shared/side-menu-shared.js
 packages/lib/database-driver-better-sqlite.js
 packages/lib/database.js
 packages/lib/debug/DebugService.js
+packages/lib/determineProfileDir.js
 packages/lib/dom.js
 packages/lib/errorUtils.js
 packages/lib/errors.js
@@ -674,6 +689,7 @@ packages/lib/file-api-driver-memory.js
 packages/lib/file-api-driver.test.js
 packages/lib/file-api.test.js
 packages/lib/file-api.js
+packages/lib/folders-screen-utils.js
 packages/lib/fs-driver-base.js
 packages/lib/fs-driver-node.js
 packages/lib/fsDriver.test.js
@@ -721,19 +737,23 @@ packages/lib/models/Search.js
 packages/lib/models/Setting.test.js
 packages/lib/models/Setting.js
 packages/lib/models/SmartFilter.js
+packages/lib/models/Tag.test.js
 packages/lib/models/Tag.js
 packages/lib/models/dateTimeFormats.test.js
 packages/lib/models/settings/FileHandler.js
+packages/lib/models/settings/settingValidations.js
 packages/lib/models/utils/isItemId.js
 packages/lib/models/utils/itemCanBeEncrypted.js
 packages/lib/models/utils/paginatedFeed.js
 packages/lib/models/utils/paginationToSql.js
 packages/lib/models/utils/readOnly.js
+packages/lib/models/utils/resourceUtils.js
 packages/lib/models/utils/types.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.test.js
 packages/lib/onedrive-api.js
 packages/lib/path-utils.js
 packages/lib/reducer.js
@@ -781,6 +801,8 @@ packages/lib/services/database/migrations/42.js
 packages/lib/services/database/migrations/43.js
 packages/lib/services/database/migrations/44.js
 packages/lib/services/database/migrations/45.js
+packages/lib/services/database/migrations/46.js
+packages/lib/services/database/migrations/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
 packages/lib/services/debug/populateDatabase.js
@@ -912,16 +934,17 @@ packages/lib/services/rest/utils/paginatedResults.js
 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.resources.test.js
-packages/lib/services/searchengine/SearchEngine.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.test.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/search/SearchEngine.resources.test.js
+packages/lib/services/search/SearchEngine.test.js
+packages/lib/services/search/SearchEngine.js
+packages/lib/services/search/SearchEngineUtils.test.js
+packages/lib/services/search/SearchEngineUtils.js
+packages/lib/services/search/SearchFilter.test.js
+packages/lib/services/search/filterParser.test.js
+packages/lib/services/search/filterParser.js
+packages/lib/services/search/gotoAnythingStyleQuery.test.js
+packages/lib/services/search/gotoAnythingStyleQuery.js
+packages/lib/services/search/queryBuilder.js
 packages/lib/services/share/ShareService.test.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/reducer.js
@@ -955,6 +978,7 @@ 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
+packages/lib/services/synchronizer/utils/checkDisabledSyncItemsNotification.js
 packages/lib/services/synchronizer/utils/handleConflictAction.js
 packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js
 packages/lib/services/synchronizer/utils/resourceRemotePath.js
@@ -962,6 +986,8 @@ packages/lib/services/synchronizer/utils/syncDeleteStep.js
 packages/lib/services/synchronizer/utils/types.js
 packages/lib/shim-init-node.js
 packages/lib/shim.js
+packages/lib/string-utils.test.js
+packages/lib/string-utils.js
 packages/lib/testing/syncTargetUtils.js
 packages/lib/testing/test-utils-synchronizer.js
 packages/lib/testing/test-utils.js
@@ -980,6 +1006,8 @@ packages/lib/types.js
 packages/lib/utils/credentialFiles.js
 packages/lib/utils/joplinCloud.js
 packages/lib/utils/processStartFlags.js
+packages/lib/utils/replaceUnsupportedCharacters.test.js
+packages/lib/utils/replaceUnsupportedCharacters.js
 packages/lib/utils/userFetcher.js
 packages/lib/utils/webDAVUtils.test.js
 packages/lib/utils/webDAVUtils.js
@@ -1049,13 +1077,15 @@ packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/source_map.js
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/validateLinks.js
+packages/renderer/assetsToHeaders.js
+packages/renderer/defaultResourceModel.js
 packages/renderer/headerAnchor.js
 packages/renderer/highlight.js
 packages/renderer/htmlUtils.test.js
 packages/renderer/htmlUtils.js
 packages/renderer/index.js
 packages/renderer/noteStyle.js
-packages/renderer/pathUtils.js
+packages/renderer/types.js
 packages/renderer/utils.js
 packages/tools/build-release-stats.test.js
 packages/tools/build-release-stats.js

.github/PULL_REQUEST_TEMPLATE

@@ -20,6 +20,6 @@ If it's not related to any platform (such as a translation, change to the docume
 
 Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.
 
-AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/CONTRIBUTING.md
+AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md
 
--->
+-->

.github/scripts/run_ci.sh

@@ -107,7 +107,7 @@ if [ "$RUN_TESTS" == "1" ]; then
 	#
 	# https://stackoverflow.com/questions/38558989
 	export NODE_OPTIONS="--max-old-space-size=32768"
-	yarn run test-ci
+	yarn test-ci
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -122,13 +122,13 @@ fi
 if [ "$RUN_TESTS" == "1" ]; then
 	echo "Step: Running linter..."
 
-	yarn run linter-ci ./
+	yarn linter-ci ./
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
 	fi
 
-	yarn run packageJsonLint
+	yarn packageJsonLint
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -175,7 +175,7 @@ fi
 
 # =============================================================================
 # Check .gitignore and .eslintignore files - they should be updated when
-# new TypeScript files are added by running `yarn run updateIgnored`.
+# new TypeScript files are added by running `yarn updateIgnored`.
 # See coding_style.md
 # =============================================================================
 
@@ -200,7 +200,7 @@ if [ "$RUN_TESTS" == "1" ]; then
 
 	mkdir -p ../joplin-website/docs
 	ll ../joplin-website/docs/api/references/plugin_api
-	SKIP_SPONSOR_PROCESSING=1 yarn run buildWebsite
+	SKIP_SPONSOR_PROCESSING=1 yarn buildWebsite
 	testResult=$?
 	if [ $testResult -ne 0 ]; then
 		exit $testResult
@@ -253,14 +253,14 @@ if [ "$IS_DESKTOP_RELEASE" == "1" ]; then
 		# "python" and seems to no longer respect the PYTHON_PATH environment variable.
 		# We work around this by aliasing python.
 		alias python=$(which python3)
-		USE_HARD_LINKS=false yarn run dist
+		USE_HARD_LINKS=false yarn dist
 	else
-		USE_HARD_LINKS=false yarn run dist
+		USE_HARD_LINKS=false yarn dist
 	fi	
 elif [[ $IS_LINUX = 1 ]] && [ "$IS_SERVER_RELEASE" == "1" ]; then
 	echo "Step: Building Docker Image..."
 	cd "$ROOT_DIR"
-	yarn run buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
+	yarn buildServerDocker --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
 else
 	echo "Step: Building but *not* publishing desktop application..."
 	
@@ -274,8 +274,8 @@ else
 		export CSC_IDENTITY_AUTO_DISCOVERY=false
 		npm pkg set 'build.mac.identity'=null --json
 		
-		USE_HARD_LINKS=false yarn run dist --publish=never
+		USE_HARD_LINKS=false yarn dist --publish=never
 	else
-		USE_HARD_LINKS=false yarn run dist --publish=never
+		USE_HARD_LINKS=false yarn dist --publish=never
 	fi
 fi

.github/workflows/build-android.yml

@@ -26,7 +26,7 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y libsecret-1-dev
           
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v2
         with:

.github/workflows/build-macos-m1.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: macos-latest
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: olegtarasov/get-tag@v2.1
       - uses: actions/setup-node@v2
         with:
@@ -67,7 +67,7 @@ jobs:
 
           if [[ $GIT_TAG_NAME = v* ]]; then
             echo "Building and publishing desktop application..."
-            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn run dist --mac --arm64
+            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
 
             yarn renameReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
           else
@@ -80,5 +80,5 @@ jobs:
             export CSC_IDENTITY_AUTO_DISCOVERY=false
             npm pkg set 'build.mac.identity'=null --json
 
-            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn run dist  --mac --arm64 --publish=never
+            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
           fi

.github/workflows/github-actions-main.yml

@@ -81,7 +81,7 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: olegtarasov/get-tag@v2.1
       - uses: actions/setup-node@v2
         with:
@@ -141,7 +141,7 @@ jobs:
         # To ensure that the operations stop on failure, all commands
         # should be on one line with "&&" in between.
         run: |
-          yarn install && cd packages/app-desktop && yarn run dist
+          yarn install && cd packages/app-desktop && yarn dist
 
       # Build and package the Windows app, without publishing it, just to
       # verify that the build process hasn't been broken.
@@ -153,7 +153,7 @@ jobs:
           SERVER_REPOSITORY: joplin/server
           SERVER_TAG_PREFIX: server
         run: |
-          yarn install && cd packages/app-desktop && yarn run dist --publish=never
+          yarn install && cd packages/app-desktop && yarn dist --publish=never
 
   ServerDockerImage:
     needs: pre_job
@@ -180,7 +180,7 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v2
         with:
@@ -197,7 +197,7 @@ jobs:
           BUILD_SEQUENCIAL: 1
         run: |
           yarn install
-          yarn run buildServerDocker --tag-name server-v0.0.0 --repository joplin/server
+          yarn buildServerDocker --tag-name server-v0.0.0 --repository joplin/server
 
           # Basic test to ensure that the created build is valid. It should exit with
           # code 0  if it works.

.gitignore

@@ -66,6 +66,7 @@ docs/**/*.mustache
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
 packages/app-cli/app/LinkSelector.js
+packages/app-cli/app/app.js
 packages/app-cli/app/base-command.js
 packages/app-cli/app/command-apidoc.js
 packages/app-cli/app/command-attach.js
@@ -226,7 +227,6 @@ packages/app-desktop/gui/Navigator.js
 packages/app-desktop/gui/NoteContentPropertiesDialog.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/Toolbar.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/index.js
-packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/setupVim.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/types.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useContextMenu.js
 packages/app-desktop/gui/NoteEditor/NoteBody/CodeMirror/utils/useCursorUtils.test.js
@@ -274,6 +274,7 @@ 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
+packages/app-desktop/gui/NoteEditor/utils/markupRenderOptions.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.test.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.js
 packages/app-desktop/gui/NoteEditor/utils/types.js
@@ -394,6 +395,7 @@ packages/app-desktop/integration-tests/util/activateMainMenuItem.js
 packages/app-desktop/integration-tests/util/createStartupArgs.js
 packages/app-desktop/integration-tests/util/firstNonDevToolsWindow.js
 packages/app-desktop/integration-tests/util/setFilePickerResponse.js
+packages/app-desktop/integration-tests/util/setMessageBoxResponse.js
 packages/app-desktop/integration-tests/util/test.js
 packages/app-desktop/playwright.config.js
 packages/app-desktop/plugins/GotoAnything.js
@@ -424,6 +426,8 @@ packages/app-desktop/services/spellChecker/SpellCheckerServiceDriverNative.js
 packages/app-desktop/tools/copy7Zip.js
 packages/app-desktop/tools/notarizeMacApp.js
 packages/app-desktop/tools/renameReleaseAssets.js
+packages/app-desktop/utils/7zip/getPathToExecutable7Zip.js
+packages/app-desktop/utils/7zip/pathToBundled7Zip.js
 packages/app-desktop/utils/checkForUpdatesUtils.test.js
 packages/app-desktop/utils/checkForUpdatesUtils.js
 packages/app-desktop/utils/checkForUpdatesUtilsTestData.js
@@ -466,10 +470,15 @@ packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToggleSpaceButton.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/Toolbar.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarButton.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/ToolbarOverflowRows.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useActionButtons.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useHeaderButtons.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useInlineFormattingButtons.js
+packages/app-mobile/components/NoteEditor/MarkdownToolbar/buttons/useListButtons.js
 packages/app-mobile/components/NoteEditor/MarkdownToolbar/types.js
 packages/app-mobile/components/NoteEditor/NoteEditor.test.js
 packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
+packages/app-mobile/components/NoteEditor/hooks/useKeyboardVisible.js
 packages/app-mobile/components/NoteEditor/types.js
 packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
@@ -541,6 +550,7 @@ packages/default-plugins/build.js
 packages/default-plugins/buildDefaultPlugins.js
 packages/default-plugins/commands/buildAll.js
 packages/default-plugins/commands/editPatch.js
+packages/default-plugins/utils/getCurrentCommitHash.js
 packages/default-plugins/utils/getPathToPatchFileFor.js
 packages/default-plugins/utils/readRepositoryJson.js
 packages/default-plugins/utils/waitForCliInput.js
@@ -553,6 +563,8 @@ packages/editor/CodeMirror/configFromSettings.js
 packages/editor/CodeMirror/createEditor.test.js
 packages/editor/CodeMirror/createEditor.js
 packages/editor/CodeMirror/editorCommands/editorCommands.js
+packages/editor/CodeMirror/editorCommands/insertLineAfter.test.js
+packages/editor/CodeMirror/editorCommands/insertLineAfter.js
 packages/editor/CodeMirror/editorCommands/supportsCommand.js
 packages/editor/CodeMirror/editorCommands/swapLine.js
 packages/editor/CodeMirror/getScrollFraction.js
@@ -577,6 +589,7 @@ packages/editor/CodeMirror/testUtil/forceFullParse.js
 packages/editor/CodeMirror/testUtil/loadLanguages.js
 packages/editor/CodeMirror/theme.js
 packages/editor/CodeMirror/util/isInSyntaxNode.js
+packages/editor/CodeMirror/util/setupVim.js
 packages/editor/SelectionFormatting.js
 packages/editor/events.js
 packages/editor/types.js
@@ -642,9 +655,11 @@ packages/lib/components/shared/config/shouldShowMissingPasswordWarning.test.js
 packages/lib/components/shared/config/shouldShowMissingPasswordWarning.js
 packages/lib/components/shared/note-screen-shared.js
 packages/lib/components/shared/reduxSharedMiddleware.js
+packages/lib/components/shared/side-menu-shared.js
 packages/lib/database-driver-better-sqlite.js
 packages/lib/database.js
 packages/lib/debug/DebugService.js
+packages/lib/determineProfileDir.js
 packages/lib/dom.js
 packages/lib/errorUtils.js
 packages/lib/errors.js
@@ -654,6 +669,7 @@ packages/lib/file-api-driver-memory.js
 packages/lib/file-api-driver.test.js
 packages/lib/file-api.test.js
 packages/lib/file-api.js
+packages/lib/folders-screen-utils.js
 packages/lib/fs-driver-base.js
 packages/lib/fs-driver-node.js
 packages/lib/fsDriver.test.js
@@ -701,19 +717,23 @@ packages/lib/models/Search.js
 packages/lib/models/Setting.test.js
 packages/lib/models/Setting.js
 packages/lib/models/SmartFilter.js
+packages/lib/models/Tag.test.js
 packages/lib/models/Tag.js
 packages/lib/models/dateTimeFormats.test.js
 packages/lib/models/settings/FileHandler.js
+packages/lib/models/settings/settingValidations.js
 packages/lib/models/utils/isItemId.js
 packages/lib/models/utils/itemCanBeEncrypted.js
 packages/lib/models/utils/paginatedFeed.js
 packages/lib/models/utils/paginationToSql.js
 packages/lib/models/utils/readOnly.js
+packages/lib/models/utils/resourceUtils.js
 packages/lib/models/utils/types.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.test.js
 packages/lib/onedrive-api.js
 packages/lib/path-utils.js
 packages/lib/reducer.js
@@ -761,6 +781,8 @@ packages/lib/services/database/migrations/42.js
 packages/lib/services/database/migrations/43.js
 packages/lib/services/database/migrations/44.js
 packages/lib/services/database/migrations/45.js
+packages/lib/services/database/migrations/46.js
+packages/lib/services/database/migrations/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
 packages/lib/services/debug/populateDatabase.js
@@ -892,16 +914,17 @@ packages/lib/services/rest/utils/paginatedResults.js
 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.resources.test.js
-packages/lib/services/searchengine/SearchEngine.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.test.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/search/SearchEngine.resources.test.js
+packages/lib/services/search/SearchEngine.test.js
+packages/lib/services/search/SearchEngine.js
+packages/lib/services/search/SearchEngineUtils.test.js
+packages/lib/services/search/SearchEngineUtils.js
+packages/lib/services/search/SearchFilter.test.js
+packages/lib/services/search/filterParser.test.js
+packages/lib/services/search/filterParser.js
+packages/lib/services/search/gotoAnythingStyleQuery.test.js
+packages/lib/services/search/gotoAnythingStyleQuery.js
+packages/lib/services/search/queryBuilder.js
 packages/lib/services/share/ShareService.test.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/reducer.js
@@ -935,6 +958,7 @@ 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
+packages/lib/services/synchronizer/utils/checkDisabledSyncItemsNotification.js
 packages/lib/services/synchronizer/utils/handleConflictAction.js
 packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js
 packages/lib/services/synchronizer/utils/resourceRemotePath.js
@@ -942,6 +966,8 @@ packages/lib/services/synchronizer/utils/syncDeleteStep.js
 packages/lib/services/synchronizer/utils/types.js
 packages/lib/shim-init-node.js
 packages/lib/shim.js
+packages/lib/string-utils.test.js
+packages/lib/string-utils.js
 packages/lib/testing/syncTargetUtils.js
 packages/lib/testing/test-utils-synchronizer.js
 packages/lib/testing/test-utils.js
@@ -960,6 +986,8 @@ packages/lib/types.js
 packages/lib/utils/credentialFiles.js
 packages/lib/utils/joplinCloud.js
 packages/lib/utils/processStartFlags.js
+packages/lib/utils/replaceUnsupportedCharacters.test.js
+packages/lib/utils/replaceUnsupportedCharacters.js
 packages/lib/utils/userFetcher.js
 packages/lib/utils/webDAVUtils.test.js
 packages/lib/utils/webDAVUtils.js
@@ -1029,13 +1057,15 @@ packages/renderer/MdToHtml/rules/sanitize_html.js
 packages/renderer/MdToHtml/rules/source_map.js
 packages/renderer/MdToHtml/setupLinkify.js
 packages/renderer/MdToHtml/validateLinks.js
+packages/renderer/assetsToHeaders.js
+packages/renderer/defaultResourceModel.js
 packages/renderer/headerAnchor.js
 packages/renderer/highlight.js
 packages/renderer/htmlUtils.test.js
 packages/renderer/htmlUtils.js
 packages/renderer/index.js
 packages/renderer/noteStyle.js
-packages/renderer/pathUtils.js
+packages/renderer/types.js
 packages/renderer/utils.js
 packages/tools/build-release-stats.test.js
 packages/tools/build-release-stats.js

.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch

@@ -0,0 +1,62 @@
+diff --git a/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
+index a5bb95eec3337b93a2338a2869a2bda176c91cae..87817688eb280c2f702c26dc35558c6a0a4db1ea 100644
+--- a/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
++++ b/android/src/newarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
+@@ -42,12 +42,20 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider> implement
+             public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
+               ReactSlider slider = (ReactSlider)seekbar;
+ 
+-              if(progress < slider.getLowerLimit()) {
+-                progress = slider.getLowerLimit();
+-                seekbar.setProgress(progress);
+-              } else if (progress > slider.getUpperLimit()) {
+-                progress = slider.getUpperLimit();
+-                seekbar.setProgress(progress);
++              // During initialization, lowerLimit can be greater than upperLimit.
++              //
++              // If a change event is received during this, we need a check to prevent
++              // infinite recursion.
++              //
++              // Issue: https://github.com/callstack/react-native-slider/issues/571
++              if (slider.getLowerLimit() <= slider.getUpperLimit()) {
++                if(progress < slider.getLowerLimit()) {
++                  progress = slider.getLowerLimit();
++                  seekbar.setProgress(progress);
++                } else if (progress > slider.getUpperLimit()) {
++                  progress = slider.getUpperLimit();
++                  seekbar.setProgress(progress);
++                }
+               }
+ 
+               ReactContext reactContext = (ReactContext) seekbar.getContext();
+diff --git a/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java b/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
+index 3ff5930f85a3cd92c2549925f41058abb188a57e..ab3681fdfe0b736c97020e1434e450c8183e6f18 100644
+--- a/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
++++ b/android/src/oldarch/java/com/reactnativecommunity/slider/ReactSliderManager.java
+@@ -30,12 +30,20 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider> {
+             public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
+               ReactSlider slider = (ReactSlider)seekbar;
+ 
+-              if(progress < slider.getLowerLimit()) {
+-                progress = slider.getLowerLimit();
+-                seekbar.setProgress(progress);
+-              } else if(progress > slider.getUpperLimit()) {
+-                progress = slider.getUpperLimit();
+-                seekbar.setProgress(progress);
++              // During initialization, lowerLimit can be greater than upperLimit.
++              //
++              // If a change event is received during this, we need a check to prevent
++              // infinite recursion.
++              //
++              // Issue: https://github.com/callstack/react-native-slider/issues/571
++              if (slider.getLowerLimit() <= slider.getUpperLimit()) {
++                if(progress < slider.getLowerLimit()) {
++                  progress = slider.getLowerLimit();
++                  seekbar.setProgress(progress);
++                } else if (progress > slider.getUpperLimit()) {
++                  progress = slider.getUpperLimit();
++                  seekbar.setProgress(progress);
++                }
+               }
+ 
+               ReactContext reactContext = (ReactContext) seekbar.getContext();

Assets/WebsiteAssets/rss.xml

@@ -1,4 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Sat, 23 Dec 2023 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Sat, 23 Dec 2023 00:00:00 GMT</pubDate><item><title><![CDATA[Faster synchronisation in upcoming Joplin version!]]></title><description><![CDATA[<p>The next version of Joplin Cloud (and Joplin Server) will include a change that will make synchronisation, in particular when synchronising a new device for the first time, significantly faster. This is achieved by bundling more data with the calls that retrieve notes and other data, thus reducing the number of unnecessary requests.</p>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Sat, 27 Jan 2024 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Sat, 27 Jan 2024 00:00:00 GMT</pubDate><item><title><![CDATA[Support for new plugin metadata]]></title><description><![CDATA[<p>The plugin manifest now supports new properties to better describe and present your plugins on Joplin Plugins website. Those are the <code>icons</code>, <code>categories</code>, <code>screenshots</code> and <code>promo_tile</code> properties.</p>
+<h2>Icon<a name="icon" href="#icon" class="heading-anchor">🔗</a></h2>
+<p>This is the icon that will be used in various plugin pages, including in your main plugin page. It will be shown on the main result page too. If not provided, a default icon will be displayed instead.</p>
+<h2>Category<a name="category" href="#category" class="heading-anchor">🔗</a></h2>
+<p>You can supply one or more category for your plugin - it will be used to filter the plugins on the website.</p>
+<h2>Screenshots<a name="screenshots" href="#screenshots" class="heading-anchor">🔗</a></h2>
+<p>Again you can provide one or more screenshots to present your plugin on the website.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240127-icon-category-screenshot.png" alt=""></p>
+<p><em>An example of plugin with icon, category and screenshot</em></p>
+<h2>Promo tile<a name="promo-tile" href="#promo-tile" class="heading-anchor">🔗</a></h2>
+<p>The promo tile is an optional image that is used to display your plugin on the main website page. If no promo tile is supplied, the icon will be used instead.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20240127-promo-tile.png" alt=""></p>
+<p><em>An example of promo tile</em></p>
+<h2>More information<a name="more-information" href="#more-information" class="heading-anchor">🔗</a></h2>
+<p>For more information on how to set this plugin metadata, please check the <a href="https://joplinapp.org/help/api/references/plugin_manifest">Plugin Manifest documentation</a></p>
+]]></description><link>https://joplinapp.org/news/20240127-new-plugin-metadata</link><guid isPermaLink="false">20240127-new-plugin-metadata</guid><pubDate>Sat, 27 Jan 2024 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Faster synchronisation in upcoming Joplin version!]]></title><description><![CDATA[<p>The next version of Joplin Cloud (and Joplin Server) will include a change that will make synchronisation, in particular when synchronising a new device for the first time, significantly faster. This is achieved by bundling more data with the calls that retrieve notes and other data, thus reducing the number of unnecessary requests.</p>
 <p>This change will be applied soon to Joplin Cloud (and Server), and the Joplin mobile, desktop and CLI applications will be able to use it from version 2.14.</p>
 <p>In my tests with about 26,000 items, synchronisation was more than twice as fast on Joplin Cloud (22.5 minutes vs 9.5 minutes):</p>
 <h2>Before<a name="before" href="#before" class="heading-anchor">🔗</a></h2>
@@ -84,7 +99,7 @@ sys 0m38.013s</p>
 <p>In this release, we've undertaken numerous enhancements and addressed various bugs in the Rich Text editor. Notably, we've introduced support for plugin toolbar icons. Additionally, we've refined the editor's ability to manage text that's copied from applications like Word, Office, and LibreOffice, thereby enhancing cross-application compatibility. Among the minor yet impactful improvements, we've fine-tuned the handling of newlines and paragraphs—a highly requested feature. Another notable update is the improved automatic switching between light and dark modes.</p>
 <p>Altogether, this release encompasses around 12 significant changes for the Rich Text editor, and rest assured, there's more to come in the future!</p>
 <h3>Share permissions<a name="share-permissions" href="#share-permissions" class="heading-anchor">🔗</a></h3>
-<p>Using Joplin Cloud Pro and Teams, you now have the ability to customize the read and write permissions for the notebooks you share. You have the option to grant other users permission to edit the notes or share them as read-only. This ensures that you can confidently share a notebook without worrying about unintentional modifications by your friends or colleagues.</p>
+<p>Using Joplin Cloud Teams, you now have the ability to customize the read and write permissions for the notebooks you share. You have the option to grant other users permission to edit the notes or share them as read-only. This ensures that you can confidently share a notebook without worrying about unintentional modifications by your friends or colleagues.</p>
 <p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230825-share-permissions.png" alt=""></p>
 <h3>Email to Note<a name="email-to-note" href="#email-to-note" class="heading-anchor">🔗</a></h3>
 <p>Joplin Cloud Pro and Teams also now include the Email to Note feature, allowing you to conveniently store your emails within Joplin Cloud. By simply forwarding your emails to your Joplin Cloud address, you can transform them into notes. The email's subject will serve as the note title, while the body of the email will be the note's content. These notes will be organized within a notebook named &quot;Inbox.&quot;</p>
@@ -349,19 +364,4 @@ sys 0m38.013s</p>
 <p>In the coming month (<strong>March 7 - April 3</strong>), contributors will start getting involved in the forum and start discussing project ideas with the mentors and community. It's also a good time to start looking at Joplin's source code, perhaps work on fixing bugs or implement small features to get familiar with the source code, and to show us your skills.</p>
 <p>One difference with previous years is that anyone, not just students, are allowed to participate.</p>
 <p>Additionally, last year Google only allowed smaller projects, while this year they allow again small and large projects, so we've indicated this in the idea list - the small ones are <strong>175 hours</strong>, and the large ones <strong>350 hours</strong>.</p>
-]]></description><link>https://joplinapp.org/news/20220308-gsoc2022-start</link><guid isPermaLink="false">20220308-gsoc2022-start</guid><pubDate>Tue, 08 Mar 2022 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Joplin 2.7 is available!]]></title><description><![CDATA[<p>This new release is largely focused on bug fixing and optimising various parts of the apps. There's about 26 improvements and 25 bugs and security fixes included - as always many of these apply to both the mobile and desktop app (see the <a href="https://joplinapp.org/help/about/changelog/desktop">desktop changelog</a> and <a href="https://joplinapp.org/help/about/changelog/android/">mobile changelog</a>).</p>
-<p>Many thanks to all the contributors who helped create this release!</p>
-<p>Below are some of the more noticeable changes:</p>
-<h2>Notebook custom icons<a name="notebook-custom-icons" href="#notebook-custom-icons" class="heading-anchor">🔗</a></h2>
-<p>Since version 2.6 it was possible to assign an emoji icon to a notebook, and with this new version it's now possible to assign any custom icon. The icon may be a PNG or JPG file of any size. The app will then import the file and resize it to the correct size. To use a custom icon, follow these steps:</p>
-<p>Right-click on a notebook, and select &quot;Edit&quot;:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20220224-edit-notebook.png" alt=""></p>
-<p>In the &quot;Edit notebook&quot; dialog, click &quot;Select file...&quot; and browse to your icon image:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20220224-edit-dialog.png" alt=""></p>
-<p>Click &quot;OK&quot; and the icon will now appear next to the notebook:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20220224-notebook-icon.png" alt=""></p>
-<p>The icon can be changed only from the desktop application at the moment, but it will sync and be displayed correctly on the mobile app too.</p>
-<h2>Plugin API improvements<a name="plugin-api-improvements" href="#plugin-api-improvements" class="heading-anchor">🔗</a></h2>
-<p>This version also includes a number of improvements to the plugin API, in particular it is now easier to customise the editor context menu from a plugin and dynamically add items to it depending on the context. For example, with the Rich Markdown plugin it will be possible to right-click on an image and open it, or copy it to the clipboard.</p>
-<p>A few additional functions have also been added to make plugin development simpler - in particular a command to open any item, whether it's a notebook, note, tag or attachement; and functions to work with attachements, in particular to reveal an attachement in the system file explorer, and to track changes to an attachement.</p>
-]]></description><link>https://joplinapp.org/news/20220224-release-2-7</link><guid isPermaLink="false">20220224-release-2-7</guid><pubDate>Thu, 24 Feb 2022 00:00:00 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20220308-gsoc2022-start</link><guid isPermaLink="false">20220308-gsoc2022-start</guid><pubDate>Tue, 08 Mar 2022 00:00:00 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>

Joplin_install_and_update.sh

@@ -5,62 +5,64 @@ set -e
 trap 'handleError' ERR
 
 handleError() {
-    echo ""
-    echo "If you encountered an error, please consider fixing"
-    echo "the script for your environment and creating a pull"
-    echo "request instead of asking for support on GitHub or"
-    echo "the forum. The error message above should tell you"
-    echo "where and why the error happened."
+  echo ""
+  echo "If you encountered an error, please consider fixing"
+  echo "the script for your environment and creating a pull"
+  echo "request instead of asking for support on GitHub or"
+  echo "the forum. The error message above should tell you"
+  echo "where and why the error happened."
 }
 
 #-----------------------------------------------------
 # Variables
 #-----------------------------------------------------
-COLOR_RED=`tput setaf 1`
-COLOR_GREEN=`tput setaf 2`
-COLOR_YELLOW=`tput setaf 3`
-COLOR_BLUE=`tput setaf 4`
-COLOR_RESET=`tput sgr0`
+# Only set colors, if tput available and TERM is recognized
+if [[ `command -v tput` && `tput setaf 1 2>/dev/null` ]]; then
+  COLOR_RED=`tput setaf 1`
+  COLOR_GREEN=`tput setaf 2`
+  COLOR_YELLOW=`tput setaf 3`
+  COLOR_BLUE=`tput setaf 4`
+  COLOR_RESET=`tput sgr0`
+fi
 SILENT=false
 ALLOW_ROOT=false
 SHOW_CHANGELOG=false
 INCLUDE_PRE_RELEASE=false
 
 print() {
-    if [[ "${SILENT}" == false ]] ; then
-        echo -e "$@"
-    fi
+  if [[ "${SILENT}" == false ]]; then
+    echo -e "$@"
+  fi
 }
 
 showLogo() {
-    print "${COLOR_BLUE}"
-    print "     _             _ _       "
-    print "    | | ___  _ __ | (_)_ __  "
-    print " _  | |/ _ \| '_ \| | | '_ \ "
-    print "| |_| | (_) | |_) | | | | | |"
-    print " \___/ \___/| .__/|_|_|_| |_|"
-    print "            |_|"
-    print ""
-    print "Linux Installer and Updater"
-    print "${COLOR_RESET}"
+  print "${COLOR_BLUE}"
+  print "     _             _ _       "
+  print "    | | ___  _ __ | (_)_ __  "
+  print " _  | |/ _ \| '_ \| | | '_ \ "
+  print "| |_| | (_) | |_) | | | | | |"
+  print " \___/ \___/| .__/|_|_|_| |_|"
+  print "            |_|"
+  print ""
+  print "Linux Installer and Updater"
+  print "${COLOR_RESET}"
 }
 
 showHelp() {
-    showLogo
-    print "Available Arguments:"
-    print "\t" "--help" "\t" "Show this help information" "\n"
-    print "\t" "--allow-root" "\t" "Allow the install to be run as root"
-    print "\t" "--changelog" "\t" "Show the changelog after installation"
-    print "\t" "--force" "\t" "Always download the latest version"
-    print "\t" "--silent" "\t" "Don't print any output"
-    print "\t" "--prerelease" "\t" "Check for new Versions including Pre-Releases" 
-
-    if [[ ! -z $1 ]]; then
-        print "\n" "${COLOR_RED}ERROR: " "$*" "${COLOR_RESET}" "\n"
-    else
-        exit 0
-    fi
+  showLogo
+  print "Available Arguments:"
+  print "\t" "--help" "\t" "Show this help information" "\n"
+  print "\t" "--allow-root" "\t" "Allow the install to be run as root"
+  print "\t" "--changelog" "\t" "Show the changelog after installation"
+  print "\t" "--force" "\t" "Always download the latest version"
+  print "\t" "--silent" "\t" "Don't print any output"
+  print "\t" "--prerelease" "\t" "Check for new Versions including Pre-Releases"
 
+  if [[ ! -z $1 ]]; then
+    print "\n" "${COLOR_RED}ERROR: " "$*" "${COLOR_RESET}" "\n"
+  else
+    exit 0
+  fi
 }
 
 #-----------------------------------------------------
@@ -71,9 +73,9 @@ optspec=":h-:"
 while getopts "${optspec}" OPT; do
   [ "${OPT}" = " " ] && continue
   if [ "${OPT}" = "-" ]; then   # long option: reformulate OPT and OPTARG
-    OPT="${OPTARG%%=*}"       # extract long option name
-    OPTARG="${OPTARG#$OPT}"   # extract long option argument (may be empty)
-    OPTARG="${OPTARG#=}"      # if long option argument, remove assigning `=`
+    OPT="${OPTARG%%=*}"         # extract long option name
+    OPTARG="${OPTARG#$OPT}"     # extract long option argument (may be empty)
+    OPTARG="${OPTARG#=}"        # if long option argument, remove assigning `=`
   fi
   case "${OPT}" in
     h | help )     showHelp ;;
@@ -90,8 +92,8 @@ shift $((OPTIND-1)) # remove parsed options and args from $@ list
 
 ## Check and warn if running as root.
 if [[ $EUID = 0 ]] && [[ "${ALLOW_ROOT}" != true ]]; then
-    showHelp "It is not recommended (nor necessary) to run this script as root. To do so anyway, please use '--allow-root'"
-    exit 1
+  showHelp "It is not recommended (nor necessary) to run this script as root. To do so anyway, please use '--allow-root'"
+  exit 1
 fi
 
 #-----------------------------------------------------
@@ -104,12 +106,12 @@ print "Checking architecture..."
 ## uname actually gives more information than needed, but it contains all architectures (hardware and software)
 ARCHITECTURE=$(uname -m -p -i || echo "NO CHECK")
 
-if [[ $ARCHITECTURE = "NO CHECK" ]] ; then
+if [[ $ARCHITECTURE = "NO CHECK" ]]; then
   print "${COLOR_YELLOW}WARNING: Can't get system architecture, skipping check${COLOR_RESET}"
-elif [[ $ARCHITECTURE =~ .*aarch.*|.*arm.* ]] ; then
+elif [[ $ARCHITECTURE =~ .*aarch.*|.*arm.* ]]; then
   showHelp "Arm systems are not officially supported by Joplin, please search the forum (https://discourse.joplinapp.org/) for more information"
   exit 1
-elif [[ $ARCHITECTURE =~ .*i386.*|.*i686.* ]] ; then
+elif [[ $ARCHITECTURE =~ .*i386.*|.*i686.* ]]; then
   showHelp "32-bit systems are not supported by Joplin, please search the forum (https://discourse.joplinapp.org/) for more information"
   exit 1
 fi
@@ -122,7 +124,7 @@ if [[ $(command -v ldconfig) ]]; then
 else
 	LIBFUSE=$(find /lib /usr/lib /lib64 /usr/lib64 /usr/local/lib -name "libfuse.so.2" 2>/dev/null | grep "libfuse.so.2" || echo '')
 fi
-if [[ $LIBFUSE == "" ]] ; then
+if [[ $LIBFUSE == "" ]]; then
   print "${COLOR_RED}Error: Can't get libfuse2 on system, please install libfuse2${COLOR_RESET}"
   print "See https://joplinapp.org/help/faq/#desktop-application-will-not-launch-on-linux and https://github.com/AppImage/AppImageKit/wiki/FUSE for more information"
   exit 1
@@ -141,17 +143,17 @@ fi
 
 # Check if it's in the latest version
 if [[ -e ~/.joplin/VERSION ]] && [[ $(< ~/.joplin/VERSION) == "${RELEASE_VERSION}" ]]; then
-    print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
-    ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
+  print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
+  ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
 else
-    [[ -e ~/.joplin/VERSION ]] && CURRENT_VERSION=$(< ~/.joplin/VERSION)
-    print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION:-no version} installed."
+  [[ -e ~/.joplin/VERSION ]] && CURRENT_VERSION=$(< ~/.joplin/VERSION)
+  print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION:-no version} installed."
 fi
 
 # Check if it's an update or a new install
 DOWNLOAD_TYPE="New"
 if [[ -f ~/.joplin/Joplin.AppImage ]]; then
-    DOWNLOAD_TYPE="Update"
+  DOWNLOAD_TYPE="Update"
 fi
 
 #-----------------------------------------------------
@@ -183,8 +185,7 @@ mv "${TEMP_DIR}/joplin.png" ~/.local/share/icons/hicolor/512x512/apps/joplin.png
 print "${COLOR_GREEN}OK${COLOR_RESET}"
 
 # Detect desktop environment
-if [ "$XDG_CURRENT_DESKTOP" = "" ]
-then
+if [ "$XDG_CURRENT_DESKTOP" = "" ]; then
   DESKTOP=$(echo "${XDG_DATA_DIRS}" | sed 's/.*\(xfce\|kde\|gnome\).*/\1/')
 else
   DESKTOP=$XDG_CURRENT_DESKTOP
@@ -210,8 +211,7 @@ if command -v lsb_release &> /dev/null; then
   # uses these to sandbox processes. Unfortunately, it doesn't look like we can get around this
   # without writing the AppImage to a non-user-writable location (without invalidating other security
   # controls). See https://discourse.joplinapp.org/t/possible-future-requirement-for-no-sandbox-flag-for-ubuntu-23-10/.
-  if [[ $DISTVER = "Ubuntu23.10" || $DISTVER =~ Debian1. || ( "$DISTVER" = "Linuxmint4" && "$DISTCODENAME" = "debbie" ) || ( "$DISTVER" = "CentOS" && "$DISTMAJOR" =~ 6|7 ) ]]
-  then
+  if [[ $DISTVER = "Ubuntu23.10" || $DISTVER =~ Debian1. || ( "$DISTVER" = "Linuxmint4" && "$DISTCODENAME" = "debbie" ) || ( "$DISTVER" = "CentOS" && "$DISTMAJOR" =~ 6|7 ) ]]; then
     SANDBOXPARAM="--no-sandbox"
     print "${COLOR_YELLOW}WARNING${COLOR_RESET} Electron sandboxing disabled."
     print "    See https://discourse.joplinapp.org/t/32160/5 for details."
@@ -222,41 +222,40 @@ fi
 # `.local/share/desktop` had a desktop file created.
 # However some environments don't return a desktop BUT still support these desktop files
 # the command check was added to support all Desktops that have support for the
-# freedesktop standard 
+# freedesktop standard
 # The old checks are left in place for historical reasons, but
 # NO MORE DESKTOP ENVIRONMENTS SHOULD BE ADDED
 # If a new environment needs to be supported, then the command check section should be re-thought
-if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]] || [[ `command -v update-desktop-database` ]]
-then
-    DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
-    DESKTOP_FILE_LOCATION="$DATA_HOME/applications"
-    # Only delete the desktop file if it will be replaced
-    rm -f "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop"
+if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]] || [[ `command -v update-desktop-database` ]]; then
+  DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
+  DESKTOP_FILE_LOCATION="$DATA_HOME/applications"
+  # Only delete the desktop file if it will be replaced
+  rm -f "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop"
 
-    # On some systems this directory doesn't exist by default
-    mkdir -p "$DESKTOP_FILE_LOCATION"
-    
-    # Tabs specifically, and not spaces, are needed for indentation with Bash heredocs
-    cat >> "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop" <<-EOF
-	[Desktop Entry]
-	Encoding=UTF-8
-	Name=Joplin
-	Comment=Joplin for Desktop
-	Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM} %u
-	Icon=joplin
-	StartupWMClass=Joplin
-	Type=Application
-	Categories=Office;
-	MimeType=x-scheme-handler/joplin;
-	X-GNOME-SingleWindow=true // should be removed eventually as it was upstream to be an XDG specification
-	SingleMainWindow=true
-	EOF
-    
-    # Update application icons
-    [[ `command -v update-desktop-database` ]] && update-desktop-database "$DESKTOP_FILE_LOCATION" && update-desktop-database "$DATA_HOME/icons"
-    print "${COLOR_GREEN}OK${COLOR_RESET}"
+  # On some systems this directory doesn't exist by default
+  mkdir -p "$DESKTOP_FILE_LOCATION"
+
+  # No spaces or tabs should be used for indentation with Bash heredocs
+  cat >> "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop" <<-EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Joplin
+Comment=Joplin for Desktop
+Exec=${HOME}/.joplin/Joplin.AppImage ${SANDBOXPARAM} %u
+Icon=joplin
+StartupWMClass=Joplin
+Type=Application
+Categories=Office;
+MimeType=x-scheme-handler/joplin;
+X-GNOME-SingleWindow=true // should be removed eventually as it was upstream to be an XDG specification
+SingleMainWindow=true
+EOF
+
+  # Update application icons
+  [[ `command -v update-desktop-database` ]] && update-desktop-database "$DESKTOP_FILE_LOCATION" && update-desktop-database "$DATA_HOME/icons"
+  print "${COLOR_GREEN}OK${COLOR_RESET}"
 else
-    print "${COLOR_RED}NOT DONE, unknown desktop '${DESKTOP}'${COLOR_RESET}"
+  print "${COLOR_RED}NOT DONE, unknown desktop '${DESKTOP}'${COLOR_RESET}"
 fi
 
 #-----------------------------------------------------
@@ -271,8 +270,8 @@ echo "$RELEASE_VERSION" > ~/.joplin/VERSION
 
 #-----------------------------------------------------
 if [[ "$SHOW_CHANGELOG" == true ]]; then
-    NOTES=$(wget -qO - https://api.github.com/repos/laurent22/joplin/releases/latest | grep -Po '"body": "\K.*(?=")')
-    print "${COLOR_BLUE}Changelog:${COLOR_RESET}\n${NOTES}"
+  NOTES=$(wget -qO - https://api.github.com/repos/laurent22/joplin/releases/latest | grep -Po '"body": "\K.*(?=")')
+  print "${COLOR_BLUE}Changelog:${COLOR_RESET}\n${NOTES}"
 fi
 
 #-----------------------------------------------------

README.md

@@ -31,7 +31,7 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://residence-greece.com/"><img title="Greece Golden Visa" width="256" src="https://joplinapp.org/images/sponsors/ResidenceGreece.jpg"/></a> <a href="https://grundstueckspreise.info/"><img title="SP Software GmbH" width="256" src="https://joplinapp.org/images/sponsors/Grundstueckspreise.png"/></a> <a href="https://tranio.com/spain/"><img title="Property for sale in Spain" width="256" src="https://joplinapp.org/images/sponsors/TranioOverseasProperty.jpg"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp "><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://grundstueckspreise.info/"><img title="SP Software GmbH" width="256" src="https://joplinapp.org/images/sponsors/Grundstueckspreise.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *

docker-compose.db-dev.yml

@@ -1,5 +1,5 @@
 # For development this compose file starts the database only. The app can then
-# be started using `yarn run start-dev`, which is useful for development, because
+# be started using `yarn start-dev`, which is useful for development, because
 # it means the app Docker file doesn't have to be rebuilt on each change.
 
 version: '3'

lint-staged.config.js

@@ -11,9 +11,9 @@ module.exports = {
 	//
 	// '**/*.ts?(x)': () => 'npm run tsc',
 	'*.{js,jsx,ts,tsx}': [
-		'yarn run checkIgnoredFiles',
-		// 'yarn run checkLibPaths',
-		'yarn run packageJsonLint',
-		'yarn run linter-precommit',
+		'yarn checkIgnoredFiles',
+		// 'yarn checkLibPaths',
+		'yarn packageJsonLint',
+		'yarn linter-precommit',
 	],
 };

package.json

@@ -13,14 +13,14 @@
   },
   "scripts": {
     "buildApiDoc": "yarn workspace joplin start apidoc ../../readme/api/references/rest_api.md",
-    "buildCommandIndex": "node packages/tools/gulp/tasks/buildCommandIndexRun.js",
-    "buildParallel": "yarn workspaces foreach --verbose --interlaced --parallel --jobs 2 --topological run build && yarn run tsc",
-    "buildPluginDoc": "cd packages/generate-plugin-doc && yarn run buildPluginDoc_",
-    "buildSequential": "yarn workspaces foreach --verbose --interlaced --topological run build && yarn run tsc",
+    "buildScriptIndexes": "node packages/tools/gulp/tasks/buildScriptIndexesRun.js",
+    "buildParallel": "yarn workspaces foreach --verbose --interlaced --parallel --jobs 2 --topological run build && yarn tsc",
+    "buildPluginDoc": "cd packages/generate-plugin-doc && yarn buildPluginDoc_",
+    "buildSequential": "yarn workspaces foreach --verbose --interlaced --topological run build && yarn tsc",
     "buildServerDocker": "node packages/tools/buildServerDocker.js",
     "buildSettingJsonSchema": "yarn workspace joplin start settingschema ../../../joplin-website/docs/schema/settings.json",
     "buildTranslations": "node packages/tools/build-translation.js",
-    "buildWebsite": "node ./packages/tools/website/processDocs.js --env prod && node ./packages/tools/website/build.js && yarn run buildPluginDoc && yarn run buildSettingJsonSchema",
+    "buildWebsite": "node ./packages/tools/website/processDocs.js --env prod && node ./packages/tools/website/build.js && yarn buildPluginDoc && yarn buildSettingJsonSchema",
     "buildWebsiteTranslations": "node packages/tools/website/buildTranslations.js",
     "checkIgnoredFiles": "node ./packages/tools/checkIgnoredFiles.js",
     "checkLibPaths": "node ./packages/tools/checkLibPaths.js",
@@ -40,7 +40,7 @@
     "packageJsonLint": "node ./packages/tools/packageJsonLint.js",
     "postinstall": "gulp build",
     "postPreReleasesToForum": "node ./packages/tools/postPreReleasesToForum",
-    "publishAll": "git pull && yarn run buildParallel && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll",
+    "publishAll": "git pull && yarn buildParallel && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll",
     "releaseAndroid": "PATH=\"/usr/local/opt/openjdk@11/bin:$PATH\" node packages/tools/release-android.js",
     "releaseAndroidClean": "node packages/tools/release-android.js",
     "releaseCli": "node packages/tools/release-cli.js",
@@ -82,12 +82,12 @@
     "eslint-plugin-promise": "6.1.1",
     "eslint-plugin-react": "7.33.2",
     "execa": "5.1.1",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "glob": "10.3.10",
     "gulp": "4.0.2",
     "husky": "3.1.0",
     "lerna": "3.22.1",
-    "lint-staged": "14.0.1",
+    "lint-staged": "15.2.0",
     "madge": "6.1.0",
     "npm-package-json-lint": "7.1.0",
     "typescript": "5.2.2"
@@ -97,7 +97,7 @@
     "eslint-plugin-github": "4.10.1",
     "http-server": "14.1.1",
     "node-gyp": "9.4.1",
-    "nodemon": "3.0.2"
+    "nodemon": "3.0.3"
   },
   "packageManager": "yarn@3.6.4",
   "resolutions": {
@@ -107,6 +107,7 @@
     "app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
     "react-native@0.71.10": "patch:react-native@npm%3A0.71.10#./.yarn/patches/react-native-animation-fix/react-native-npm-0.71.10-f9c32562d8.patch",
     "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
-    "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch"
+    "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
+    "@react-native-community/slider": "patch:@react-native-community/slider@npm%3A4.4.4#./.yarn/patches/@react-native-community-slider-npm-4.4.4-d78e472f48.patch"
   }
 }

packages/app-cli/app/app.js

@@ -1,469 +1,461 @@
-const BaseApplication = require('@joplin/lib/BaseApplication').default;
-const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
-const ResourceService = require('@joplin/lib/services/ResourceService').default;
-const BaseModel = require('@joplin/lib/BaseModel').default;
-const Folder = require('@joplin/lib/models/Folder').default;
-const BaseItem = require('@joplin/lib/models/BaseItem').default;
-const Note = require('@joplin/lib/models/Note').default;
-const Tag = require('@joplin/lib/models/Tag').default;
-const Setting = require('@joplin/lib/models/Setting').default;
-const { reg } = require('@joplin/lib/registry.js');
-const { fileExtension } = require('@joplin/lib/path-utils');
-const { splitCommandString } = require('@joplin/utils');
-const { splitCommandBatch } = require('@joplin/lib/string-utils');
-const { _ } = require('@joplin/lib/locale');
-const fs = require('fs-extra');
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseApplication_1 = require("@joplin/lib/BaseApplication");
+const folders_screen_utils_js_1 = require("@joplin/lib/folders-screen-utils.js");
+const ResourceService_1 = require("@joplin/lib/services/ResourceService");
+const BaseModel_1 = require("@joplin/lib/BaseModel");
+const Folder_1 = require("@joplin/lib/models/Folder");
+const BaseItem_1 = require("@joplin/lib/models/BaseItem");
+const Note_1 = require("@joplin/lib/models/Note");
+const Tag_1 = require("@joplin/lib/models/Tag");
+const Setting_1 = require("@joplin/lib/models/Setting");
+const registry_js_1 = require("@joplin/lib/registry.js");
+const path_utils_1 = require("@joplin/lib/path-utils");
+const utils_1 = require("@joplin/utils");
+const locale_1 = require("@joplin/lib/locale");
+const fs_extra_1 = require("fs-extra");
+const RevisionService_1 = require("@joplin/lib/services/RevisionService");
+const shim_1 = require("@joplin/lib/shim");
+const setupCommand_1 = require("./setupCommand");
 const { cliUtils } = require('./cli-utils.js');
 const Cache = require('@joplin/lib/Cache');
-const RevisionService = require('@joplin/lib/services/RevisionService').default;
-const shim = require('@joplin/lib/shim').default;
-const setupCommand = require('./setupCommand').default;
-
-class Application extends BaseApplication {
-	constructor() {
-		super();
-
-		this.showPromptString_ = true;
-		this.commands_ = {};
-		this.commandMetadata_ = null;
-		this.activeCommand_ = null;
-		this.allCommandsLoaded_ = false;
-		this.showStackTraces_ = false;
-		this.gui_ = null;
-		this.cache_ = new Cache();
-	}
-
-	gui() {
-		return this.gui_;
-	}
-
-	commandStdoutMaxWidth() {
-		return this.gui().stdoutMaxWidth();
-	}
-
-	async guessTypeAndLoadItem(pattern, options = null) {
-		let type = BaseModel.TYPE_NOTE;
-		if (pattern.indexOf('/') === 0) {
-			type = BaseModel.TYPE_FOLDER;
-			pattern = pattern.substr(1);
-		}
-		return this.loadItem(type, pattern, options);
-	}
-
-	async loadItem(type, pattern, options = null) {
-		const output = await this.loadItems(type, pattern, options);
-
-		if (output.length > 1) {
-			// output.sort((a, b) => { return a.user_updated_time < b.user_updated_time ? +1 : -1; });
-
-			// let answers = { 0: _('[Cancel]') };
-			// for (let i = 0; i < output.length; i++) {
-			// 	answers[i + 1] = output[i].title;
-			// }
-
-			// Not really useful with new UI?
-			throw new Error(_('More than one item match "%s". Please narrow down your query.', pattern));
-
-			// let msg = _('More than one item match "%s". Please select one:', pattern);
-			// const response = await cliUtils.promptMcq(msg, answers);
-			// if (!response) return null;
-
-			// return output[response - 1];
-		} else {
-			return output.length ? output[0] : null;
-		}
-	}
-
-	async loadItems(type, pattern, options = null) {
-		if (type === 'folderOrNote') {
-			const folders = await this.loadItems(BaseModel.TYPE_FOLDER, pattern, options);
-			if (folders.length) return folders;
-			return await this.loadItems(BaseModel.TYPE_NOTE, pattern, options);
-		}
-
-		pattern = pattern ? pattern.toString() : '';
-
-		if (type === BaseModel.TYPE_FOLDER && (pattern === Folder.conflictFolderTitle() || pattern === Folder.conflictFolderId())) return [Folder.conflictFolder()];
-
-		if (!options) options = {};
-
-		const parent = options.parent ? options.parent : app().currentFolder();
-		const ItemClass = BaseItem.itemClass(type);
-
-		if (type === BaseModel.TYPE_NOTE && pattern.indexOf('*') >= 0) {
-			// Handle it as pattern
-			if (!parent) throw new Error(_('No notebook selected.'));
-			return await Note.previews(parent.id, { titlePattern: pattern });
-		} else {
-			// Single item
-			let item = null;
-			if (type === BaseModel.TYPE_NOTE) {
-				if (!parent) throw new Error(_('No notebook has been specified.'));
-				item = await ItemClass.loadFolderNoteByField(parent.id, 'title', pattern);
-			} else {
-				item = await ItemClass.loadByTitle(pattern);
-			}
-			if (item) return [item];
-
-			item = await ItemClass.load(pattern); // Load by id
-			if (item) return [item];
-
-			if (pattern.length >= 2) {
-				return await ItemClass.loadByPartialId(pattern);
-			}
-		}
-
-		return [];
-	}
-
-	setupCommand(cmd) {
-		return setupCommand(cmd, t => this.stdout(t), () => this.store(), () => this.gui());
-	}
-
-	stdout(text) {
-		return this.gui().stdout(text);
-	}
-
-	async exit(code = 0) {
-		const doExit = async () => {
-			this.gui().exit();
-			await super.exit(code);
-		};
-
-		// Give it a few seconds to cancel otherwise exit anyway
-		shim.setTimeout(async () => {
-			await doExit();
-		}, 5000);
-
-		if (await reg.syncTarget().syncStarted()) {
-			this.stdout(_('Cancelling background synchronisation... Please wait.'));
-			const sync = await reg.syncTarget().synchronizer();
-			await sync.cancel();
-		}
-
-		await doExit();
-	}
-
-	commands(uiType = null) {
-		if (!this.allCommandsLoaded_) {
-			// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
-			fs.readdirSync(__dirname).forEach(path => {
-				if (path.indexOf('command-') !== 0) return;
-				if (path.endsWith('.test.js')) return;
-				const ext = fileExtension(path);
-				if (ext !== 'js') return;
-
-				const CommandClass = require(`./${path}`);
-				let cmd = new CommandClass();
-				if (!cmd.enabled()) return;
-				cmd = this.setupCommand(cmd);
-				this.commands_[cmd.name()] = cmd;
-			});
-
-			this.allCommandsLoaded_ = true;
-		}
-
-		if (uiType !== null) {
-			const temp = [];
-			for (const n in this.commands_) {
-				if (!this.commands_.hasOwnProperty(n)) continue;
-				const c = this.commands_[n];
-				if (!c.supportsUi(uiType)) continue;
-				temp[n] = c;
-			}
-			return temp;
-		}
-
-		return this.commands_;
-	}
-
-	async commandNames() {
-		const metadata = await this.commandMetadata();
-		const output = [];
-		for (const n in metadata) {
-			if (!metadata.hasOwnProperty(n)) continue;
-			output.push(n);
-		}
-		return output;
-	}
-
-	async commandMetadata() {
-		if (this.commandMetadata_) return this.commandMetadata_;
-
-		let output = await this.cache_.getItem('metadata');
-		if (output) {
-			this.commandMetadata_ = output;
-			return { ...this.commandMetadata_ };
-		}
-
-		const commands = this.commands();
-
-		output = {};
-		for (const n in commands) {
-			if (!commands.hasOwnProperty(n)) continue;
-			const cmd = commands[n];
-			output[n] = cmd.metadata();
-		}
-
-		await this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
-
-		this.commandMetadata_ = output;
-		return { ...this.commandMetadata_ };
-	}
-
-	hasGui() {
-		return this.gui() && !this.gui().isDummy();
-	}
-
-	findCommandByName(name) {
-		if (this.commands_[name]) return this.commands_[name];
-
-		let CommandClass = null;
-		try {
-			CommandClass = require(`${__dirname}/command-${name}.js`);
-		} catch (error) {
-			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
-				const e = new Error(_('No such command: %s', name));
-				e.type = 'notFound';
-				throw e;
-			} else {
-				throw error;
-			}
-		}
-
-		let cmd = new CommandClass();
-		cmd = this.setupCommand(cmd);
-		this.commands_[name] = cmd;
-		return this.commands_[name];
-	}
-
-	dummyGui() {
-		return {
-			isDummy: () => {
-				return true;
-			},
-			prompt: (initialText = '', promptString = '', options = null) => {
-				return cliUtils.prompt(initialText, promptString, options);
-			},
-			showConsole: () => {},
-			maximizeConsole: () => {},
-			stdout: text => {
-				// eslint-disable-next-line no-console
-				console.info(text);
-			},
-			fullScreen: () => {},
-			exit: () => {},
-			showModalOverlay: () => {},
-			hideModalOverlay: () => {},
-			stdoutMaxWidth: () => {
-				return 100;
-			},
-			forceRender: () => {},
-			termSaveState: () => {},
-			termRestoreState: () => {},
-		};
-	}
-
-	async execCommand(argv) {
-		if (!argv.length) return this.execCommand(['help']);
-		// reg.logger().debug('execCommand()', argv);
-		const commandName = argv[0];
-		this.activeCommand_ = this.findCommandByName(commandName);
-
-		let outException = null;
-		try {
-			if (this.gui().isDummy() && !this.activeCommand_.supportsUi('cli')) throw new Error(_('The command "%s" is only available in GUI mode', this.activeCommand_.name()));
-			const cmdArgs = cliUtils.makeCommandArgs(this.activeCommand_, argv);
-			await this.activeCommand_.action(cmdArgs);
-		} catch (error) {
-			outException = error;
-		}
-		this.activeCommand_ = null;
-		if (outException) throw outException;
-	}
-
-	currentCommand() {
-		return this.activeCommand_;
-	}
-
-	async loadKeymaps() {
-		const defaultKeyMap = [
-			{ keys: [':'], type: 'function', command: 'enter_command_line_mode' },
-			{ keys: ['TAB'], type: 'function', command: 'focus_next' },
-			{ keys: ['SHIFT_TAB'], type: 'function', command: 'focus_previous' },
-			{ keys: ['UP'], type: 'function', command: 'move_up' },
-			{ keys: ['DOWN'], type: 'function', command: 'move_down' },
-			{ keys: ['PAGE_UP'], type: 'function', command: 'page_up' },
-			{ keys: ['PAGE_DOWN'], type: 'function', command: 'page_down' },
-			{ keys: ['ENTER'], type: 'function', command: 'activate' },
-			{ keys: ['DELETE', 'BACKSPACE'], type: 'function', command: 'delete' },
-			{ keys: ['n'], type: 'function', command: 'next_link' },
-			{ keys: ['b'], type: 'function', command: 'previous_link' },
-			{ keys: ['o'], type: 'function', command: 'open_link' },
-			{ keys: [' '], command: 'todo toggle $n' },
-			{ keys: ['tc'], type: 'function', command: 'toggle_console' },
-			{ keys: ['tm'], type: 'function', command: 'toggle_metadata' },
-			{ keys: ['ti'], type: 'function', command: 'toggle_ids' },
-			{ keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
-			{ keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
-			{ keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
-			{ keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
-			{ keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
-			{ keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
-		];
-
-		// Filter the keymap item by command so that items in keymap.json can override
-		// the default ones.
-		const itemsByCommand = {};
-
-		for (let i = 0; i < defaultKeyMap.length; i++) {
-			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i];
-		}
-
-		const filePath = `${Setting.value('profileDir')}/keymap.json`;
-		if (await fs.pathExists(filePath)) {
-			try {
-				let configString = await fs.readFile(filePath, 'utf-8');
-				configString = configString.replace(/^\s*\/\/.*/, ''); // Strip off comments
-				const keymap = JSON.parse(configString);
-				for (let keymapIndex = 0; keymapIndex < keymap.length; keymapIndex++) {
-					const item = keymap[keymapIndex];
-					itemsByCommand[item.command] = item;
-				}
-			} catch (error) {
-				let msg = error.message ? error.message : '';
-				msg = `Could not load keymap ${filePath}\n${msg}`;
-				error.message = msg;
-				throw error;
-			}
-		}
-
-		const output = [];
-		for (const n in itemsByCommand) {
-			if (!itemsByCommand.hasOwnProperty(n)) continue;
-			output.push(itemsByCommand[n]);
-		}
-
-		// Map reserved shortcuts to their equivalent key
-		// https://github.com/cronvel/terminal-kit/issues/101
-		for (let i = 0; i < output.length; i++) {
-			const newKeys = output[i].keys.map(k => {
-				k = k.replace(/CTRL_H/g, 'BACKSPACE');
-				k = k.replace(/CTRL_I/g, 'TAB');
-				k = k.replace(/CTRL_M/g, 'ENTER');
-				return k;
-			});
-			output[i].keys = newKeys;
-		}
-
-		return output;
-	}
-
-	async commandList(argv) {
-		if (argv.length && argv[0] === 'batch') {
-			const commands = [];
-			const commandLines = splitCommandBatch(await fs.readFile(argv[1], 'utf-8'));
-
-			for (const commandLine of commandLines) {
-				if (!commandLine.trim()) continue;
-				const splitted = splitCommandString(commandLine.trim());
-				commands.push(splitted);
-			}
-			return commands;
-		} else {
-			return [argv];
-		}
-	}
-
-	// We need this special case here because by the time the `version` command
-	// runs, the keychain has already been setup.
-	checkIfKeychainEnabled(argv) {
-		return argv.indexOf('version') < 0;
-	}
-
-	async start(argv) {
-		const keychainEnabled = this.checkIfKeychainEnabled(argv);
-
-		argv = await super.start(argv, { keychainEnabled });
-
-		cliUtils.setStdout(object => {
-			return this.stdout(object);
-		});
-
-		this.initRedux();
-
-		// If we have some arguments left at this point, it's a command
-		// so execute it.
-		if (argv.length) {
-			this.gui_ = this.dummyGui();
-
-			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
-
-			await this.applySettingsSideEffects();
-
-			try {
-				const commands = await this.commandList(argv);
-				for (const command of commands) {
-					await this.execCommand(command);
-				}
-			} catch (error) {
-				if (this.showStackTraces_) {
-					console.error(error);
-				} else {
-					// eslint-disable-next-line no-console
-					console.info(error.message);
-				}
-				process.exit(1);
-			}
-
-			await Setting.saveAll();
-
-			// Need to call exit() explicitly, otherwise Node wait for any timeout to complete
-			// https://stackoverflow.com/questions/18050095
-			process.exit(0);
-		} else {
-			// Otherwise open the GUI
-			const keymap = await this.loadKeymaps();
-
-			const AppGui = require('./app-gui.js');
-			this.gui_ = new AppGui(this, this.store(), keymap);
-			this.gui_.setLogger(this.logger());
-			await this.gui_.start();
-
-			// Since the settings need to be loaded before the store is created, it will never
-			// receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
-			// initialised. So we manually call dispatchUpdateAll() to force an update.
-			Setting.dispatchUpdateAll();
-
-			await FoldersScreenUtils.refreshFolders();
-
-			const tags = await Tag.allWithNotes();
-
-			ResourceService.runInBackground();
-
-			RevisionService.instance().runInBackground();
-
-			this.dispatch({
-				type: 'TAG_UPDATE_ALL',
-				items: tags,
-			});
-
-			this.store().dispatch({
-				type: 'FOLDER_SELECT',
-				id: Setting.value('activeFolderId'),
-			});
-
-			this.startRotatingLogMaintenance(Setting.value('profileDir'));
-		}
-	}
+const { splitCommandBatch } = require('@joplin/lib/string-utils');
+class Application extends BaseApplication_1.default {
+    constructor() {
+        super(...arguments);
+        this.commands_ = {};
+        this.commandMetadata_ = null;
+        this.activeCommand_ = null;
+        this.allCommandsLoaded_ = false;
+        this.gui_ = null;
+        this.cache_ = new Cache();
+    }
+    gui() {
+        return this.gui_;
+    }
+    commandStdoutMaxWidth() {
+        return this.gui().stdoutMaxWidth();
+    }
+    guessTypeAndLoadItem(pattern, options = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let type = BaseModel_1.default.TYPE_NOTE;
+            if (pattern.indexOf('/') === 0) {
+                type = BaseModel_1.default.TYPE_FOLDER;
+                pattern = pattern.substr(1);
+            }
+            return this.loadItem(type, pattern, options);
+        });
+    }
+    loadItem(type, pattern, options = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const output = yield this.loadItems(type, pattern, options);
+            if (output.length > 1) {
+                // output.sort((a, b) => { return a.user_updated_time < b.user_updated_time ? +1 : -1; });
+                // let answers = { 0: _('[Cancel]') };
+                // for (let i = 0; i < output.length; i++) {
+                // 	answers[i + 1] = output[i].title;
+                // }
+                // Not really useful with new UI?
+                throw new Error((0, locale_1._)('More than one item match "%s". Please narrow down your query.', pattern));
+                // let msg = _('More than one item match "%s". Please select one:', pattern);
+                // const response = await cliUtils.promptMcq(msg, answers);
+                // if (!response) return null;
+                // return output[response - 1];
+            }
+            else {
+                return output.length ? output[0] : null;
+            }
+        });
+    }
+    loadItems(type, pattern, options = null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (type === 'folderOrNote') {
+                const folders = yield this.loadItems(BaseModel_1.default.TYPE_FOLDER, pattern, options);
+                if (folders.length)
+                    return folders;
+                return yield this.loadItems(BaseModel_1.default.TYPE_NOTE, pattern, options);
+            }
+            pattern = pattern ? pattern.toString() : '';
+            if (type === BaseModel_1.default.TYPE_FOLDER && (pattern === Folder_1.default.conflictFolderTitle() || pattern === Folder_1.default.conflictFolderId()))
+                return [Folder_1.default.conflictFolder()];
+            if (!options)
+                options = {};
+            const parent = options.parent ? options.parent : app().currentFolder();
+            const ItemClass = BaseItem_1.default.itemClass(type);
+            if (type === BaseModel_1.default.TYPE_NOTE && pattern.indexOf('*') >= 0) {
+                // Handle it as pattern
+                if (!parent)
+                    throw new Error((0, locale_1._)('No notebook selected.'));
+                return yield Note_1.default.previews(parent.id, { titlePattern: pattern });
+            }
+            else {
+                // Single item
+                let item = null;
+                if (type === BaseModel_1.default.TYPE_NOTE) {
+                    if (!parent)
+                        throw new Error((0, locale_1._)('No notebook has been specified.'));
+                    item = yield ItemClass.loadFolderNoteByField(parent.id, 'title', pattern);
+                }
+                else {
+                    item = yield ItemClass.loadByTitle(pattern);
+                }
+                if (item)
+                    return [item];
+                item = yield ItemClass.load(pattern); // Load by id
+                if (item)
+                    return [item];
+                if (pattern.length >= 2) {
+                    return yield ItemClass.loadByPartialId(pattern);
+                }
+            }
+            return [];
+        });
+    }
+    setupCommand(cmd) {
+        return (0, setupCommand_1.default)(cmd, (t) => this.stdout(t), () => this.store(), () => this.gui());
+    }
+    stdout(text) {
+        return this.gui().stdout(text);
+    }
+    exit(code = 0) {
+        const _super = Object.create(null, {
+            exit: { get: () => super.exit }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const doExit = () => __awaiter(this, void 0, void 0, function* () {
+                this.gui().exit();
+                yield _super.exit.call(this, code);
+            });
+            // Give it a few seconds to cancel otherwise exit anyway
+            shim_1.default.setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                yield doExit();
+            }), 5000);
+            if (yield registry_js_1.reg.syncTarget().syncStarted()) {
+                this.stdout((0, locale_1._)('Cancelling background synchronisation... Please wait.'));
+                const sync = yield registry_js_1.reg.syncTarget().synchronizer();
+                yield sync.cancel();
+            }
+            yield doExit();
+        });
+    }
+    commands(uiType = null) {
+        if (!this.allCommandsLoaded_) {
+            // eslint-disable-next-line github/array-foreach -- Old code before rule was applied
+            (0, fs_extra_1.readdirSync)(__dirname).forEach(path => {
+                if (path.indexOf('command-') !== 0)
+                    return;
+                if (path.endsWith('.test.js'))
+                    return;
+                const ext = (0, path_utils_1.fileExtension)(path);
+                if (ext !== 'js')
+                    return;
+                const CommandClass = require(`./${path}`);
+                let cmd = new CommandClass();
+                if (!cmd.enabled())
+                    return;
+                cmd = this.setupCommand(cmd);
+                this.commands_[cmd.name()] = cmd;
+            });
+            this.allCommandsLoaded_ = true;
+        }
+        if (uiType !== null) {
+            const temp = {};
+            for (const n in this.commands_) {
+                if (!this.commands_.hasOwnProperty(n))
+                    continue;
+                const c = this.commands_[n];
+                if (!c.supportsUi(uiType))
+                    continue;
+                temp[n] = c;
+            }
+            return temp;
+        }
+        return this.commands_;
+    }
+    commandNames() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const metadata = yield this.commandMetadata();
+            const output = [];
+            for (const n in metadata) {
+                if (!metadata.hasOwnProperty(n))
+                    continue;
+                output.push(n);
+            }
+            return output;
+        });
+    }
+    commandMetadata() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.commandMetadata_)
+                return this.commandMetadata_;
+            let output = yield this.cache_.getItem('metadata');
+            if (output) {
+                this.commandMetadata_ = output;
+                return Object.assign({}, this.commandMetadata_);
+            }
+            const commands = this.commands();
+            output = {};
+            for (const n in commands) {
+                if (!commands.hasOwnProperty(n))
+                    continue;
+                const cmd = commands[n];
+                output[n] = cmd.metadata();
+            }
+            yield this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
+            this.commandMetadata_ = output;
+            return Object.assign({}, this.commandMetadata_);
+        });
+    }
+    hasGui() {
+        return this.gui() && !this.gui().isDummy();
+    }
+    findCommandByName(name) {
+        if (this.commands_[name])
+            return this.commands_[name];
+        let CommandClass = null;
+        try {
+            CommandClass = require(`${__dirname}/command-${name}.js`);
+        }
+        catch (error) {
+            if (error.message && error.message.indexOf('Cannot find module') >= 0) {
+                const e = new Error((0, locale_1._)('No such command: %s', name));
+                e.type = 'notFound';
+                throw e;
+            }
+            else {
+                throw error;
+            }
+        }
+        let cmd = new CommandClass();
+        cmd = this.setupCommand(cmd);
+        this.commands_[name] = cmd;
+        return this.commands_[name];
+    }
+    dummyGui() {
+        return {
+            isDummy: () => {
+                return true;
+            },
+            prompt: (initialText = '', promptString = '', options = null) => {
+                return cliUtils.prompt(initialText, promptString, options);
+            },
+            showConsole: () => { },
+            maximizeConsole: () => { },
+            stdout: (text) => {
+                // eslint-disable-next-line no-console
+                console.info(text);
+            },
+            fullScreen: () => { },
+            exit: () => { },
+            showModalOverlay: () => { },
+            hideModalOverlay: () => { },
+            stdoutMaxWidth: () => {
+                return 100;
+            },
+            forceRender: () => { },
+            termSaveState: () => { },
+            termRestoreState: () => { },
+        };
+    }
+    execCommand(argv) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!argv.length)
+                return this.execCommand(['help']);
+            // reg.logger().debug('execCommand()', argv);
+            const commandName = argv[0];
+            this.activeCommand_ = this.findCommandByName(commandName);
+            let outException = null;
+            try {
+                if (this.gui().isDummy() && !this.activeCommand_.supportsUi('cli'))
+                    throw new Error((0, locale_1._)('The command "%s" is only available in GUI mode', this.activeCommand_.name()));
+                const cmdArgs = cliUtils.makeCommandArgs(this.activeCommand_, argv);
+                yield this.activeCommand_.action(cmdArgs);
+            }
+            catch (error) {
+                outException = error;
+            }
+            this.activeCommand_ = null;
+            if (outException)
+                throw outException;
+        });
+    }
+    currentCommand() {
+        return this.activeCommand_;
+    }
+    loadKeymaps() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const defaultKeyMap = [
+                { keys: [':'], type: 'function', command: 'enter_command_line_mode' },
+                { keys: ['TAB'], type: 'function', command: 'focus_next' },
+                { keys: ['SHIFT_TAB'], type: 'function', command: 'focus_previous' },
+                { keys: ['UP'], type: 'function', command: 'move_up' },
+                { keys: ['DOWN'], type: 'function', command: 'move_down' },
+                { keys: ['PAGE_UP'], type: 'function', command: 'page_up' },
+                { keys: ['PAGE_DOWN'], type: 'function', command: 'page_down' },
+                { keys: ['ENTER'], type: 'function', command: 'activate' },
+                { keys: ['DELETE', 'BACKSPACE'], type: 'function', command: 'delete' },
+                { keys: ['n'], type: 'function', command: 'next_link' },
+                { keys: ['b'], type: 'function', command: 'previous_link' },
+                { keys: ['o'], type: 'function', command: 'open_link' },
+                { keys: [' '], type: 'prompt', command: 'todo toggle $n' },
+                { keys: ['tc'], type: 'function', command: 'toggle_console' },
+                { keys: ['tm'], type: 'function', command: 'toggle_metadata' },
+                { keys: ['ti'], type: 'function', command: 'toggle_ids' },
+                { keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
+                { keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
+                { keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
+                { keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
+                { keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
+                { keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
+            ];
+            // Filter the keymap item by command so that items in keymap.json can override
+            // the default ones.
+            const itemsByCommand = {};
+            for (let i = 0; i < defaultKeyMap.length; i++) {
+                itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i];
+            }
+            const filePath = `${Setting_1.default.value('profileDir')}/keymap.json`;
+            if (yield (0, fs_extra_1.pathExists)(filePath)) {
+                try {
+                    let configString = yield (0, fs_extra_1.readFile)(filePath, 'utf-8');
+                    configString = configString.replace(/^\s*\/\/.*/, ''); // Strip off comments
+                    const keymap = JSON.parse(configString);
+                    for (let keymapIndex = 0; keymapIndex < keymap.length; keymapIndex++) {
+                        const item = keymap[keymapIndex];
+                        itemsByCommand[item.command] = item;
+                    }
+                }
+                catch (error) {
+                    let msg = error.message ? error.message : '';
+                    msg = `Could not load keymap ${filePath}\n${msg}`;
+                    error.message = msg;
+                    throw error;
+                }
+            }
+            const output = [];
+            for (const n in itemsByCommand) {
+                if (!itemsByCommand.hasOwnProperty(n))
+                    continue;
+                output.push(itemsByCommand[n]);
+            }
+            // Map reserved shortcuts to their equivalent key
+            // https://github.com/cronvel/terminal-kit/issues/101
+            for (let i = 0; i < output.length; i++) {
+                const newKeys = output[i].keys.map(k => {
+                    k = k.replace(/CTRL_H/g, 'BACKSPACE');
+                    k = k.replace(/CTRL_I/g, 'TAB');
+                    k = k.replace(/CTRL_M/g, 'ENTER');
+                    return k;
+                });
+                output[i].keys = newKeys;
+            }
+            return output;
+        });
+    }
+    commandList(argv) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (argv.length && argv[0] === 'batch') {
+                const commands = [];
+                const commandLines = splitCommandBatch(yield (0, fs_extra_1.readFile)(argv[1], 'utf-8'));
+                for (const commandLine of commandLines) {
+                    if (!commandLine.trim())
+                        continue;
+                    const splitted = (0, utils_1.splitCommandString)(commandLine.trim());
+                    commands.push(splitted);
+                }
+                return commands;
+            }
+            else {
+                return [argv];
+            }
+        });
+    }
+    // We need this special case here because by the time the `version` command
+    // runs, the keychain has already been setup.
+    checkIfKeychainEnabled(argv) {
+        return argv.indexOf('version') < 0;
+    }
+    start(argv) {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const keychainEnabled = this.checkIfKeychainEnabled(argv);
+            argv = yield _super.start.call(this, argv, { keychainEnabled });
+            cliUtils.setStdout((object) => {
+                return this.stdout(object);
+            });
+            this.initRedux();
+            // If we have some arguments left at this point, it's a command
+            // so execute it.
+            if (argv.length) {
+                this.gui_ = this.dummyGui();
+                this.currentFolder_ = yield Folder_1.default.load(Setting_1.default.value('activeFolderId'));
+                yield this.applySettingsSideEffects();
+                try {
+                    const commands = yield this.commandList(argv);
+                    for (const command of commands) {
+                        yield this.execCommand(command);
+                    }
+                }
+                catch (error) {
+                    if (this.showStackTraces_) {
+                        console.error(error);
+                    }
+                    else {
+                        // eslint-disable-next-line no-console
+                        console.info(error.message);
+                    }
+                    process.exit(1);
+                }
+                yield Setting_1.default.saveAll();
+                // Need to call exit() explicitly, otherwise Node wait for any timeout to complete
+                // https://stackoverflow.com/questions/18050095
+                process.exit(0);
+            }
+            else {
+                // Otherwise open the GUI
+                const keymap = yield this.loadKeymaps();
+                const AppGui = require('./app-gui.js');
+                this.gui_ = new AppGui(this, this.store(), keymap);
+                this.gui_.setLogger(this.logger());
+                yield this.gui_.start();
+                // Since the settings need to be loaded before the store is created, it will never
+                // receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
+                // initialised. So we manually call dispatchUpdateAll() to force an update.
+                Setting_1.default.dispatchUpdateAll();
+                yield (0, folders_screen_utils_js_1.refreshFolders)((action) => this.store().dispatch(action));
+                const tags = yield Tag_1.default.allWithNotes();
+                ResourceService_1.default.runInBackground();
+                RevisionService_1.default.instance().runInBackground();
+                this.dispatch({
+                    type: 'TAG_UPDATE_ALL',
+                    items: tags,
+                });
+                this.store().dispatch({
+                    type: 'FOLDER_SELECT',
+                    id: Setting_1.default.value('activeFolderId'),
+                });
+                this.startRotatingLogMaintenance(Setting_1.default.value('profileDir'));
+            }
+        });
+    }
 }
-
 let application_ = null;
-
 function app() {
-	if (application_) return application_;
-	application_ = new Application();
-	return application_;
+    if (application_)
+        return application_;
+    application_ = new Application();
+    return application_;
 }
-
-module.exports = { app };
+exports.default = app;
+//# sourceMappingURL=app.js.map

packages/app-cli/app/app.ts

@@ -0,0 +1,472 @@
+import BaseApplication from '@joplin/lib/BaseApplication';
+import { refreshFolders } from '@joplin/lib/folders-screen-utils.js';
+import ResourceService from '@joplin/lib/services/ResourceService';
+import BaseModel, { ModelType } from '@joplin/lib/BaseModel';
+import Folder from '@joplin/lib/models/Folder';
+import BaseItem from '@joplin/lib/models/BaseItem';
+import Note from '@joplin/lib/models/Note';
+import Tag from '@joplin/lib/models/Tag';
+import Setting from '@joplin/lib/models/Setting';
+import { reg } from '@joplin/lib/registry.js';
+import { fileExtension } from '@joplin/lib/path-utils';
+import { splitCommandString } from '@joplin/utils';
+import { _ } from '@joplin/lib/locale';
+import { pathExists, readFile, readdirSync } from 'fs-extra';
+import RevisionService from '@joplin/lib/services/RevisionService';
+import shim from '@joplin/lib/shim';
+import setupCommand from './setupCommand';
+import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
+const { cliUtils } = require('./cli-utils.js');
+const Cache = require('@joplin/lib/Cache');
+const { splitCommandBatch } = require('@joplin/lib/string-utils');
+
+class Application extends BaseApplication {
+
+	private commands_: Record<string, any> = {};
+	private commandMetadata_: any = null;
+	private activeCommand_: any = null;
+	private allCommandsLoaded_ = false;
+	private gui_: any = null;
+	private cache_ = new Cache();
+
+	public gui() {
+		return this.gui_;
+	}
+
+	public commandStdoutMaxWidth() {
+		return this.gui().stdoutMaxWidth();
+	}
+
+	public async guessTypeAndLoadItem(pattern: string, options: any = null) {
+		let type = BaseModel.TYPE_NOTE;
+		if (pattern.indexOf('/') === 0) {
+			type = BaseModel.TYPE_FOLDER;
+			pattern = pattern.substr(1);
+		}
+		return this.loadItem(type, pattern, options);
+	}
+
+	public async loadItem(type: ModelType | 'folderOrNote', pattern: string, options: any = null) {
+		const output = await this.loadItems(type, pattern, options);
+
+		if (output.length > 1) {
+			// output.sort((a, b) => { return a.user_updated_time < b.user_updated_time ? +1 : -1; });
+
+			// let answers = { 0: _('[Cancel]') };
+			// for (let i = 0; i < output.length; i++) {
+			// 	answers[i + 1] = output[i].title;
+			// }
+
+			// Not really useful with new UI?
+			throw new Error(_('More than one item match "%s". Please narrow down your query.', pattern));
+
+			// let msg = _('More than one item match "%s". Please select one:', pattern);
+			// const response = await cliUtils.promptMcq(msg, answers);
+			// if (!response) return null;
+
+			// return output[response - 1];
+		} else {
+			return output.length ? output[0] : null;
+		}
+	}
+
+	public async loadItems(type: ModelType | 'folderOrNote', pattern: string, options: any = null): Promise<(FolderEntity | NoteEntity)[]> {
+		if (type === 'folderOrNote') {
+			const folders: FolderEntity[] = await this.loadItems(BaseModel.TYPE_FOLDER, pattern, options);
+			if (folders.length) return folders;
+			return await this.loadItems(BaseModel.TYPE_NOTE, pattern, options);
+		}
+
+		pattern = pattern ? pattern.toString() : '';
+
+		if (type === BaseModel.TYPE_FOLDER && (pattern === Folder.conflictFolderTitle() || pattern === Folder.conflictFolderId())) return [Folder.conflictFolder()];
+
+		if (!options) options = {};
+
+		const parent = options.parent ? options.parent : app().currentFolder();
+		const ItemClass = BaseItem.itemClass(type);
+
+		if (type === BaseModel.TYPE_NOTE && pattern.indexOf('*') >= 0) {
+			// Handle it as pattern
+			if (!parent) throw new Error(_('No notebook selected.'));
+			return await Note.previews(parent.id, { titlePattern: pattern });
+		} else {
+			// Single item
+			let item = null;
+			if (type === BaseModel.TYPE_NOTE) {
+				if (!parent) throw new Error(_('No notebook has been specified.'));
+				item = await ItemClass.loadFolderNoteByField(parent.id, 'title', pattern);
+			} else {
+				item = await ItemClass.loadByTitle(pattern);
+			}
+			if (item) return [item];
+
+			item = await ItemClass.load(pattern); // Load by id
+			if (item) return [item];
+
+			if (pattern.length >= 2) {
+				return await ItemClass.loadByPartialId(pattern);
+			}
+		}
+
+		return [];
+	}
+
+	public setupCommand(cmd: string) {
+		return setupCommand(cmd, (t: string) => this.stdout(t), () => this.store(), () => this.gui());
+	}
+
+	public stdout(text: string) {
+		return this.gui().stdout(text);
+	}
+
+	public async exit(code = 0) {
+		const doExit = async () => {
+			this.gui().exit();
+			await super.exit(code);
+		};
+
+		// Give it a few seconds to cancel otherwise exit anyway
+		shim.setTimeout(async () => {
+			await doExit();
+		}, 5000);
+
+		if (await reg.syncTarget().syncStarted()) {
+			this.stdout(_('Cancelling background synchronisation... Please wait.'));
+			const sync = await reg.syncTarget().synchronizer();
+			await sync.cancel();
+		}
+
+		await doExit();
+	}
+
+	public commands(uiType: string = null) {
+		if (!this.allCommandsLoaded_) {
+			// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
+			readdirSync(__dirname).forEach(path => {
+				if (path.indexOf('command-') !== 0) return;
+				if (path.endsWith('.test.js')) return;
+				const ext = fileExtension(path);
+				if (ext !== 'js') return;
+
+				const CommandClass = require(`./${path}`);
+				let cmd = new CommandClass();
+				if (!cmd.enabled()) return;
+				cmd = this.setupCommand(cmd);
+				this.commands_[cmd.name()] = cmd;
+			});
+
+			this.allCommandsLoaded_ = true;
+		}
+
+		if (uiType !== null) {
+			const temp: Record<string, any> = {};
+			for (const n in this.commands_) {
+				if (!this.commands_.hasOwnProperty(n)) continue;
+				const c = this.commands_[n];
+				if (!c.supportsUi(uiType)) continue;
+				temp[n] = c;
+			}
+			return temp;
+		}
+
+		return this.commands_;
+	}
+
+	public async commandNames() {
+		const metadata = await this.commandMetadata();
+		const output = [];
+		for (const n in metadata) {
+			if (!metadata.hasOwnProperty(n)) continue;
+			output.push(n);
+		}
+		return output;
+	}
+
+	public async commandMetadata() {
+		if (this.commandMetadata_) return this.commandMetadata_;
+
+		let output = await this.cache_.getItem('metadata');
+		if (output) {
+			this.commandMetadata_ = output;
+			return { ...this.commandMetadata_ };
+		}
+
+		const commands = this.commands();
+
+		output = {};
+		for (const n in commands) {
+			if (!commands.hasOwnProperty(n)) continue;
+			const cmd = commands[n];
+			output[n] = cmd.metadata();
+		}
+
+		await this.cache_.setItem('metadata', output, 1000 * 60 * 60 * 24);
+
+		this.commandMetadata_ = output;
+		return { ...this.commandMetadata_ };
+	}
+
+	public hasGui() {
+		return this.gui() && !this.gui().isDummy();
+	}
+
+	public findCommandByName(name: string) {
+		if (this.commands_[name]) return this.commands_[name];
+
+		let CommandClass = null;
+		try {
+			CommandClass = require(`${__dirname}/command-${name}.js`);
+		} catch (error) {
+			if (error.message && error.message.indexOf('Cannot find module') >= 0) {
+				const e: any = new Error(_('No such command: %s', name));
+				e.type = 'notFound';
+				throw e;
+			} else {
+				throw error;
+			}
+		}
+
+		let cmd = new CommandClass();
+		cmd = this.setupCommand(cmd);
+		this.commands_[name] = cmd;
+		return this.commands_[name];
+	}
+
+	public dummyGui() {
+		return {
+			isDummy: () => {
+				return true;
+			},
+			prompt: (initialText = '', promptString = '', options: any = null) => {
+				return cliUtils.prompt(initialText, promptString, options);
+			},
+			showConsole: () => {},
+			maximizeConsole: () => {},
+			stdout: (text: string) => {
+				// eslint-disable-next-line no-console
+				console.info(text);
+			},
+			fullScreen: () => {},
+			exit: () => {},
+			showModalOverlay: () => {},
+			hideModalOverlay: () => {},
+			stdoutMaxWidth: () => {
+				return 100;
+			},
+			forceRender: () => {},
+			termSaveState: () => {},
+			termRestoreState: () => {},
+		};
+	}
+
+	public async execCommand(argv: string[]): Promise<any> {
+		if (!argv.length) return this.execCommand(['help']);
+		// reg.logger().debug('execCommand()', argv);
+		const commandName = argv[0];
+		this.activeCommand_ = this.findCommandByName(commandName);
+
+		let outException = null;
+		try {
+			if (this.gui().isDummy() && !this.activeCommand_.supportsUi('cli')) throw new Error(_('The command "%s" is only available in GUI mode', this.activeCommand_.name()));
+			const cmdArgs = cliUtils.makeCommandArgs(this.activeCommand_, argv);
+			await this.activeCommand_.action(cmdArgs);
+		} catch (error) {
+			outException = error;
+		}
+		this.activeCommand_ = null;
+		if (outException) throw outException;
+	}
+
+	public currentCommand() {
+		return this.activeCommand_;
+	}
+
+	public async loadKeymaps() {
+		interface KeyMapItem {
+			keys: string[];
+			type: 'function' | 'prompt';
+			command: string;
+			cursorPosition?: number;
+		}
+
+		const defaultKeyMap: KeyMapItem[] = [
+			{ keys: [':'], type: 'function', command: 'enter_command_line_mode' },
+			{ keys: ['TAB'], type: 'function', command: 'focus_next' },
+			{ keys: ['SHIFT_TAB'], type: 'function', command: 'focus_previous' },
+			{ keys: ['UP'], type: 'function', command: 'move_up' },
+			{ keys: ['DOWN'], type: 'function', command: 'move_down' },
+			{ keys: ['PAGE_UP'], type: 'function', command: 'page_up' },
+			{ keys: ['PAGE_DOWN'], type: 'function', command: 'page_down' },
+			{ keys: ['ENTER'], type: 'function', command: 'activate' },
+			{ keys: ['DELETE', 'BACKSPACE'], type: 'function', command: 'delete' },
+			{ keys: ['n'], type: 'function', command: 'next_link' },
+			{ keys: ['b'], type: 'function', command: 'previous_link' },
+			{ keys: ['o'], type: 'function', command: 'open_link' },
+			{ keys: [' '], type: 'prompt', command: 'todo toggle $n' },
+			{ keys: ['tc'], type: 'function', command: 'toggle_console' },
+			{ keys: ['tm'], type: 'function', command: 'toggle_metadata' },
+			{ keys: ['ti'], type: 'function', command: 'toggle_ids' },
+			{ keys: ['/'], type: 'prompt', command: 'search ""', cursorPosition: -2 },
+			{ keys: ['mn'], type: 'prompt', command: 'mknote ""', cursorPosition: -2 },
+			{ keys: ['mt'], type: 'prompt', command: 'mktodo ""', cursorPosition: -2 },
+			{ keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
+			{ keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
+			{ keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
+		];
+
+		// Filter the keymap item by command so that items in keymap.json can override
+		// the default ones.
+		const itemsByCommand: Record<string, KeyMapItem> = {};
+
+		for (let i = 0; i < defaultKeyMap.length; i++) {
+			itemsByCommand[defaultKeyMap[i].command] = defaultKeyMap[i];
+		}
+
+		const filePath = `${Setting.value('profileDir')}/keymap.json`;
+		if (await pathExists(filePath)) {
+			try {
+				let configString = await readFile(filePath, 'utf-8');
+				configString = configString.replace(/^\s*\/\/.*/, ''); // Strip off comments
+				const keymap = JSON.parse(configString);
+				for (let keymapIndex = 0; keymapIndex < keymap.length; keymapIndex++) {
+					const item = keymap[keymapIndex];
+					itemsByCommand[item.command] = item;
+				}
+			} catch (error) {
+				let msg = error.message ? error.message : '';
+				msg = `Could not load keymap ${filePath}\n${msg}`;
+				error.message = msg;
+				throw error;
+			}
+		}
+
+		const output = [];
+		for (const n in itemsByCommand) {
+			if (!itemsByCommand.hasOwnProperty(n)) continue;
+			output.push(itemsByCommand[n]);
+		}
+
+		// Map reserved shortcuts to their equivalent key
+		// https://github.com/cronvel/terminal-kit/issues/101
+		for (let i = 0; i < output.length; i++) {
+			const newKeys = output[i].keys.map(k => {
+				k = k.replace(/CTRL_H/g, 'BACKSPACE');
+				k = k.replace(/CTRL_I/g, 'TAB');
+				k = k.replace(/CTRL_M/g, 'ENTER');
+				return k;
+			});
+			output[i].keys = newKeys;
+		}
+
+		return output;
+	}
+
+	public async commandList(argv: string[]) {
+		if (argv.length && argv[0] === 'batch') {
+			const commands = [];
+			const commandLines = splitCommandBatch(await readFile(argv[1], 'utf-8'));
+
+			for (const commandLine of commandLines) {
+				if (!commandLine.trim()) continue;
+				const splitted = splitCommandString(commandLine.trim());
+				commands.push(splitted);
+			}
+			return commands;
+		} else {
+			return [argv];
+		}
+	}
+
+	// We need this special case here because by the time the `version` command
+	// runs, the keychain has already been setup.
+	public checkIfKeychainEnabled(argv: string[]) {
+		return argv.indexOf('version') < 0;
+	}
+
+	public async start(argv: string[]) {
+		const keychainEnabled = this.checkIfKeychainEnabled(argv);
+
+		argv = await super.start(argv, { keychainEnabled });
+
+		cliUtils.setStdout((object: any) => {
+			return this.stdout(object);
+		});
+
+		this.initRedux();
+
+		// If we have some arguments left at this point, it's a command
+		// so execute it.
+		if (argv.length) {
+			this.gui_ = this.dummyGui();
+
+			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
+
+			await this.applySettingsSideEffects();
+
+			try {
+				const commands = await this.commandList(argv);
+				for (const command of commands) {
+					await this.execCommand(command);
+				}
+			} catch (error) {
+				if (this.showStackTraces_) {
+					console.error(error);
+				} else {
+					// eslint-disable-next-line no-console
+					console.info(error.message);
+				}
+				process.exit(1);
+			}
+
+			await Setting.saveAll();
+
+			// Need to call exit() explicitly, otherwise Node wait for any timeout to complete
+			// https://stackoverflow.com/questions/18050095
+			process.exit(0);
+		} else {
+			// Otherwise open the GUI
+			const keymap = await this.loadKeymaps();
+
+			const AppGui = require('./app-gui.js');
+			this.gui_ = new AppGui(this, this.store(), keymap);
+			this.gui_.setLogger(this.logger());
+			await this.gui_.start();
+
+			// Since the settings need to be loaded before the store is created, it will never
+			// receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
+			// initialised. So we manually call dispatchUpdateAll() to force an update.
+			Setting.dispatchUpdateAll();
+
+			await refreshFolders((action: any) => this.store().dispatch(action));
+
+			const tags = await Tag.allWithNotes();
+
+			ResourceService.runInBackground();
+
+			RevisionService.instance().runInBackground();
+
+			this.dispatch({
+				type: 'TAG_UPDATE_ALL',
+				items: tags,
+			});
+
+			this.store().dispatch({
+				type: 'FOLDER_SELECT',
+				id: Setting.value('activeFolderId'),
+			});
+
+			this.startRotatingLogMaintenance(Setting.value('profileDir'));
+		}
+	}
+}
+
+let application_: Application = null;
+
+function app() {
+	if (application_) return application_;
+	application_ = new Application();
+	return application_;
+}
+
+export default app;

packages/app-cli/app/autocompletion.js

@@ -1,4 +1,4 @@
-const { app } = require('./app.js');
+const app = require('./app').default;
 const Note = require('@joplin/lib/models/Note').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Tag = require('@joplin/lib/models/Tag').default;

packages/app-cli/app/command-attach.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import shim from '@joplin/lib/shim';

packages/app-cli/app/command-cat.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import BaseItem from '@joplin/lib/models/BaseItem';

packages/app-cli/app/command-config.ts

@@ -1,6 +1,6 @@
 import BaseCommand from './base-command';
 import { _, setLocale } from '@joplin/lib/locale';
-const { app } = require('./app.js');
+import app from './app';
 import * as fs from 'fs-extra';
 import Setting, { AppType } from '@joplin/lib/models/Setting';
 import { ReadStream } from 'tty';

packages/app-cli/app/command-cp.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Note from '@joplin/lib/models/Note';

packages/app-cli/app/command-done.ts

@@ -1,9 +1,10 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Note from '@joplin/lib/models/Note';
 import time from '@joplin/lib/time';
+import { NoteEntity } from '@joplin/lib/services/database/types';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -15,7 +16,7 @@ class Command extends BaseCommand {
 	}
 
 	public static async handleAction(commandInstance: BaseCommand, args: any, isCompleted: boolean) {
-		const note = await app().loadItem(BaseModel.TYPE_NOTE, args.note);
+		const note: NoteEntity = await app().loadItem(BaseModel.TYPE_NOTE, args.note);
 		commandInstance.encryptionCheck(note);
 		if (!note) throw new Error(_('Cannot find "%s".', args.note));
 		if (!note.is_todo) throw new Error(_('Note is not a to-do: "%s"', args.note));

packages/app-cli/app/command-edit.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs-extra';
 import BaseCommand from './base-command';
 import { splitCommandString } from '@joplin/utils';
 import uuid from '@joplin/lib/uuid';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import Note from '@joplin/lib/models/Note';
 import Setting from '@joplin/lib/models/Setting';

packages/app-cli/app/command-exit.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 
 class Command extends BaseCommand {

packages/app-cli/app/command-export-sync-status.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import Setting from '@joplin/lib/models/Setting';
 import ReportService from '@joplin/lib/services/ReportService';
 import * as fs from 'fs-extra';

packages/app-cli/app/command-export.ts

@@ -1,7 +1,7 @@
 import BaseCommand from './base-command';
 import InteropService from '@joplin/lib/services/interop/InteropService';
 import BaseModel from '@joplin/lib/BaseModel';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import { ExportOptions } from '@joplin/lib/services/interop/types';
 

packages/app-cli/app/command-geoloc.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Note from '@joplin/lib/models/Note';

packages/app-cli/app/command-help.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 const { renderCommandHelp } = require('./help-utils.js');
 import { _ } from '@joplin/lib/locale';
 const { cliUtils } = require('./cli-utils.js');

packages/app-cli/app/command-import.ts

@@ -2,9 +2,10 @@ import BaseCommand from './base-command';
 import InteropService from '@joplin/lib/services/interop/InteropService';
 import BaseModel from '@joplin/lib/BaseModel';
 const { cliUtils } = require('./cli-utils.js');
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import { ImportOptions } from '@joplin/lib/services/interop/types';
+import { unique } from '@joplin/lib/array';
 
 class Command extends BaseCommand {
 	public override usage() {
@@ -23,7 +24,7 @@ class Command extends BaseCommand {
 			.map(m => m.format);
 
 		return [
-			['--format <format>', _('Source format: %s', ['auto'].concat(formats).join(', '))],
+			['--format <format>', _('Source format: %s', ['auto'].concat(unique(formats)).join(', '))],
 			['-f, --force', _('Do not ask for confirmation.')],
 			['--output-format <output-format>', _('Output format: %s', 'md, html')],
 		];

packages/app-cli/app/command-ls.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';

packages/app-cli/app/command-mkbook.ts

@@ -1,5 +1,5 @@
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';

packages/app-cli/app/command-mknote.js

@@ -1,5 +1,5 @@
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+const app = require('./app').default;
 const { _ } = require('@joplin/lib/locale');
 const Note = require('@joplin/lib/models/Note').default;
 

packages/app-cli/app/command-mktodo.js

@@ -1,5 +1,5 @@
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+const app = require('./app').default;
 const { _ } = require('@joplin/lib/locale');
 const Note = require('@joplin/lib/models/Note').default;
 

packages/app-cli/app/command-mv.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';

packages/app-cli/app/command-ren.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Folder from '@joplin/lib/models/Folder';

packages/app-cli/app/command-rmbook.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import Folder from '@joplin/lib/models/Folder';
 import BaseModel from '@joplin/lib/BaseModel';

packages/app-cli/app/command-rmnote.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import Note from '@joplin/lib/models/Note';
 import BaseModel from '@joplin/lib/BaseModel';

packages/app-cli/app/command-set.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 import Database from '@joplin/lib/database';

packages/app-cli/app/command-status.js

@@ -1,5 +1,5 @@
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+const app = require('./app').default;
 const Setting = require('@joplin/lib/models/Setting').default;
 const { _ } = require('@joplin/lib/locale');
 const ReportService = require('@joplin/lib/services/ReportService').default;

packages/app-cli/app/command-sync.ts

@@ -7,7 +7,7 @@ import Synchronizer from '@joplin/lib/Synchronizer';
 import { masterKeysWithoutPassword } from '@joplin/lib/services/e2ee/utils';
 import { appTypeToLockType } from '@joplin/lib/services/synchronizer/LockHandler';
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+import app from './app';
 const { OneDriveApiNodeUtils } = require('@joplin/lib/onedrive-api-node-utils.js');
 import { reg } from '@joplin/lib/registry';
 const { cliUtils } = require('./cli-utils.js');

packages/app-cli/app/command-tag.js

@@ -1,5 +1,5 @@
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+const app = require('./app').default;
 const { _ } = require('@joplin/lib/locale');
 const Tag = require('@joplin/lib/models/Tag').default;
 const BaseModel = require('@joplin/lib/BaseModel').default;

packages/app-cli/app/command-todo.js

@@ -1,5 +1,5 @@
 const BaseCommand = require('./base-command').default;
-const { app } = require('./app.js');
+const app = require('./app').default;
 const { _ } = require('@joplin/lib/locale');
 const BaseModel = require('@joplin/lib/BaseModel').default;
 const Note = require('@joplin/lib/models/Note').default;

packages/app-cli/app/command-use.ts

@@ -1,5 +1,5 @@
 import BaseCommand from './base-command';
-const { app } = require('./app.js');
+import app from './app';
 import { _ } from '@joplin/lib/locale';
 import BaseModel from '@joplin/lib/BaseModel';
 

packages/app-cli/app/main.js

@@ -10,7 +10,7 @@ if (compareVersion(nodeVersion, '10.0.0') < 0) {
 	process.exit(1);
 }
 
-const { app } = require('./app.js');
+const app = require('./app').default;
 const Folder = require('@joplin/lib/models/Folder').default;
 const Resource = require('@joplin/lib/models/Resource').default;
 const BaseItem = require('@joplin/lib/models/BaseItem').default;

packages/app-cli/app/utils/testUtils.ts

@@ -1,4 +1,4 @@
-const { app } = require('../app');
+import app from '../app';
 import Folder from '@joplin/lib/models/Folder';
 import BaseCommand from '../base-command';
 import setupCommand from '../setupCommand';

packages/app-cli/build-doc.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-yarn run build && NODE_PATH=build node build/build-doc.js
+yarn build && NODE_PATH=build node build/build-doc.js

packages/app-cli/cli-integration.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-yarn run build && NODE_PATH="build/" node build/cli-integration-tests.js
+yarn build && NODE_PATH="build/" node build/cli-integration-tests.js

packages/app-cli/createUsers.sh

@@ -2,7 +2,7 @@
 
 # Start the server with:
 #
-# JOPLIN_IS_TESTING=1 yarn run start-dev
+# JOPLIN_IS_TESTING=1 yarn start-dev
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 

packages/app-cli/fuzzing.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 #
 set -e
-yarn run build && NODE_PATH="build/" node build/fuzzing.js
+yarn build && NODE_PATH="build/" node build/fuzzing.js

packages/app-cli/package.json

@@ -47,7 +47,7 @@
     "aws-sdk": "2.1340.0",
     "chalk": "4.1.2",
     "compare-version": "0.1.2",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "html-entities": "1.4.0",
     "image-type": "3.1.0",
     "keytar": "7.9.0",
@@ -57,7 +57,7 @@
     "proper-lockfile": "4.1.2",
     "read-chunk": "2.1.0",
     "server-destroy": "1.0.1",
-    "sharp": "0.33.0",
+    "sharp": "0.33.2",
     "sprintf-js": "1.1.3",
     "sqlite3": "5.1.6",
     "string-padding": "1.0.2",
@@ -73,7 +73,7 @@
     "@joplin/tools": "~2.14",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.8",
-    "@types/node": "18.18.14",
+    "@types/node": "18.19.8",
     "@types/proper-lockfile": "^4.1.2",
     "gulp": "4.0.2",
     "jest": "29.7.0",

packages/app-cli/tests/HtmlToMd.ts

@@ -40,6 +40,10 @@ describe('HtmlToMd', () => {
 				htmlToMdOptions.preserveNestedTables = true;
 			}
 
+			if (htmlFilename.indexOf('text_color') === 0) {
+				htmlToMdOptions.preserveColorStyles = true;
+			}
+
 			const html = await readFile(htmlPath, 'utf8');
 			let expectedMd = await readFile(mdPath, 'utf8');
 

packages/app-cli/tests/MarkupToHtml.ts

@@ -1,5 +1,6 @@
 
-import MarkupToHtml, { MarkupLanguage, RenderResult } from '@joplin/renderer/MarkupToHtml';
+import MarkupToHtml, { MarkupLanguage } from '@joplin/renderer/MarkupToHtml';
+import { RenderResult } from '@joplin/renderer/types';
 
 describe('MarkupToHtml', () => {
 

packages/app-cli/tests/enex_to_md/table_with_invalid_content.html

@@ -1,4 +1,5 @@
 <table>
+	<div></div> <!-- INVALID! -->
 	<tr>
 		<td>one</td>
 		<td>two</td>

packages/app-cli/tests/html_to_md/image_utf8_data_url.html

@@ -0,0 +1,9 @@
+<p>
+	SVG image:
+
+	<img src="data:image/svg+xml;utf8,
+		<svg width=&quot;1700&quot; height=&quot;1536&quot; xmlns=&quot;http://www.w3.org/2000/svg&quot;>
+			<path d=&quot;m0,0%20l100,1000%20l200,0%20z&quot;/>
+		</svg>"/>
+</p>
+<p>PNG image: <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAR0lEQVQIW4XLMQoAIQwF0flpBEHwtOlUsPW6gZTushfYqd8IuHtvxhhI4pyD1lq3905EYGa01tB9m3N+IjNxd/S711oppfAAOjQiFPMurHkAAAAASUVORK5CYII="></p>

packages/app-cli/tests/html_to_md/image_utf8_data_url.md

@@ -0,0 +1,3 @@
+SVG image: ![](data:image/svg+xml;utf8,%0A%09%09<svg%20width="1700"%20height="1536"%20xmlns="http://www.w3.org/2000/svg">%0A%09%09%09<path%20d="m0,0%20l100,1000%20l200,0%20z"/>%0A%09%09</svg>)
+
+PNG image: ![](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAR0lEQVQIW4XLMQoAIQwF0flpBEHwtOlUsPW6gZTushfYqd8IuHtvxhhI4pyD1lq3905EYGa01tB9m3N+IjNxd/S711oppfAAOjQiFPMurHkAAAAASUVORK5CYII=)

packages/app-cli/tests/html_to_md/table_with_caption.html

@@ -0,0 +1,15 @@
+<table>
+	<caption>Caption</caption>
+	<tbody>
+		<tr>
+			<th>Row 1, Column 1</th>
+			<th>Row 1, Column 2</th>
+			<th>Row 1, Column 3</th>
+		</tr>
+		<tr>
+			<th>Row 2, Column 1</th>
+			<td>Row 2, Column 2</td>
+			<td>Row 2, Column 3</td>
+		</tr>
+	</tbody>
+</table>

packages/app-cli/tests/html_to_md/table_with_caption.md

@@ -0,0 +1,6 @@
+Caption
+
+|     |     |     |
+| --- | --- | --- |
+| Row 1, Column 1 | Row 1, Column 2 | Row 1, Column 3 |
+| Row 2, Column 1 | Row 2, Column 2 | Row 2, Column 3 |

packages/app-cli/tests/html_to_md/table_with_colgroup.html

@@ -0,0 +1,19 @@
+<table>
+	<colgroup>
+    <col />
+    <col span="2" class="test" />
+    <col span="2" class="test2" />
+  </colgroup>
+	<tbody>
+		<tr>
+			<th>Row 1, Column 1</th>
+			<th>Row 1, Column 2</th>
+			<th>Row 1, Column 3</th>
+		</tr>
+		<tr>
+			<th>Row 2, Column 1</th>
+			<td>Row 2, Column 2</td>
+			<td>Row 2, Column 3</td>
+		</tr>
+	</tbody>
+</table>

packages/app-cli/tests/html_to_md/table_with_colgroup.md

@@ -0,0 +1,4 @@
+|     |     |     |
+| --- | --- | --- | 
+| Row 1, Column 1 | Row 1, Column 2 | Row 1, Column 3 |
+| Row 2, Column 1 | Row 2, Column 2 | Row 2, Column 3 |

packages/app-cli/tests/html_to_md/text_color.html

@@ -0,0 +1 @@
+<p>Text <span style="color: #fff000;">Text</span></p>

packages/app-cli/tests/html_to_md/text_color.md

@@ -0,0 +1 @@
+Text <span style="color: #fff000;">Text</span>

packages/app-cli/tests/md_to_html/image_with_data_url.html

@@ -0,0 +1,2 @@
+<p>SVG image: <img src="data:image/svg+xml;utf8,%3Csvg%20width=%221700%22%20height=%221536%22%20xmlns=%22http://www.w3.org/2000/svg%22%3E%20%3Cpath%20d=%22m0,0%20l100,1000%20l200,0%20z%22/%3E%20%3C/svg%3E" alt=""></p>
+<p>PNG image: <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAR0lEQVQIW4XLMQoAIQwF0flpBEHwtOlUsPW6gZTushfYqd8IuHtvxhhI4pyD1lq3905EYGa01tB9m3N+IjNxd/S711oppfAAOjQiFPMurHkAAAAASUVORK5CYII=" alt=""></p>

packages/app-cli/tests/md_to_html/image_with_data_url.md

@@ -0,0 +1,3 @@
+SVG image: ![](data:image/svg+xml;utf8,<svg%20width="1700"%20height="1536"%20xmlns="http://www.w3.org/2000/svg">%20<path%20d="m0,0%20l100,1000%20l200,0%20z"/>%20</svg>)
+
+PNG image: ![](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAR0lEQVQIW4XLMQoAIQwF0flpBEHwtOlUsPW6gZTushfYqd8IuHtvxhhI4pyD1lq3905EYGa01tB9m3N+IjNxd/S711oppfAAOjQiFPMurHkAAAAASUVORK5CYII=)

packages/app-cli/tests/md_to_html/toc_duplicate_items.html

@@ -0,0 +1,3 @@
+<nav class="table-of-contents"><ul><li><a href="#test">test</a></li><li><a href="#test-2">test</a></li><li><a href="#test2">test2</a></li></ul></nav><h1 id="test">test</h1>
+<h1 id="test-2">test</h1>
+<h1 id="test2">test2</h1>

packages/app-cli/tests/md_to_html/toc_duplicate_items.md

@@ -0,0 +1,5 @@
+[toc]
+
+# test
+# test
+# test2

packages/app-cli/tests/services/plugins/PluginService.ts

@@ -1,5 +1,5 @@
 import PluginRunner from '../../../app/services/plugins/PluginRunner';
-import PluginService from '@joplin/lib/services/plugins/PluginService';
+import PluginService, { PluginSettings } 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';
@@ -304,4 +304,33 @@ describe('services_PluginService', () => {
 		expect(JSON.parse(folders[0].title)).toBe(expectedPath);
 	}));
 
+	it('should uninstall multiple plugins', async () => {
+		const service = newPluginService();
+		const pluginId1 = 'org.joplinapp.FirstJplPlugin';
+		const pluginId2 = 'org.joplinapp.plugins.TocDemo';
+		const pluginPath1 = `${testPluginDir}/jpl_test/${pluginId1}.jpl`;
+		const pluginPath2 = `${testPluginDir}/toc/${pluginId2}.jpl`;
+
+		await service.installPlugin(pluginPath1);
+		await service.installPlugin(pluginPath2);
+
+		// Both should be installed
+		expect(await fs.pathExists(`${Setting.value('pluginDir')}/${pluginId1}.jpl`)).toBe(true);
+		expect(await fs.pathExists(`${Setting.value('pluginDir')}/${pluginId2}.jpl`)).toBe(true);
+
+		const pluginSettings: PluginSettings = {
+			[pluginId1]: { enabled: true, deleted: true, hasBeenUpdated: false },
+			[pluginId2]: { enabled: true, deleted: true, hasBeenUpdated: false },
+		};
+
+		const newPluginSettings = await service.uninstallPlugins(pluginSettings);
+
+		// Should have deleted plugins
+		expect(await fs.pathExists(`${Setting.value('pluginDir')}/${pluginId1}.jpl`)).toBe(false);
+		expect(await fs.pathExists(`${Setting.value('pluginDir')}${pluginId2}.jpl`)).toBe(false);
+
+		// Should clear deleted plugins from settings
+		expect(newPluginSettings[pluginId1]).toBe(undefined);
+		expect(newPluginSettings[pluginId2]).toBe(undefined);
+	});
 });

packages/app-cli/tests/services/plugins/defaultPluginsUtils.ts

@@ -4,8 +4,9 @@ import { checkThrow, setupDatabaseAndSynchronizer, supportDir, switchClient } fr
 import PluginService, { defaultPluginSetting, DefaultPluginsInfo } from '@joplin/lib/services/plugins/PluginService';
 import Setting from '@joplin/lib/models/Setting';
 
+const testDefaultPluginsDir = `${supportDir}/testDefaultPlugins`;
 
-function newPluginService(appVersion = '1.4') {
+function newPluginService(appVersion = '2.4') {
 	const runner = new PluginRunner();
 	const service = new PluginService();
 	service.initialize(
@@ -35,8 +36,7 @@ describe('defaultPluginsUtils', () => {
 		await switchClient(1);
 	});
 
-	it('should load default plugins when nor previously installed', (async () => {
-		const testPluginDir = `${supportDir}/pluginRepo/plugins`;
+	it('should load default plugins when not previously installed', (async () => {
 		Setting.setValue('installedDefaultPlugins', []);
 
 		const service = newPluginService('2.1');
@@ -47,7 +47,9 @@ describe('defaultPluginsUtils', () => {
 			expect(pluginSettings[pluginId]).toBeFalsy();
 		}
 
-		const pluginPathsAndNewSettings = await getDefaultPluginPathsAndSettings(testPluginDir, defaultPluginsInfo, pluginSettings);
+		const pluginPathsAndNewSettings = await getDefaultPluginPathsAndSettings(
+			testDefaultPluginsDir, defaultPluginsInfo, pluginSettings, service,
+		);
 
 		for (const pluginId of pluginsId) {
 			expect(
@@ -57,7 +59,6 @@ describe('defaultPluginsUtils', () => {
 	}));
 
 	it('should keep already created default plugins disabled with previous default plugins installed', (async () => {
-		const testPluginDir = `${supportDir}/pluginRepo/plugins`;
 		Setting.setValue('installedDefaultPlugins', ['org.joplinapp.plugins.ToggleSidebars']);
 		Setting.setValue('plugins.states', {
 			'org.joplinapp.plugins.ToggleSidebars': { ...defaultPluginSetting(), enabled: false },
@@ -66,7 +67,7 @@ describe('defaultPluginsUtils', () => {
 		const service = newPluginService('2.1');
 
 		const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
-		const pluginPathsAndNewSettings = await getDefaultPluginPathsAndSettings(testPluginDir, defaultPluginsInfo, pluginSettings);
+		const pluginPathsAndNewSettings = await getDefaultPluginPathsAndSettings(testDefaultPluginsDir, defaultPluginsInfo, pluginSettings, service);
 
 		// Should still be disabled
 		expect(
@@ -171,6 +172,34 @@ describe('defaultPluginsUtils', () => {
 		expect(Setting.value('plugin-io.github.jackgruber.backup.path')).toBe('initial-path');
 	});
 
+	it('should support disabled-by-default plugins', async () => {
+		const service = newPluginService();
+
+		const plugin = await service.loadPluginFromJsBundle('', sampleJsBundlePlugin);
+		plugin.builtIn = false;
+		await service.runPlugin(plugin);
+
+		const defaultPluginsInfo: DefaultPluginsInfo = {
+			'joplin.plugin.ambrt.backlinksToNote': {
+				enabled: false,
+			},
+			'org.joplinapp.plugins.ToggleSidebars': {},
+		};
+		Setting.setValue('installedDefaultPlugins', []);
+
+		const { pluginSettings } = await getDefaultPluginPathsAndSettings(
+			testDefaultPluginsDir, defaultPluginsInfo, {}, service,
+		);
+
+		expect(pluginSettings).toMatchObject({
+			'joplin.plugin.ambrt.backlinksToNote': {
+				enabled: false,
+				deleted: false,
+			},
+			'org.joplinapp.plugins.ToggleSidebars': defaultPluginSetting(),
+		});
+	});
+
 	it('should not throw error on missing setting key', async () => {
 
 		const service = newPluginService();
@@ -202,4 +231,34 @@ describe('defaultPluginsUtils', () => {
 		await service.destroy();
 	});
 
+	// Only returning not-yet-loaded plugins prevents non-default versions of built-in plugins
+	// from being overwritten by PluginService.
+	it('getDefaultPluginPathsAndSettings should return only plugins that haven\'t been loaded', async () => {
+		const service = newPluginService();
+
+		const testPluginId = 'org.joplinapp.plugins.ToggleSidebars';
+		const testPluginPath = `${supportDir}/pluginRepo/plugins/${testPluginId}/plugin.jpl`;
+
+		const pluginSettings = {
+			[testPluginId]: defaultPluginSetting(),
+		};
+
+		await service.loadAndRunPlugins([testPluginPath], pluginSettings, { devMode: false, builtIn: false });
+
+		// Should be running
+		expect(service.isPluginLoaded(testPluginId)).toBe(true);
+
+		const testDefaultPluginsInfo = {
+			[testPluginId]: {},
+			'joplin.plugin.ambrt.backlinksToNote': {},
+		};
+
+		const { pluginPaths } = await getDefaultPluginPathsAndSettings(
+			testDefaultPluginsDir, testDefaultPluginsInfo, pluginSettings, service,
+		);
+
+		// Should only return plugins that aren't loaded.
+		expect(pluginPaths).toHaveLength(1);
+		expect(pluginPaths[0]).toContain('joplin.plugin.ambrt.backlinksToNote');
+	});
 });

packages/app-cli/tests/support/plugins/codemirror6/src/assets/style.css

@@ -0,0 +1,5 @@
+
+.cm-gutter {
+	background-color: var(--joplin-background-color3);
+	color: var(--joplin-color3);
+}

packages/app-cli/tests/support/plugins/codemirror6/src/contentScript.ts

@@ -4,7 +4,7 @@
 // This is necessary. Having multiple copies of the CodeMirror libraries loaded can cause
 // the editor to not work properly.
 //
-import { lineNumbers } from '@codemirror/view';
+import { lineNumbers, highlightActiveLineGutter, } from '@codemirror/view';
 //
 // For the above import to work, you may also need to add @codemirror/view as a dev dependency
 // to package.json. (For the type information only).
@@ -22,10 +22,37 @@ export default (_context: { contentScriptId: string }) => {
 			// We add the extension to CodeMirror using a helper method:
 			codeMirrorWrapper.addExtension([
 				lineNumbers(),
+
+				// We can include multiple extensions here:
+				highlightActiveLineGutter(),
 			]);
 
 			// See https://codemirror.net/ for more built-in extensions and configuration
 			// options.
 		},
+
+		// There are two main ways to style the CodeMirror editor:
+		// 1. With a CodeMirror6 theme extension (see https://codemirror.net/examples/styling/#themes)
+		// 2. With CSS assets
+		// 
+		// CSS assets can be added by exporting an `assets` function:
+		assets: () => [
+			// We can include styles by either referencing a file
+			{ name: './assets/style.css' },
+
+			// or including the style sheet inline
+			{
+				inline: true,
+				mime: 'text/css',
+				text: `
+					/* This CSS class is added by the highlightActiveLineGutter extension: */
+					.cm-gutter .cm-activeLineGutter {
+						text-decoration: underline;
+						color: var(--joplin-color2);
+						background-color: var(--joplin-background-color2);
+					}
+				`,
+			},
+		],
 	};
 };

packages/app-cli/tests/support/plugins/register_command/test_plugin_update.sh

@@ -4,4 +4,4 @@
 # - Run the below command
 # - Then the file /manifests.json also needs to be updated with the new manifest file
 
-yarn run dist && cp publish/org.joplinapp.plugins.RegisterCommandDemo.jpl ~/src/joplin-plugins-test/plugins/org.joplinapp.plugins.RegisterCommandDemo/plugin.jpl && cp publish/org.joplinapp.plugins.RegisterCommandDemo.json ~/src/joplin-plugins-test/plugins/org.joplinapp.plugins.RegisterCommandDemo/plugin.json
+yarn dist && cp publish/org.joplinapp.plugins.RegisterCommandDemo.jpl ~/src/joplin-plugins-test/plugins/org.joplinapp.plugins.RegisterCommandDemo/plugin.jpl && cp publish/org.joplinapp.plugins.RegisterCommandDemo.json ~/src/joplin-plugins-test/plugins/org.joplinapp.plugins.RegisterCommandDemo/plugin.json

packages/app-cli/tests/support/plugins/updatePlugins.sh

@@ -1,23 +1,40 @@
 #!/bin/bash
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-cd "$SCRIPT_DIR/jpl_test/" && yo joplin --update --skip-install --silent
+update_plugin() {
+	echo "Updating $1..."
+	cd "$SCRIPT_DIR/$1" && yo joplin --update --skip-install --silent
+	echo "Done."
+}
+
+update_plugin jpl_test
 sed -i /*.jpl/d .gitignore
 
-cd "$SCRIPT_DIR/codemirror_content_script/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/content_script/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/dialog/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/editor_context_menu/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/events/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/json_export/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/menu/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/multi_selection/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/register_command/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/selected_text/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/settings/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/toc/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/withExternalModules/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/post_messages/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/nativeModule/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/external_assets/" && yo joplin --update --skip-install --silent
-cd "$SCRIPT_DIR/user_data/" && yo joplin --update --skip-install --silent
+PLUGINS_TO_UPDATE=(
+	"clipboard"
+	"codemirror6"
+	"codemirror_content_script"
+	"content_script"
+	"dialog"
+	"editor_context_menu"
+	"events"
+	"external_assets"
+	"imaging"
+	"json_export"
+	"load_css"
+	"menu"
+	"multi_selection"
+	"nativeModule"
+	"note_list_renderer"
+	"post_messages"
+	"register_command"
+	"selected_text"
+	"settings"
+	"toc"
+	"user_data"
+	"withExternalModules"
+)
+
+for PLUGIN in ${PLUGINS_TO_UPDATE[@]}; do
+	update_plugin "$PLUGIN"
+done

packages/app-cli/tests/support/test_notes/yaml/note_with_byte_order_mark.md

@@ -0,0 +1,8 @@
+---
+title: Frontmatter test
+tags:
+  - tag1
+  - tag2
+---
+
+This note begins with an invisible byte order mark, just before its frontmatter.

packages/app-cli/tests/support/test_notes/yaml/notesnook_updated_created.md

@@ -0,0 +1,9 @@
+---
+title: "Frontmatter test"
+created_at: 01-01-2024 01:23 AM
+updated_at: 02-01-2024 04:56 AM
+---
+
+# Frontmatter test
+
+A test note with frontmatter.

packages/app-cli/tools/populateDatabase.ts

@@ -8,7 +8,7 @@
 // - Run the Postgres database -- `sudo docker-compose --file docker-compose.db-dev.yml up`
 // - Update the DB parameters in ~/joplin-credentials/server.env to use the dev
 //   database
-// - Run the server - `JOPLIN_IS_TESTING=1 yarn run start-dev`
+// - Run the server - `JOPLIN_IS_TESTING=1 yarn start-dev`
 // - Then run this script - `node populateDatabase.js`
 //
 // Currently it doesn't actually create the users, so that should be done using:

packages/app-clipper/content_scripts/.gitignore

@@ -1 +1,4 @@
-*.bundle.js
+*.bundle.js
+
+# Copied from the lib package
+clipperUtils.js

packages/app-clipper/content_scripts/clipperUtils.js

@@ -1,114 +0,0 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.getStyleSheets = exports.getImageSizes = void 0;
-function absoluteUrl(url) {
-	if (!url) { return url; }
-	const protocol = url.toLowerCase().split(':')[0];
-	if (['http', 'https', 'file', 'data'].indexOf(protocol) >= 0) { return url; }
-	if (url.indexOf('//') === 0) {
-		return location.protocol + url;
-	} else if (url[0] === '/') {
-		return `${location.protocol}//${location.host}${url}`;
-	} else {
-		return `${baseUrl()}/${url}`;
-	}
-}
-function pageLocationOrigin() {
-	// location.origin normally returns the protocol + domain + port (eg. https://example.com:8080)
-	// but for file:// protocol this is browser dependant and in particular Firefox returns "null"
-	// in this case.
-	if (location.protocol === 'file:') {
-		return 'file://';
-	} else {
-		return location.origin;
-	}
-}
-function baseUrl() {
-	let output = pageLocationOrigin() + location.pathname;
-	if (output[output.length - 1] !== '/') {
-		const output2 = output.split('/');
-		output2.pop();
-		output = output2.join('/');
-	}
-	return output;
-}
-function getJoplinClipperSvgClassName(svg) {
-	for (const className of svg.classList) {
-		if (className.indexOf('joplin-clipper-svg-') === 0) { return className; }
-	}
-	return '';
-}
-function getImageSizes(element, forceAbsoluteUrls = false) {
-	const output = {};
-	const images = element.getElementsByTagName('img');
-	for (let i = 0; i < images.length; i++) {
-		const img = images[i];
-		if (img.classList && img.classList.contains('joplin-clipper-hidden')) { continue; }
-		let src = imageSrc(img);
-		src = forceAbsoluteUrls ? absoluteUrl(src) : src;
-		if (!output[src]) { output[src] = []; }
-		output[src].push({
-			width: img.width,
-			height: img.height,
-			naturalWidth: img.naturalWidth,
-			naturalHeight: img.naturalHeight,
-		});
-	}
-	const svgs = element.getElementsByTagName('svg');
-	for (let i = 0; i < svgs.length; i++) {
-		const svg = svgs[i];
-		if (svg.classList && svg.classList.contains('joplin-clipper-hidden')) { continue; }
-		const className = getJoplinClipperSvgClassName(svg); // 'joplin-clipper-svg-' + i;
-		if (!className) {
-			console.warn('SVG without a Joplin class:', svg);
-			continue;
-		}
-		if (!svg.classList.contains(className)) {
-			svg.classList.add(className);
-		}
-		const rect = svg.getBoundingClientRect();
-		if (!output[className]) { output[className] = []; }
-		output[className].push({
-			width: rect.width,
-			height: rect.height,
-		});
-	}
-	return output;
-}
-exports.getImageSizes = getImageSizes;
-// In general we should use currentSrc because that's the image that's currently displayed,
-// especially within <picture> tags or with srcset. In these cases there can be multiple
-// sources and the best one is probably the one being displayed, thus currentSrc.
-function imageSrc(image) {
-	if (image.currentSrc) { return image.currentSrc; }
-	return image.src;
-}
-// Given a document, return a <style> tag that contains all the styles
-// required to render the page. Not currently used but could be as an
-// option to clip pages as HTML.
-// eslint-disable-next-line
-function getStyleSheets(doc) {
-	const output = [];
-	for (let i = 0; i < doc.styleSheets.length; i++) {
-		const sheet = doc.styleSheets[i];
-		try {
-			for (const cssRule of sheet.cssRules) {
-				output.push({ type: 'text', value: cssRule.cssText });
-			}
-		} catch (error) {
-			// Calling sheet.cssRules will throw a CORS error on Chrome if the stylesheet is on a different domain.
-			// In that case, we skip it and add it to the list of stylesheet URLs. These URls will be downloaded
-			// by the desktop application, since it doesn't have CORS restrictions.
-			// eslint-disable-next-line
-            console.info('Could not retrieve stylesheet now:', sheet.href);
-			// eslint-disable-next-line
-            console.info('It will downloaded by the main application.');
-			// eslint-disable-next-line
-            console.info(error);
-			output.push({ type: 'url', value: sheet.href });
-		}
-	}
-	return output;
-}
-exports.getStyleSheets = getStyleSheets;
-// # sourceMappingURL=clipperUtils.js.map

packages/app-clipper/content_scripts/index.js

@@ -307,7 +307,7 @@
 			cleanUpElement(convertToMarkup, cleanDocument, imageSizes, imageIndexes);
 
 			// eslint-disable-next-line no-undef
-			const stylesheets = convertToMarkup === 'html' ? getStyleSheets(document) : null;
+			const stylesheets = convertToMarkup === 'html' ? getStyleSheets(document) : [];
 
 			// The <BODY> tag may have a style in the CSS stylesheets. This
 			// style can be overriden by setting the `style` attribute on the

packages/app-clipper/content_scripts/setUpEnvironment.js

@@ -0,0 +1,6 @@
+// Our TypeScript config generates files that use CommonJS `export`s, which
+// aren't defined in a browser.
+//
+// While this is (somehow) fine in Chrome, it breaks the extension in Firefox.
+// We thus define window.exports:
+window.exports ??= {};

packages/app-clipper/package.json

@@ -2,7 +2,7 @@
   "name": "@joplin/app-clipper",
   "private": true,
   "scripts": {
-    "postinstall": "cd popup && npm install"
+    "build": "cd popup && npm install"
   },
   "version": "1.0.8",
   "description": "Joplin Web Clipper",

packages/app-clipper/popup/config/env.js

@@ -1,94 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const paths = require('./paths');
-
-// Make sure that including paths.js after env.js will read .env variables.
-delete require.cache[require.resolve('./paths')];
-
-const NODE_ENV = process.env.NODE_ENV;
-if (!NODE_ENV) {
-	throw new Error(
-		'The NODE_ENV environment variable is required but was not specified.',
-	);
-}
-
-// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-const dotenvFiles = [
-	`${paths.dotenv}.${NODE_ENV}.local`,
-	`${paths.dotenv}.${NODE_ENV}`,
-	// Don't include `.env.local` for `test` environment
-	// since normally you expect tests to produce the same
-	// results for everyone
-	NODE_ENV !== 'test' && `${paths.dotenv}.local`,
-	paths.dotenv,
-].filter(Boolean);
-
-// Load environment variables from .env* files. Suppress warnings using silent
-// if this file is missing. dotenv will never modify any environment variables
-// that have already been set.  Variable expansion is supported in .env files.
-// https://github.com/motdotla/dotenv
-// https://github.com/motdotla/dotenv-expand
-// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
-dotenvFiles.forEach(dotenvFile => {
-	if (fs.existsSync(dotenvFile)) {
-		require('dotenv-expand')(
-			require('dotenv').config({
-				path: dotenvFile,
-			}),
-		);
-	}
-});
-
-// We support resolving modules according to `NODE_PATH`.
-// This lets you use absolute paths in imports inside large monorepos:
-// https://github.com/facebook/create-react-app/issues/253.
-// It works similar to `NODE_PATH` in Node itself:
-// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
-// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
-// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
-// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421
-// We also resolve them to make sure all tools using them work consistently.
-const appDirectory = fs.realpathSync(process.cwd());
-process.env.NODE_PATH = (process.env.NODE_PATH || '')
-	.split(path.delimiter)
-	.filter(folder => folder && !path.isAbsolute(folder))
-	.map(folder => path.resolve(appDirectory, folder))
-	.join(path.delimiter);
-
-// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
-// injected into the application via DefinePlugin in Webpack configuration.
-const REACT_APP = /^REACT_APP_/i;
-
-function getClientEnvironment(publicUrl) {
-	const raw = Object.keys(process.env)
-		.filter(key => REACT_APP.test(key))
-		.reduce(
-			(env, key) => {
-				env[key] = process.env[key];
-				return env;
-			},
-			{
-				// Useful for determining whether we’re running in production mode.
-				// Most importantly, it switches React into the correct mode.
-				NODE_ENV: process.env.NODE_ENV || 'development',
-				// Useful for resolving the correct path to static assets in `public`.
-				// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
-				// This should only be used as an escape hatch. Normally you would put
-				// images into the `src` and `import` them in code to get their paths.
-				PUBLIC_URL: publicUrl,
-			},
-		);
-	// Stringify all values so we can feed into Webpack DefinePlugin
-	const stringified = {
-		'process.env': Object.keys(raw).reduce((env, key) => {
-			env[key] = JSON.stringify(raw[key]);
-			return env;
-		}, {}),
-	};
-
-	return { raw, stringified };
-}
-
-module.exports = getClientEnvironment;

packages/app-clipper/popup/config/jest/cssTransform.js

@@ -1,14 +0,0 @@
-'use strict';
-
-// This is a custom Jest transformer turning style imports into empty objects.
-// http://facebook.github.io/jest/docs/en/webpack.html
-
-module.exports = {
-	process() {
-		return 'module.exports = {};';
-	},
-	getCacheKey() {
-		// The output is always the same.
-		return 'cssTransform';
-	},
-};

packages/app-clipper/popup/config/jest/fileTransform.js

@@ -1,40 +0,0 @@
-'use strict';
-
-const path = require('path');
-const camelcase = require('camelcase');
-
-// This is a custom Jest transformer turning file imports into filenames.
-// http://facebook.github.io/jest/docs/en/webpack.html
-
-module.exports = {
-	process(src, filename) {
-		const assetFilename = JSON.stringify(path.basename(filename));
-
-		if (filename.match(/\.svg$/)) {
-			// Based on how SVGR generates a component name:
-			// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
-			const pascalCaseFilename = camelcase(path.parse(filename).name, {
-				pascalCase: true,
-			});
-			const componentName = `Svg${pascalCaseFilename}`;
-			return `const React = require('react');
-      module.exports = {
-        __esModule: true,
-        default: ${assetFilename},
-        ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
-          return {
-            $$typeof: Symbol.for('react.element'),
-            type: 'svg',
-            ref: ref,
-            key: null,
-            props: Object.assign({}, props, {
-              children: ${assetFilename}
-            })
-          };
-        }),
-      };`;
-		}
-
-		return `module.exports = ${assetFilename};`;
-	},
-};

packages/app-clipper/popup/config/modules.js

@@ -1,145 +0,0 @@
-/* eslint-disable multiline-comment-style */
-
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const paths = require('./paths');
-const chalk = require('react-dev-utils/chalk');
-const resolve = require('resolve');
-
-/**
- * Get additional module paths based on the baseUrl of a compilerOptions object.
- *
- * @param {Object} options
- */
-function getAdditionalModulePaths(options = {}) {
-	const baseUrl = options.baseUrl;
-
-	// We need to explicitly check for null and undefined (and not a falsy value) because
-	// TypeScript treats an empty string as `.`.
-	//
-	// eslint-disable-next-line eqeqeq
-	if (baseUrl == null) {
-		// If there's no baseUrl set we respect NODE_PATH
-		// Note that NODE_PATH is deprecated and will be removed
-		// in the next major release of create-react-app.
-
-		const nodePath = process.env.NODE_PATH || '';
-		return nodePath.split(path.delimiter).filter(Boolean);
-	}
-
-	const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
-
-	// We don't need to do anything if `baseUrl` is set to `node_modules`. This is
-	// the default behavior.
-	if (path.relative(paths.appNodeModules, baseUrlResolved) === '') {
-		return null;
-	}
-
-	// Allow the user set the `baseUrl` to `appSrc`.
-	if (path.relative(paths.appSrc, baseUrlResolved) === '') {
-		return [paths.appSrc];
-	}
-
-	// If the path is equal to the root directory we ignore it here.
-	// We don't want to allow importing from the root directly as source files are
-	// not transpiled outside of `src`. We do allow importing them with the
-	// absolute path (e.g. `src/Components/Button.js`) but we set that up with
-	// an alias.
-	if (path.relative(paths.appPath, baseUrlResolved) === '') {
-		return null;
-	}
-
-	// Otherwise, throw an error.
-	throw new Error(
-		chalk.red.bold(
-			'Your project\'s `baseUrl` can only be set to `src` or `node_modules`.' +
-        ' Create React App does not support other values at this time.',
-		),
-	);
-}
-
-/**
- * Get webpack aliases based on the baseUrl of a compilerOptions object.
- *
- * @param {*} options
- */
-function getWebpackAliases(options = {}) {
-	const baseUrl = options.baseUrl;
-
-	if (!baseUrl) {
-		return {};
-	}
-
-	const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
-
-	if (path.relative(paths.appPath, baseUrlResolved) === '') {
-		return {
-			src: paths.appSrc,
-		};
-	}
-}
-
-/**
- * Get jest aliases based on the baseUrl of a compilerOptions object.
- *
- * @param {*} options
- */
-function getJestAliases(options = {}) {
-	const baseUrl = options.baseUrl;
-
-	if (!baseUrl) {
-		return {};
-	}
-
-	const baseUrlResolved = path.resolve(paths.appPath, baseUrl);
-
-	if (path.relative(paths.appPath, baseUrlResolved) === '') {
-		return {
-			'^src/(.*)$': '<rootDir>/src/$1',
-		};
-	}
-}
-
-function getModules() {
-	// Check if TypeScript is setup
-	const hasTsConfig = fs.existsSync(paths.appTsConfig);
-	const hasJsConfig = fs.existsSync(paths.appJsConfig);
-
-	if (hasTsConfig && hasJsConfig) {
-		throw new Error(
-			'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.',
-		);
-	}
-
-	let config;
-
-	// If there's a tsconfig.json we assume it's a
-	// TypeScript project and set up the config
-	// based on tsconfig.json
-	if (hasTsConfig) {
-		const ts = require(resolve.sync('typescript', {
-			basedir: paths.appNodeModules,
-		}));
-		config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config;
-		// Otherwise we'll check if there is jsconfig.json
-		// for non TS projects.
-	} else if (hasJsConfig) {
-		config = require(paths.appJsConfig);
-	}
-
-	config = config || {};
-	const options = config.compilerOptions || {};
-
-	const additionalModulePaths = getAdditionalModulePaths(options);
-
-	return {
-		additionalModulePaths: additionalModulePaths,
-		webpackAliases: getWebpackAliases(options),
-		jestAliases: getJestAliases(options),
-		hasTsConfig,
-	};
-}
-
-module.exports = getModules();

packages/app-clipper/popup/config/paths.js

@@ -1,90 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const url = require('url');
-
-// Make sure any symlinks in the project folder are resolved:
-// https://github.com/facebook/create-react-app/issues/637
-const appDirectory = fs.realpathSync(process.cwd());
-const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
-
-const envPublicUrl = process.env.PUBLIC_URL;
-
-function ensureSlash(inputPath, needsSlash) {
-	const hasSlash = inputPath.endsWith('/');
-	if (hasSlash && !needsSlash) {
-		return inputPath.substr(0, inputPath.length - 1);
-	} else if (!hasSlash && needsSlash) {
-		return `${inputPath}/`;
-	} else {
-		return inputPath;
-	}
-}
-
-const getPublicUrl = appPackageJson =>
-	envPublicUrl || require(appPackageJson).homepage;
-
-// We use `PUBLIC_URL` environment variable or "homepage" field to infer
-// "public path" at which the app is served.
-// Webpack needs to know it to put the right <script> hrefs into HTML even in
-// single-page apps that may serve index.html for nested URLs like /todos/42.
-// We can't use a relative path in HTML because we don't want to load something
-// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
-function getServedPath(appPackageJson) {
-	const publicUrl = getPublicUrl(appPackageJson);
-	const servedUrl =
-    envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
-	return ensureSlash(servedUrl, true);
-}
-
-const moduleFileExtensions = [
-	'web.mjs',
-	'mjs',
-	'web.js',
-	'js',
-	'web.ts',
-	'ts',
-	'web.tsx',
-	'tsx',
-	'json',
-	'web.jsx',
-	'jsx',
-];
-
-// Resolve file paths in the same order as webpack
-const resolveModule = (resolveFn, filePath) => {
-	const extension = moduleFileExtensions.find(extension =>
-		fs.existsSync(resolveFn(`${filePath}.${extension}`)),
-	);
-
-	if (extension) {
-		return resolveFn(`${filePath}.${extension}`);
-	}
-
-	return resolveFn(`${filePath}.js`);
-};
-
-// config after eject: we're in ./config/
-module.exports = {
-	dotenv: resolveApp('.env'),
-	appPath: resolveApp('.'),
-	appBuild: resolveApp('build'),
-	appPublic: resolveApp('public'),
-	appHtml: resolveApp('public/index.html'),
-	appIndexJs: resolveModule(resolveApp, 'src/index'),
-	appPackageJson: resolveApp('package.json'),
-	appSrc: resolveApp('src'),
-	appTsConfig: resolveApp('tsconfig.json'),
-	appJsConfig: resolveApp('jsconfig.json'),
-	yarnLockFile: resolveApp('yarn.lock'),
-	testsSetup: resolveModule(resolveApp, 'src/setupTests'),
-	proxySetup: resolveApp('src/setupProxy.js'),
-	appNodeModules: resolveApp('node_modules'),
-	publicUrl: getPublicUrl(resolveApp('package.json')),
-	servedPath: getServedPath(resolveApp('package.json')),
-};
-
-
-
-module.exports.moduleFileExtensions = moduleFileExtensions;

packages/app-clipper/popup/config/pnpTs.js

@@ -1,35 +0,0 @@
-'use strict';
-
-const { resolveModuleName } = require('ts-pnp');
-
-exports.resolveModuleName = (
-	typescript,
-	moduleName,
-	containingFile,
-	compilerOptions,
-	resolutionHost,
-) => {
-	return resolveModuleName(
-		moduleName,
-		containingFile,
-		compilerOptions,
-		resolutionHost,
-		typescript.resolveModuleName,
-	);
-};
-
-exports.resolveTypeReferenceDirective = (
-	typescript,
-	moduleName,
-	containingFile,
-	compilerOptions,
-	resolutionHost,
-) => {
-	return resolveModuleName(
-		moduleName,
-		containingFile,
-		compilerOptions,
-		resolutionHost,
-		typescript.resolveTypeReferenceDirective,
-	);
-};

packages/app-clipper/popup/config/webpack.config.js

@@ -1,693 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
-const resolve = require('resolve');
-const PnpWebpackPlugin = require('pnp-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const safePostCssParser = require('postcss-safe-parser');
-const ManifestPlugin = require('webpack-manifest-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
-const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
-const paths = require('./paths');
-const modules = require('./modules');
-const getClientEnvironment = require('./env');
-const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
-const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
-const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
-const md5 = require('md5');
-
-class HashGen {
-
-  update(data) {
-    this.data_ = data;
-  }
-
-  digest() {
-    return md5(escape(this.data_));
-  }
-
-}
-
-const postcssNormalize = require('postcss-normalize');
-
-const appPackageJson = require(paths.appPackageJson);
-
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-// Some apps do not need the benefits of saving a web request, so not inlining the chunk
-// makes for a smoother build process.
-const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
-
-const imageInlineSizeLimit = parseInt(
-  process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
-);
-
-// Check if TypeScript is setup
-const useTypeScript = fs.existsSync(paths.appTsConfig);
-
-// style files regexes
-const cssRegex = /\.css$/;
-const cssModuleRegex = /\.module\.css$/;
-const sassRegex = /\.(scss|sass)$/;
-const sassModuleRegex = /\.module\.(scss|sass)$/;
-
-// This is the production and development configuration.
-// It is focused on developer experience, fast rebuilds, and a minimal bundle.
-module.exports = function(webpackEnv) {
-  const isEnvDevelopment = webpackEnv === 'development';
-  const isEnvProduction = webpackEnv === 'production';
-
-  // Variable used for enabling profiling in Production
-  // passed into alias object. Uses a flag if passed into the build command
-  const isEnvProductionProfile =
-    isEnvProduction && process.argv.includes('--profile');
-
-  // Webpack uses `publicPath` to determine where the app is being served from.
-  // It requires a trailing slash, or the file assets will get an incorrect path.
-  // In development, we always serve from the root. This makes config easier.
-  const publicPath = isEnvProduction
-    ? paths.servedPath
-    : isEnvDevelopment && '/';
-  // Some apps do not use client-side routing with pushState.
-  // For these, "homepage" can be set to "." to enable relative asset paths.
-  const shouldUseRelativeAssetPaths = publicPath === './';
-
-  // `publicUrl` is just like `publicPath`, but we will provide it to our app
-  // as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-  // Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-  const publicUrl = isEnvProduction
-    ? publicPath.slice(0, -1)
-    : isEnvDevelopment && '';
-  // Get environment variables to inject into our app.
-  const env = getClientEnvironment(publicUrl);
-
-  // common function to get style loaders
-  const getStyleLoaders = (cssOptions, preProcessor) => {
-    const loaders = [
-      isEnvDevelopment && require.resolve('style-loader'),
-      isEnvProduction && {
-        loader: MiniCssExtractPlugin.loader,
-        options: shouldUseRelativeAssetPaths ? { publicPath: '../../' } : {},
-      },
-      {
-        loader: require.resolve('css-loader'),
-        options: cssOptions,
-      },
-      {
-        // Options for PostCSS as we reference these options twice
-        // Adds vendor prefixing based on your specified browser support in
-        // package.json
-        loader: require.resolve('postcss-loader'),
-        options: {
-          // Necessary for external CSS imports to work
-          // https://github.com/facebook/create-react-app/issues/2677
-          ident: 'postcss',
-          plugins: () => [
-            require('postcss-flexbugs-fixes'),
-            require('postcss-preset-env')({
-              autoprefixer: {
-                flexbox: 'no-2009',
-              },
-              stage: 3,
-            }),
-            // Adds PostCSS Normalize as the reset css with default options,
-            // so that it honors browserslist config in package.json
-            // which in turn let's users customize the target behavior as per their needs.
-            postcssNormalize(),
-          ],
-          sourceMap: isEnvProduction && shouldUseSourceMap,
-        },
-      },
-    ].filter(Boolean);
-    if (preProcessor) {
-      loaders.push(
-        {
-          loader: require.resolve('resolve-url-loader'),
-          options: {
-            sourceMap: isEnvProduction && shouldUseSourceMap,
-          },
-        },
-        {
-          loader: require.resolve(preProcessor),
-          options: {
-            sourceMap: true,
-          },
-        }
-      );
-    }
-    return loaders;
-  };
-
-  return {
-    mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
-    // Stop compilation early in production
-    bail: isEnvProduction,
-    devtool: isEnvProduction
-      ? shouldUseSourceMap
-        ? 'source-map'
-        : false
-      : isEnvDevelopment && 'cheap-module-source-map',
-    // These are the "entry points" to our application.
-    // This means they will be the "root" imports that are included in JS bundle.
-    entry: [
-      // Include an alternative client for WebpackDevServer. A client's job is to
-      // connect to WebpackDevServer by a socket and get notified about changes.
-      // When you save a file, the client will either apply hot updates (in case
-      // of CSS changes), or refresh the page (in case of JS changes). When you
-      // make a syntax error, this client will display a syntax error overlay.
-      // Note: instead of the default WebpackDevServer client, we use a custom one
-      // to bring better experience for Create React App users. You can replace
-      // the line below with these two lines if you prefer the stock client:
-      // require.resolve('webpack-dev-server/client') + '?/',
-      // require.resolve('webpack/hot/dev-server'),
-      isEnvDevelopment &&
-        require.resolve('react-dev-utils/webpackHotDevClient'),
-      // Finally, this is your app's code:
-      paths.appIndexJs,
-      // We include the app code last so that if there is a runtime error during
-      // initialization, it doesn't blow up the WebpackDevServer client, and
-      // changing JS code would still trigger a refresh.
-    ].filter(Boolean),
-    output: {
-      // Needed to fix this: https://www.reddit.com/r/webdev/comments/qd14bm/node_17_currently_breaks_most_webpack/
-      hashFunction: HashGen,
-      // The build folder.
-      path: isEnvProduction ? paths.appBuild : undefined,
-      // Add /* filename */ comments to generated require()s in the output.
-      pathinfo: isEnvDevelopment,
-      // There will be one main bundle, and one file per asynchronous chunk.
-      // In development, it does not produce real files.
-      filename: isEnvProduction
-        ? 'static/js/[name].js'
-        : isEnvDevelopment && 'static/js/bundle.js',
-      // TODO: remove this when upgrading to webpack 5
-      futureEmitAssets: true,
-      // There are also additional JS chunk files if you use code splitting.
-      chunkFilename: isEnvProduction
-        ? 'static/js/[name].chunk.js'
-        : isEnvDevelopment && 'static/js/[name].chunk.js',
-      // We inferred the "public path" (such as / or /my-project) from homepage.
-      // We use "/" in development.
-      publicPath: publicPath,
-      // Point sourcemap entries to original disk location (format as URL on Windows)
-      devtoolModuleFilenameTemplate: isEnvProduction
-        ? info =>
-            path
-              .relative(paths.appSrc, info.absoluteResourcePath)
-              .replace(/\\/g, '/')
-        : isEnvDevelopment &&
-          (info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
-      // Prevents conflicts when multiple Webpack runtimes (from different apps)
-      // are used on the same page.
-      jsonpFunction: `webpackJsonp${appPackageJson.name}`,
-      // this defaults to 'window', but by setting it to 'this' then
-      // module chunks which are built will work in web workers as well.
-      globalObject: 'this',
-    },
-    optimization: {
-      minimize: isEnvProduction,
-      minimizer: [
-        // This is only used in production mode
-        new TerserPlugin({
-          terserOptions: {
-            parse: {
-              // We want terser to parse ecma 8 code. However, we don't want it
-              // to apply any minification steps that turns valid ecma 5 code
-              // into invalid ecma 5 code. This is why the 'compress' and 'output'
-              // sections only apply transformations that are ecma 5 safe
-              // https://github.com/facebook/create-react-app/pull/4234
-              ecma: 8,
-            },
-            compress: {
-              ecma: 5,
-              warnings: false,
-              // Disabled because of an issue with Uglify breaking seemingly valid code:
-              // https://github.com/facebook/create-react-app/issues/2376
-              // Pending further investigation:
-              // https://github.com/mishoo/UglifyJS2/issues/2011
-              comparisons: false,
-              // Disabled because of an issue with Terser breaking valid code:
-              // https://github.com/facebook/create-react-app/issues/5250
-              // Pending further investigation:
-              // https://github.com/terser-js/terser/issues/120
-              inline: 2,
-            },
-            mangle: {
-              safari10: true,
-            },
-            // Added for profiling in devtools
-            keep_classnames: isEnvProductionProfile,
-            keep_fnames: isEnvProductionProfile,
-            output: {
-              ecma: 5,
-              comments: false,
-              // Turned on because emoji and regex is not minified properly using default
-              // https://github.com/facebook/create-react-app/issues/2488
-              ascii_only: true,
-            },
-          },
-          sourceMap: shouldUseSourceMap,
-        }),
-        // This is only used in production mode
-        new OptimizeCSSAssetsPlugin({
-          cssProcessorOptions: {
-            parser: safePostCssParser,
-            map: shouldUseSourceMap
-              ? {
-                  // `inline: false` forces the sourcemap to be output into a
-                  // separate file
-                  inline: false,
-                  // `annotation: true` appends the sourceMappingURL to the end of
-                  // the css file, helping the browser find the sourcemap
-                  annotation: true,
-                }
-              : false,
-          },
-          cssProcessorPluginOptions: {
-              preset: ['default', { minifyFontValues: { removeQuotes: false } }]
-          }
-        }),
-      ],
-      // Automatically split vendor and commons
-      // https://twitter.com/wSokra/status/969633336732905474
-      // https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
-      splitChunks: {
-        chunks: 'all',
-        name: false,
-      },
-      // Keep the runtime chunk separated to enable long term caching
-      // https://twitter.com/wSokra/status/969679223278505985
-      // https://github.com/facebook/create-react-app/issues/5358
-      runtimeChunk: {
-        name: entrypoint => `runtime-${entrypoint.name}`,
-      },
-    },
-    resolve: {
-      // This allows you to set a fallback for where Webpack should look for modules.
-      // We placed these paths second because we want `node_modules` to "win"
-      // if there are any conflicts. This matches Node resolution mechanism.
-      // https://github.com/facebook/create-react-app/issues/253
-      modules: ['node_modules', paths.appNodeModules].concat(
-        modules.additionalModulePaths || []
-      ),
-      // These are the reasonable defaults supported by the Node ecosystem.
-      // We also include JSX as a common component filename extension to support
-      // some tools, although we do not recommend using it, see:
-      // https://github.com/facebook/create-react-app/issues/290
-      // `web` extension prefixes have been added for better support
-      // for React Native Web.
-      extensions: paths.moduleFileExtensions
-        .map(ext => `.${ext}`)
-        .filter(ext => useTypeScript || !ext.includes('ts')),
-      alias: {
-        // Support React Native Web
-        // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-        'react-native': 'react-native-web',
-        // Allows for better profiling with ReactDevTools
-        ...(isEnvProductionProfile && {
-          'react-dom$': 'react-dom/profiling',
-          'scheduler/tracing': 'scheduler/tracing-profiling',
-        }),
-        ...(modules.webpackAliases || {}),
-      },
-      plugins: [
-        // Adds support for installing with Plug'n'Play, leading to faster installs and adding
-        // guards against forgotten dependencies and such.
-        PnpWebpackPlugin,
-        // Prevents users from importing files from outside of src/ (or node_modules/).
-        // This often causes confusion because we only process files within src/ with babel.
-        // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-        // please link the files into your node_modules/ and let module-resolution kick in.
-        // Make sure your source files are compiled, as they will not be processed in any way.
-        new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-      ],
-    },
-    resolveLoader: {
-      plugins: [
-        // Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
-        // from the current package.
-        PnpWebpackPlugin.moduleLoader(module),
-      ],
-    },
-    module: {
-      strictExportPresence: true,
-      rules: [
-        // Disable require.ensure as it's not a standard language feature.
-        { parser: { requireEnsure: false } },
-        // First, run the linter.
-        // It's important to do this before Babel processes the JS.
-        // 
-        // JOPLINMOD: cra-build-watch expects the webpack config files to have
-        // keys in a certain order so we can't remove any. However we don't
-        // want their eslint config, so to disable it we make it watch extensions
-        // that don't exist.
-        {
-          test: /\.(DISABLEDDISABLED)$/,
-          enforce: 'pre',
-          use: [
-            {
-              options: {
-                cache: true,
-                formatter: require.resolve('react-dev-utils/eslintFormatter'),
-                eslintPath: require.resolve('eslint'),
-                resolvePluginsRelativeTo: __dirname,
-                
-              },
-              loader: require.resolve('eslint-loader'),
-            },
-          ],
-          include: paths.appSrc,
-        },
-        {
-          // "oneOf" will traverse all following loaders until one will
-          // match the requirements. When no loader matches it will fall
-          // back to the "file" loader at the end of the loader list.
-          oneOf: [
-            // "url" loader works like "file" loader except that it embeds assets
-            // smaller than specified limit in bytes as data URLs to avoid requests.
-            // A missing `test` is equivalent to a match.
-            {
-              test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-              loader: require.resolve('url-loader'),
-              options: {
-                limit: imageInlineSizeLimit,
-                name: 'static/media/[name].[hash:8].[ext]',
-              },
-            },
-            // Process application JS with Babel.
-            // The preset includes JSX, Flow, TypeScript, and some ESnext features.
-            {
-              test: /\.(js|mjs|jsx|ts|tsx)$/,
-              include: paths.appSrc,
-              loader: require.resolve('babel-loader'),
-              options: {
-                customize: require.resolve(
-                  'babel-preset-react-app/webpack-overrides'
-                ),                
-                plugins: [
-                  [
-                    require.resolve('babel-plugin-named-asset-import'),
-                    {
-                      loaderMap: {
-                        svg: {
-                          ReactComponent:
-                            '@svgr/webpack?-svgo,+titleProp,+ref![path]',
-                        },
-                      },
-                    },
-                  ],
-                ],
-                // This is a feature of `babel-loader` for webpack (not Babel itself).
-                // It enables caching results in ./node_modules/.cache/babel-loader/
-                // directory for faster rebuilds.
-                cacheDirectory: true,
-                // See #6846 for context on why cacheCompression is disabled
-                cacheCompression: false,
-                compact: isEnvProduction,
-              },
-            },
-            // Process any JS outside of the app with Babel.
-            // Unlike the application JS, we only compile the standard ES features.
-            {
-              test: /\.(js|mjs)$/,
-              exclude: /@babel(?:\/|\\{1,2})runtime/,
-              loader: require.resolve('babel-loader'),
-              options: {
-                babelrc: false,
-                configFile: false,
-                compact: false,
-                presets: [
-                  [
-                    require.resolve('babel-preset-react-app/dependencies'),
-                    { helpers: true },
-                  ],
-                ],
-                cacheDirectory: true,
-                // See #6846 for context on why cacheCompression is disabled
-                cacheCompression: false,
-                // Babel sourcemaps are needed for debugging into node_modules
-                // code.  Without the options below, debuggers like VSCode
-                // show incorrect code and set breakpoints on the wrong lines.
-                sourceMaps: shouldUseSourceMap,
-                inputSourceMap: shouldUseSourceMap,
-              },
-            },
-            // "postcss" loader applies autoprefixer to our CSS.
-            // "css" loader resolves paths in CSS and adds assets as dependencies.
-            // "style" loader turns CSS into JS modules that inject <style> tags.
-            // In production, we use MiniCSSExtractPlugin to extract that CSS
-            // to a file, but in development "style" loader enables hot editing
-            // of CSS.
-            // By default we support CSS Modules with the extension .module.css
-            {
-              test: cssRegex,
-              exclude: cssModuleRegex,
-              use: getStyleLoaders({
-                importLoaders: 1,
-                sourceMap: isEnvProduction && shouldUseSourceMap,
-              }),
-              // Don't consider CSS imports dead code even if the
-              // containing package claims to have no side effects.
-              // Remove this when webpack adds a warning or an error for this.
-              // See https://github.com/webpack/webpack/issues/6571
-              sideEffects: true,
-            },
-            // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
-            // using the extension .module.css
-            {
-              test: cssModuleRegex,
-              use: getStyleLoaders({
-                importLoaders: 1,
-                sourceMap: isEnvProduction && shouldUseSourceMap,
-                modules: {
-                  getLocalIdent: getCSSModuleLocalIdent,
-                },
-              }),
-            },
-            // Opt-in support for SASS (using .scss or .sass extensions).
-            // By default we support SASS Modules with the
-            // extensions .module.scss or .module.sass
-            {
-              test: sassRegex,
-              exclude: sassModuleRegex,
-              use: getStyleLoaders(
-                {
-                  importLoaders: 3,
-                  sourceMap: isEnvProduction && shouldUseSourceMap,
-                },
-                'sass-loader'
-              ),
-              // Don't consider CSS imports dead code even if the
-              // containing package claims to have no side effects.
-              // Remove this when webpack adds a warning or an error for this.
-              // See https://github.com/webpack/webpack/issues/6571
-              sideEffects: true,
-            },
-            // Adds support for CSS Modules, but using SASS
-            // using the extension .module.scss or .module.sass
-            {
-              test: sassModuleRegex,
-              use: getStyleLoaders(
-                {
-                  importLoaders: 3,
-                  sourceMap: isEnvProduction && shouldUseSourceMap,
-                  modules: {
-                    getLocalIdent: getCSSModuleLocalIdent,
-                  },
-                },
-                'sass-loader'
-              ),
-            },
-            // "file" loader makes sure those assets get served by WebpackDevServer.
-            // When you `import` an asset, you get its (virtual) filename.
-            // In production, they would get copied to the `build` folder.
-            // This loader doesn't use a "test" so it will catch all modules
-            // that fall through the other loaders.
-            {
-              loader: require.resolve('file-loader'),
-              // Exclude `js` files to keep "css" loader working as it injects
-              // its runtime that would otherwise be processed through "file" loader.
-              // Also exclude `html` and `json` extensions so they get processed
-              // by webpacks internal loaders.
-              exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
-              options: {
-                name: 'static/media/[name].[hash:8].[ext]',
-              },
-            },
-            // ** STOP ** Are you adding a new loader?
-            // Make sure to add the new loader(s) before the "file" loader.
-          ],
-        },
-      ],
-    },
-    plugins: [
-      // Generates an `index.html` file with the <script> injected.
-      new HtmlWebpackPlugin(
-        Object.assign(
-          {},
-          {
-            inject: true,
-            template: paths.appHtml,
-          },
-          isEnvProduction
-            ? {
-                minify: {
-                  removeComments: true,
-                  collapseWhitespace: true,
-                  removeRedundantAttributes: true,
-                  useShortDoctype: true,
-                  removeEmptyAttributes: true,
-                  removeStyleLinkTypeAttributes: true,
-                  keepClosingSlash: true,
-                  minifyJS: true,
-                  minifyCSS: true,
-                  minifyURLs: true,
-                },
-              }
-            : undefined
-        )
-      ),
-      // Inlines the webpack runtime script. This script is too small to warrant
-      // a network request.
-      // https://github.com/facebook/create-react-app/issues/5358
-      isEnvProduction &&
-        shouldInlineRuntimeChunk &&
-        new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime-.+[.]js/]),
-      // Makes some environment variables available in index.html.
-      // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-      // <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
-      // In production, it will be an empty string unless you specify "homepage"
-      // in `package.json`, in which case it will be the pathname of that URL.
-      // In development, this will be an empty string.
-      new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
-      // This gives some necessary context to module not found errors, such as
-      // the requesting resource.
-      new ModuleNotFoundPlugin(paths.appPath),
-      // Makes some environment variables available to the JS code, for example:
-      // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-      // It is absolutely essential that NODE_ENV is set to production
-      // during a production build.
-      // Otherwise React will be compiled in the very slow development mode.
-      new webpack.DefinePlugin(env.stringified),
-      // This is necessary to emit hot updates (currently CSS only):
-      isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
-      // Watcher doesn't work well if you mistype casing in a path so we use
-      // a plugin that prints an error when you attempt to do this.
-      // See https://github.com/facebook/create-react-app/issues/240
-      isEnvDevelopment && new CaseSensitivePathsPlugin(),
-      // If you require a missing module and then `npm install` it, you still have
-      // to restart the development server for Webpack to discover it. This plugin
-      // makes the discovery automatic so you don't have to restart.
-      // See https://github.com/facebook/create-react-app/issues/186
-      isEnvDevelopment &&
-        new WatchMissingNodeModulesPlugin(paths.appNodeModules),
-      isEnvProduction &&
-        new MiniCssExtractPlugin({
-          // Options similar to the same options in webpackOptions.output
-          // both options are optional
-          filename: 'static/css/[name].css',
-          chunkFilename: 'static/css/[name].chunk.css',
-        }),
-      // Generate an asset manifest file with the following content:
-      // - "files" key: Mapping of all asset filenames to their corresponding
-      //   output file so that tools can pick it up without having to parse
-      //   `index.html`
-      // - "entrypoints" key: Array of files which are included in `index.html`,
-      //   can be used to reconstruct the HTML if necessary
-      new ManifestPlugin({
-        fileName: 'asset-manifest.json',
-        publicPath: publicPath,
-        generate: (seed, files, entrypoints) => {
-          const manifestFiles = files.reduce((manifest, file) => {
-            manifest[file.name] = file.path;
-            return manifest;
-          }, seed);
-          const entrypointFiles = entrypoints.main.filter(
-            fileName => !fileName.endsWith('.map')
-          );
-
-          return {
-            files: manifestFiles,
-            entrypoints: entrypointFiles,
-          };
-        },
-      }),
-      // Moment.js is an extremely popular library that bundles large locale files
-      // by default due to how Webpack interprets its code. This is a practical
-      // solution that requires the user to opt into importing specific locales.
-      // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-      // You can remove this if you don't use Moment.js:
-      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-      // Generate a service worker script that will precache, and keep up to date,
-      // the HTML & assets that are part of the Webpack build.
-      // isEnvProduction &&
-   //      new WorkboxWebpackPlugin.GenerateSW({
-   //       clientsClaim: true,
-   //       exclude: [/\.map$/, /asset-manifest\.json$/],
-   //       importWorkboxFrom: 'cdn',
-   //       navigateFallback: `${publicUrl}/index.html`,
-   //       navigateFallbackBlacklist: [
-   //         // Exclude URLs starting with /_, as they're likely an API call
-   //         new RegExp('^/_'),
-   //         // Exclude any URLs whose last part seems to be a file extension
-   //         // as they're likely a resource and not a SPA route.
-   //         // URLs containing a "?" character won't be blacklisted as they're likely
-   //         // a route with query params (e.g. auth callbacks).
-   //         new RegExp('/[^/?]+\\.[^/]+$'),
-   //       ],
-   //      }),
-      // TypeScript type checking
-      useTypeScript &&
-        new ForkTsCheckerWebpackPlugin({
-          typescript: resolve.sync('typescript', {
-            basedir: paths.appNodeModules,
-          }),
-          async: isEnvDevelopment,
-          useTypescriptIncrementalApi: true,
-          checkSyntacticErrors: true,
-          resolveModuleNameModule: process.versions.pnp
-            ? `${__dirname}/pnpTs.js`
-            : undefined,
-          resolveTypeReferenceDirectiveModule: process.versions.pnp
-            ? `${__dirname}/pnpTs.js`
-            : undefined,
-          tsconfig: paths.appTsConfig,
-          reportFiles: [
-            '**',
-            '!**/__tests__/**',
-            '!**/?(*.)(spec|test).*',
-            '!**/src/setupProxy.*',
-            '!**/src/setupTests.*',
-          ],
-          silent: true,
-          // The formatter is invoked directly in WebpackDevServerUtils during development
-          formatter: isEnvProduction ? typescriptFormatter : undefined,
-        }),
-    ].filter(Boolean),
-    // Some libraries import Node modules but don't use them in the browser.
-    // Tell Webpack to provide empty mocks for them so importing them works.
-    node: {
-      module: 'empty',
-      dgram: 'empty',
-      dns: 'mock',
-      fs: 'empty',
-      http2: 'empty',
-      net: 'empty',
-      tls: 'empty',
-      child_process: 'empty',
-    },
-    // Turn off performance processing because we utilize
-    // our own hints via the FileSizeReporter
-    performance: false,
-  };
-};

packages/app-clipper/popup/config/webpackDevServer.config.js

@@ -1,110 +0,0 @@
-'use strict';
-
-const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
-const evalSourceMapMiddleware = require('react-dev-utils/evalSourceMapMiddleware');
-const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
-const ignoredFiles = require('react-dev-utils/ignoredFiles');
-const paths = require('./paths');
-const fs = require('fs');
-
-const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
-const host = process.env.HOST || '0.0.0.0';
-
-module.exports = function(proxy, allowedHost) {
-	return {
-		// WebpackDevServer 2.4.3 introduced a security fix that prevents remote
-		// websites from potentially accessing local content through DNS rebinding:
-		// https://github.com/webpack/webpack-dev-server/issues/887
-		// https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
-		// However, it made several existing use cases such as development in cloud
-		// environment or subdomains in development significantly more complicated:
-		// https://github.com/facebook/create-react-app/issues/2271
-		// https://github.com/facebook/create-react-app/issues/2233
-		// While we're investigating better solutions, for now we will take a
-		// compromise. Since our WDS configuration only serves files in the `public`
-		// folder we won't consider accessing them a vulnerability. However, if you
-		// use the `proxy` feature, it gets more dangerous because it can expose
-		// remote code execution vulnerabilities in backends like Django and Rails.
-		// So we will disable the host check normally, but enable it if you have
-		// specified the `proxy` setting. Finally, we let you override it if you
-		// really know what you're doing with a special environment variable.
-		disableHostCheck:
-      !proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true',
-		// Enable gzip compression of generated files.
-		compress: true,
-		// Silence WebpackDevServer's own logs since they're generally not useful.
-		// It will still show compile warnings and errors with this setting.
-		clientLogLevel: 'none',
-		// By default WebpackDevServer serves physical files from current directory
-		// in addition to all the virtual build products that it serves from memory.
-		// This is confusing because those files won’t automatically be available in
-		// production build folder unless we copy them. However, copying the whole
-		// project directory is dangerous because we may expose sensitive files.
-		// Instead, we establish a convention that only files in `public` directory
-		// get served. Our build script will copy `public` into the `build` folder.
-		// In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%:
-		// <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
-		// In JavaScript code, you can access it with `process.env.PUBLIC_URL`.
-		// Note that we only recommend to use `public` folder as an escape hatch
-		// for files like `favicon.ico`, `manifest.json`, and libraries that are
-		// for some reason broken when imported through Webpack. If you just want to
-		// use an image, put it in `src` and `import` it from JavaScript instead.
-		contentBase: paths.appPublic,
-		// By default files from `contentBase` will not trigger a page reload.
-		watchContentBase: true,
-		// Enable hot reloading server. It will provide /sockjs-node/ endpoint
-		// for the WebpackDevServer client so it can learn when the files were
-		// updated. The WebpackDevServer client is included as an entry point
-		// in the Webpack development configuration. Note that only changes
-		// to CSS are currently hot reloaded. JS changes will refresh the browser.
-		hot: true,
-		// Use 'ws' instead of 'sockjs-node' on server since we're using native
-		// websockets in `webpackHotDevClient`.
-		transportMode: 'ws',
-		// Prevent a WS client from getting injected as we're already including
-		// `webpackHotDevClient`.
-		injectClient: false,
-		// It is important to tell WebpackDevServer to use the same "root" path
-		// as we specified in the config. In development, we always serve from /.
-		publicPath: '/',
-		// WebpackDevServer is noisy by default so we emit custom message instead
-		// by listening to the compiler events with `compiler.hooks[...].tap` calls above.
-		quiet: true,
-		// Reportedly, this avoids CPU overload on some systems.
-		// https://github.com/facebook/create-react-app/issues/293
-		// src/node_modules is not ignored to support absolute imports
-		// https://github.com/facebook/create-react-app/issues/1065
-		watchOptions: {
-			ignored: ignoredFiles(paths.appSrc),
-		},
-		// Enable HTTPS if the HTTPS environment variable is set to 'true'
-		https: protocol === 'https',
-		host,
-		overlay: false,
-		historyApiFallback: {
-			// Paths with dots should still use the history fallback.
-			// See https://github.com/facebook/create-react-app/issues/387.
-			disableDotRule: true,
-		},
-		public: allowedHost,
-		proxy,
-		before(app, server) {
-			if (fs.existsSync(paths.proxySetup)) {
-				// This registers user provided middleware for proxy reasons
-				require(paths.proxySetup)(app);
-			}
-
-			// This lets us fetch source contents from webpack for the error overlay
-			app.use(evalSourceMapMiddleware(server));
-			// This lets us open files from the runtime error overlay.
-			app.use(errorOverlayMiddleware());
-
-			// This service worker file is effectively a 'no-op' that will reset any
-			// previous service worker registered for the same host:port combination.
-			// We do this in development to avoid hitting the production cache if
-			// it used the same host and port.
-			// https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
-			app.use(noopServiceWorkerMiddleware());
-		},
-	};
-};

packages/app-clipper/popup/config/webpack_config_at_eject_time.js

@@ -1,676 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
-const resolve = require('resolve');
-const PnpWebpackPlugin = require('pnp-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
-const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
-const TerserPlugin = require('terser-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const safePostCssParser = require('postcss-safe-parser');
-const ManifestPlugin = require('webpack-manifest-plugin');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const WorkboxWebpackPlugin = require('workbox-webpack-plugin');
-const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
-const paths = require('./paths');
-const modules = require('./modules');
-const getClientEnvironment = require('./env');
-const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
-const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
-const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
-
-const postcssNormalize = require('postcss-normalize');
-
-const appPackageJson = require(paths.appPackageJson);
-
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
-// Some apps do not need the benefits of saving a web request, so not inlining the chunk
-// makes for a smoother build process.
-const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
-
-const imageInlineSizeLimit = parseInt(
-  process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
-);
-
-// Check if TypeScript is setup
-const useTypeScript = fs.existsSync(paths.appTsConfig);
-
-// style files regexes
-const cssRegex = /\.css$/;
-const cssModuleRegex = /\.module\.css$/;
-const sassRegex = /\.(scss|sass)$/;
-const sassModuleRegex = /\.module\.(scss|sass)$/;
-
-// This is the production and development configuration.
-// It is focused on developer experience, fast rebuilds, and a minimal bundle.
-module.exports = function(webpackEnv) {
-  const isEnvDevelopment = webpackEnv === 'development';
-  const isEnvProduction = webpackEnv === 'production';
-
-  // Variable used for enabling profiling in Production
-  // passed into alias object. Uses a flag if passed into the build command
-  const isEnvProductionProfile =
-    isEnvProduction && process.argv.includes('--profile');
-
-  // Webpack uses `publicPath` to determine where the app is being served from.
-  // It requires a trailing slash, or the file assets will get an incorrect path.
-  // In development, we always serve from the root. This makes config easier.
-  const publicPath = isEnvProduction
-    ? paths.servedPath
-    : isEnvDevelopment && '/';
-  // Some apps do not use client-side routing with pushState.
-  // For these, "homepage" can be set to "." to enable relative asset paths.
-  const shouldUseRelativeAssetPaths = publicPath === './';
-
-  // `publicUrl` is just like `publicPath`, but we will provide it to our app
-  // as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-  // Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-  const publicUrl = isEnvProduction
-    ? publicPath.slice(0, -1)
-    : isEnvDevelopment && '';
-  // Get environment variables to inject into our app.
-  const env = getClientEnvironment(publicUrl);
-
-  // common function to get style loaders
-  const getStyleLoaders = (cssOptions, preProcessor) => {
-    const loaders = [
-      isEnvDevelopment && require.resolve('style-loader'),
-      isEnvProduction && {
-        loader: MiniCssExtractPlugin.loader,
-        options: shouldUseRelativeAssetPaths ? { publicPath: '../../' } : {},
-      },
-      {
-        loader: require.resolve('css-loader'),
-        options: cssOptions,
-      },
-      {
-        // Options for PostCSS as we reference these options twice
-        // Adds vendor prefixing based on your specified browser support in
-        // package.json
-        loader: require.resolve('postcss-loader'),
-        options: {
-          // Necessary for external CSS imports to work
-          // https://github.com/facebook/create-react-app/issues/2677
-          ident: 'postcss',
-          plugins: () => [
-            require('postcss-flexbugs-fixes'),
-            require('postcss-preset-env')({
-              autoprefixer: {
-                flexbox: 'no-2009',
-              },
-              stage: 3,
-            }),
-            // Adds PostCSS Normalize as the reset css with default options,
-            // so that it honors browserslist config in package.json
-            // which in turn let's users customize the target behavior as per their needs.
-            postcssNormalize(),
-          ],
-          sourceMap: isEnvProduction && shouldUseSourceMap,
-        },
-      },
-    ].filter(Boolean);
-    if (preProcessor) {
-      loaders.push(
-        {
-          loader: require.resolve('resolve-url-loader'),
-          options: {
-            sourceMap: isEnvProduction && shouldUseSourceMap,
-          },
-        },
-        {
-          loader: require.resolve(preProcessor),
-          options: {
-            sourceMap: true,
-          },
-        }
-      );
-    }
-    return loaders;
-  };
-
-  return {
-    mode: isEnvProduction ? 'production' : isEnvDevelopment && 'development',
-    // Stop compilation early in production
-    bail: isEnvProduction,
-    devtool: isEnvProduction
-      ? shouldUseSourceMap
-        ? 'source-map'
-        : false
-      : isEnvDevelopment && 'cheap-module-source-map',
-    // These are the "entry points" to our application.
-    // This means they will be the "root" imports that are included in JS bundle.
-    entry: [
-      // Include an alternative client for WebpackDevServer. A client's job is to
-      // connect to WebpackDevServer by a socket and get notified about changes.
-      // When you save a file, the client will either apply hot updates (in case
-      // of CSS changes), or refresh the page (in case of JS changes). When you
-      // make a syntax error, this client will display a syntax error overlay.
-      // Note: instead of the default WebpackDevServer client, we use a custom one
-      // to bring better experience for Create React App users. You can replace
-      // the line below with these two lines if you prefer the stock client:
-      // require.resolve('webpack-dev-server/client') + '?/',
-      // require.resolve('webpack/hot/dev-server'),
-      isEnvDevelopment &&
-        require.resolve('react-dev-utils/webpackHotDevClient'),
-      // Finally, this is your app's code:
-      paths.appIndexJs,
-      // We include the app code last so that if there is a runtime error during
-      // initialization, it doesn't blow up the WebpackDevServer client, and
-      // changing JS code would still trigger a refresh.
-    ].filter(Boolean),
-    output: {
-      // The build folder.
-      path: isEnvProduction ? paths.appBuild : undefined,
-      // Add /* filename */ comments to generated require()s in the output.
-      pathinfo: isEnvDevelopment,
-      // There will be one main bundle, and one file per asynchronous chunk.
-      // In development, it does not produce real files.
-      filename: isEnvProduction
-        ? 'static/js/[name].[contenthash:8].js'
-        : isEnvDevelopment && 'static/js/bundle.js',
-      // TODO: remove this when upgrading to webpack 5
-      futureEmitAssets: true,
-      // There are also additional JS chunk files if you use code splitting.
-      chunkFilename: isEnvProduction
-        ? 'static/js/[name].[contenthash:8].chunk.js'
-        : isEnvDevelopment && 'static/js/[name].chunk.js',
-      // We inferred the "public path" (such as / or /my-project) from homepage.
-      // We use "/" in development.
-      publicPath: publicPath,
-      // Point sourcemap entries to original disk location (format as URL on Windows)
-      devtoolModuleFilenameTemplate: isEnvProduction
-        ? info =>
-            path
-              .relative(paths.appSrc, info.absoluteResourcePath)
-              .replace(/\\/g, '/')
-        : isEnvDevelopment &&
-          (info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
-      // Prevents conflicts when multiple Webpack runtimes (from different apps)
-      // are used on the same page.
-      jsonpFunction: `webpackJsonp${appPackageJson.name}`,
-      // this defaults to 'window', but by setting it to 'this' then
-      // module chunks which are built will work in web workers as well.
-      globalObject: 'this',
-    },
-    optimization: {
-      minimize: isEnvProduction,
-      minimizer: [
-        // This is only used in production mode
-        new TerserPlugin({
-          terserOptions: {
-            parse: {
-              // We want terser to parse ecma 8 code. However, we don't want it
-              // to apply any minification steps that turns valid ecma 5 code
-              // into invalid ecma 5 code. This is why the 'compress' and 'output'
-              // sections only apply transformations that are ecma 5 safe
-              // https://github.com/facebook/create-react-app/pull/4234
-              ecma: 8,
-            },
-            compress: {
-              ecma: 5,
-              warnings: false,
-              // Disabled because of an issue with Uglify breaking seemingly valid code:
-              // https://github.com/facebook/create-react-app/issues/2376
-              // Pending further investigation:
-              // https://github.com/mishoo/UglifyJS2/issues/2011
-              comparisons: false,
-              // Disabled because of an issue with Terser breaking valid code:
-              // https://github.com/facebook/create-react-app/issues/5250
-              // Pending further investigation:
-              // https://github.com/terser-js/terser/issues/120
-              inline: 2,
-            },
-            mangle: {
-              safari10: true,
-            },
-            // Added for profiling in devtools
-            keep_classnames: isEnvProductionProfile,
-            keep_fnames: isEnvProductionProfile,
-            output: {
-              ecma: 5,
-              comments: false,
-              // Turned on because emoji and regex is not minified properly using default
-              // https://github.com/facebook/create-react-app/issues/2488
-              ascii_only: true,
-            },
-          },
-          sourceMap: shouldUseSourceMap,
-        }),
-        // This is only used in production mode
-        new OptimizeCSSAssetsPlugin({
-          cssProcessorOptions: {
-            parser: safePostCssParser,
-            map: shouldUseSourceMap
-              ? {
-                  // `inline: false` forces the sourcemap to be output into a
-                  // separate file
-                  inline: false,
-                  // `annotation: true` appends the sourceMappingURL to the end of
-                  // the css file, helping the browser find the sourcemap
-                  annotation: true,
-                }
-              : false,
-          },
-          cssProcessorPluginOptions: {
-              preset: ['default', { minifyFontValues: { removeQuotes: false } }]
-          }
-        }),
-      ],
-      // Automatically split vendor and commons
-      // https://twitter.com/wSokra/status/969633336732905474
-      // https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
-      splitChunks: {
-        chunks: 'all',
-        name: false,
-      },
-      // Keep the runtime chunk separated to enable long term caching
-      // https://twitter.com/wSokra/status/969679223278505985
-      // https://github.com/facebook/create-react-app/issues/5358
-      runtimeChunk: {
-        name: entrypoint => `runtime-${entrypoint.name}`,
-      },
-    },
-    resolve: {
-      // This allows you to set a fallback for where Webpack should look for modules.
-      // We placed these paths second because we want `node_modules` to "win"
-      // if there are any conflicts. This matches Node resolution mechanism.
-      // https://github.com/facebook/create-react-app/issues/253
-      modules: ['node_modules', paths.appNodeModules].concat(
-        modules.additionalModulePaths || []
-      ),
-      // These are the reasonable defaults supported by the Node ecosystem.
-      // We also include JSX as a common component filename extension to support
-      // some tools, although we do not recommend using it, see:
-      // https://github.com/facebook/create-react-app/issues/290
-      // `web` extension prefixes have been added for better support
-      // for React Native Web.
-      extensions: paths.moduleFileExtensions
-        .map(ext => `.${ext}`)
-        .filter(ext => useTypeScript || !ext.includes('ts')),
-      alias: {
-        // Support React Native Web
-        // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-        'react-native': 'react-native-web',
-        // Allows for better profiling with ReactDevTools
-        ...(isEnvProductionProfile && {
-          'react-dom$': 'react-dom/profiling',
-          'scheduler/tracing': 'scheduler/tracing-profiling',
-        }),
-        ...(modules.webpackAliases || {}),
-      },
-      plugins: [
-        // Adds support for installing with Plug'n'Play, leading to faster installs and adding
-        // guards against forgotten dependencies and such.
-        PnpWebpackPlugin,
-        // Prevents users from importing files from outside of src/ (or node_modules/).
-        // This often causes confusion because we only process files within src/ with babel.
-        // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-        // please link the files into your node_modules/ and let module-resolution kick in.
-        // Make sure your source files are compiled, as they will not be processed in any way.
-        new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-      ],
-    },
-    resolveLoader: {
-      plugins: [
-        // Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
-        // from the current package.
-        PnpWebpackPlugin.moduleLoader(module),
-      ],
-    },
-    module: {
-      strictExportPresence: true,
-      rules: [
-        // Disable require.ensure as it's not a standard language feature.
-        { parser: { requireEnsure: false } },
-
-        // First, run the linter.
-        // It's important to do this before Babel processes the JS.
-        {
-          test: /\.(js|mjs|jsx|ts|tsx)$/,
-          enforce: 'pre',
-          use: [
-            {
-              options: {
-                cache: true,
-                formatter: require.resolve('react-dev-utils/eslintFormatter'),
-                eslintPath: require.resolve('eslint'),
-                resolvePluginsRelativeTo: __dirname,
-                
-              },
-              loader: require.resolve('eslint-loader'),
-            },
-          ],
-          include: paths.appSrc,
-        },
-        {
-          // "oneOf" will traverse all following loaders until one will
-          // match the requirements. When no loader matches it will fall
-          // back to the "file" loader at the end of the loader list.
-          oneOf: [
-            // "url" loader works like "file" loader except that it embeds assets
-            // smaller than specified limit in bytes as data URLs to avoid requests.
-            // A missing `test` is equivalent to a match.
-            {
-              test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-              loader: require.resolve('url-loader'),
-              options: {
-                limit: imageInlineSizeLimit,
-                name: 'static/media/[name].[hash:8].[ext]',
-              },
-            },
-            // Process application JS with Babel.
-            // The preset includes JSX, Flow, TypeScript, and some ESnext features.
-            {
-              test: /\.(js|mjs|jsx|ts|tsx)$/,
-              include: paths.appSrc,
-              loader: require.resolve('babel-loader'),
-              options: {
-                customize: require.resolve(
-                  'babel-preset-react-app/webpack-overrides'
-                ),
-                
-                plugins: [
-                  [
-                    require.resolve('babel-plugin-named-asset-import'),
-                    {
-                      loaderMap: {
-                        svg: {
-                          ReactComponent:
-                            '@svgr/webpack?-svgo,+titleProp,+ref![path]',
-                        },
-                      },
-                    },
-                  ],
-                ],
-                // This is a feature of `babel-loader` for webpack (not Babel itself).
-                // It enables caching results in ./node_modules/.cache/babel-loader/
-                // directory for faster rebuilds.
-                cacheDirectory: true,
-                // See #6846 for context on why cacheCompression is disabled
-                cacheCompression: false,
-                compact: isEnvProduction,
-              },
-            },
-            // Process any JS outside of the app with Babel.
-            // Unlike the application JS, we only compile the standard ES features.
-            {
-              test: /\.(js|mjs)$/,
-              exclude: /@babel(?:\/|\\{1,2})runtime/,
-              loader: require.resolve('babel-loader'),
-              options: {
-                babelrc: false,
-                configFile: false,
-                compact: false,
-                presets: [
-                  [
-                    require.resolve('babel-preset-react-app/dependencies'),
-                    { helpers: true },
-                  ],
-                ],
-                cacheDirectory: true,
-                // See #6846 for context on why cacheCompression is disabled
-                cacheCompression: false,
-                
-                // Babel sourcemaps are needed for debugging into node_modules
-                // code.  Without the options below, debuggers like VSCode
-                // show incorrect code and set breakpoints on the wrong lines.
-                sourceMaps: shouldUseSourceMap,
-                inputSourceMap: shouldUseSourceMap,
-              },
-            },
-            // "postcss" loader applies autoprefixer to our CSS.
-            // "css" loader resolves paths in CSS and adds assets as dependencies.
-            // "style" loader turns CSS into JS modules that inject <style> tags.
-            // In production, we use MiniCSSExtractPlugin to extract that CSS
-            // to a file, but in development "style" loader enables hot editing
-            // of CSS.
-            // By default we support CSS Modules with the extension .module.css
-            {
-              test: cssRegex,
-              exclude: cssModuleRegex,
-              use: getStyleLoaders({
-                importLoaders: 1,
-                sourceMap: isEnvProduction && shouldUseSourceMap,
-              }),
-              // Don't consider CSS imports dead code even if the
-              // containing package claims to have no side effects.
-              // Remove this when webpack adds a warning or an error for this.
-              // See https://github.com/webpack/webpack/issues/6571
-              sideEffects: true,
-            },
-            // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
-            // using the extension .module.css
-            {
-              test: cssModuleRegex,
-              use: getStyleLoaders({
-                importLoaders: 1,
-                sourceMap: isEnvProduction && shouldUseSourceMap,
-                modules: {
-                  getLocalIdent: getCSSModuleLocalIdent,
-                },
-              }),
-            },
-            // Opt-in support for SASS (using .scss or .sass extensions).
-            // By default we support SASS Modules with the
-            // extensions .module.scss or .module.sass
-            {
-              test: sassRegex,
-              exclude: sassModuleRegex,
-              use: getStyleLoaders(
-                {
-                  importLoaders: 3,
-                  sourceMap: isEnvProduction && shouldUseSourceMap,
-                },
-                'sass-loader'
-              ),
-              // Don't consider CSS imports dead code even if the
-              // containing package claims to have no side effects.
-              // Remove this when webpack adds a warning or an error for this.
-              // See https://github.com/webpack/webpack/issues/6571
-              sideEffects: true,
-            },
-            // Adds support for CSS Modules, but using SASS
-            // using the extension .module.scss or .module.sass
-            {
-              test: sassModuleRegex,
-              use: getStyleLoaders(
-                {
-                  importLoaders: 3,
-                  sourceMap: isEnvProduction && shouldUseSourceMap,
-                  modules: {
-                    getLocalIdent: getCSSModuleLocalIdent,
-                  },
-                },
-                'sass-loader'
-              ),
-            },
-            // "file" loader makes sure those assets get served by WebpackDevServer.
-            // When you `import` an asset, you get its (virtual) filename.
-            // In production, they would get copied to the `build` folder.
-            // This loader doesn't use a "test" so it will catch all modules
-            // that fall through the other loaders.
-            {
-              loader: require.resolve('file-loader'),
-              // Exclude `js` files to keep "css" loader working as it injects
-              // its runtime that would otherwise be processed through "file" loader.
-              // Also exclude `html` and `json` extensions so they get processed
-              // by webpacks internal loaders.
-              exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
-              options: {
-                name: 'static/media/[name].[hash:8].[ext]',
-              },
-            },
-            // ** STOP ** Are you adding a new loader?
-            // Make sure to add the new loader(s) before the "file" loader.
-          ],
-        },
-      ],
-    },
-    plugins: [
-      // Generates an `index.html` file with the <script> injected.
-      new HtmlWebpackPlugin(
-        Object.assign(
-          {},
-          {
-            inject: true,
-            template: paths.appHtml,
-          },
-          isEnvProduction
-            ? {
-                minify: {
-                  removeComments: true,
-                  collapseWhitespace: true,
-                  removeRedundantAttributes: true,
-                  useShortDoctype: true,
-                  removeEmptyAttributes: true,
-                  removeStyleLinkTypeAttributes: true,
-                  keepClosingSlash: true,
-                  minifyJS: true,
-                  minifyCSS: true,
-                  minifyURLs: true,
-                },
-              }
-            : undefined
-        )
-      ),
-      // Inlines the webpack runtime script. This script is too small to warrant
-      // a network request.
-      // https://github.com/facebook/create-react-app/issues/5358
-      isEnvProduction &&
-        shouldInlineRuntimeChunk &&
-        new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime-.+[.]js/]),
-      // Makes some environment variables available in index.html.
-      // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-      // <link rel="icon" href="%PUBLIC_URL%/favicon.ico">
-      // In production, it will be an empty string unless you specify "homepage"
-      // in `package.json`, in which case it will be the pathname of that URL.
-      // In development, this will be an empty string.
-      new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
-      // This gives some necessary context to module not found errors, such as
-      // the requesting resource.
-      new ModuleNotFoundPlugin(paths.appPath),
-      // Makes some environment variables available to the JS code, for example:
-      // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-      // It is absolutely essential that NODE_ENV is set to production
-      // during a production build.
-      // Otherwise React will be compiled in the very slow development mode.
-      new webpack.DefinePlugin(env.stringified),
-      // This is necessary to emit hot updates (currently CSS only):
-      isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
-      // Watcher doesn't work well if you mistype casing in a path so we use
-      // a plugin that prints an error when you attempt to do this.
-      // See https://github.com/facebook/create-react-app/issues/240
-      isEnvDevelopment && new CaseSensitivePathsPlugin(),
-      // If you require a missing module and then `npm install` it, you still have
-      // to restart the development server for Webpack to discover it. This plugin
-      // makes the discovery automatic so you don't have to restart.
-      // See https://github.com/facebook/create-react-app/issues/186
-      isEnvDevelopment &&
-        new WatchMissingNodeModulesPlugin(paths.appNodeModules),
-      isEnvProduction &&
-        new MiniCssExtractPlugin({
-          // Options similar to the same options in webpackOptions.output
-          // both options are optional
-          filename: 'static/css/[name].[contenthash:8].css',
-          chunkFilename: 'static/css/[name].[contenthash:8].chunk.css',
-        }),
-      // Generate an asset manifest file with the following content:
-      // - "files" key: Mapping of all asset filenames to their corresponding
-      //   output file so that tools can pick it up without having to parse
-      //   `index.html`
-      // - "entrypoints" key: Array of files which are included in `index.html`,
-      //   can be used to reconstruct the HTML if necessary
-      new ManifestPlugin({
-        fileName: 'asset-manifest.json',
-        publicPath: publicPath,
-        generate: (seed, files, entrypoints) => {
-          const manifestFiles = files.reduce((manifest, file) => {
-            manifest[file.name] = file.path;
-            return manifest;
-          }, seed);
-          const entrypointFiles = entrypoints.main.filter(
-            fileName => !fileName.endsWith('.map')
-          );
-
-          return {
-            files: manifestFiles,
-            entrypoints: entrypointFiles,
-          };
-        },
-      }),
-      // Moment.js is an extremely popular library that bundles large locale files
-      // by default due to how Webpack interprets its code. This is a practical
-      // solution that requires the user to opt into importing specific locales.
-      // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-      // You can remove this if you don't use Moment.js:
-      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-      // Generate a service worker script that will precache, and keep up to date,
-      // the HTML & assets that are part of the Webpack build.
-      isEnvProduction &&
-        new WorkboxWebpackPlugin.GenerateSW({
-          clientsClaim: true,
-          exclude: [/\.map$/, /asset-manifest\.json$/],
-          importWorkboxFrom: 'cdn',
-          navigateFallback: publicUrl + '/index.html',
-          navigateFallbackBlacklist: [
-            // Exclude URLs starting with /_, as they're likely an API call
-            new RegExp('^/_'),
-            // Exclude any URLs whose last part seems to be a file extension
-            // as they're likely a resource and not a SPA route.
-            // URLs containing a "?" character won't be blacklisted as they're likely
-            // a route with query params (e.g. auth callbacks).
-            new RegExp('/[^/?]+\\.[^/]+$'),
-          ],
-        }),
-      // TypeScript type checking
-      useTypeScript &&
-        new ForkTsCheckerWebpackPlugin({
-          typescript: resolve.sync('typescript', {
-            basedir: paths.appNodeModules,
-          }),
-          async: isEnvDevelopment,
-          useTypescriptIncrementalApi: true,
-          checkSyntacticErrors: true,
-          resolveModuleNameModule: process.versions.pnp
-            ? `${__dirname}/pnpTs.js`
-            : undefined,
-          resolveTypeReferenceDirectiveModule: process.versions.pnp
-            ? `${__dirname}/pnpTs.js`
-            : undefined,
-          tsconfig: paths.appTsConfig,
-          reportFiles: [
-            '**',
-            '!**/__tests__/**',
-            '!**/?(*.)(spec|test).*',
-            '!**/src/setupProxy.*',
-            '!**/src/setupTests.*',
-          ],
-          silent: true,
-          // The formatter is invoked directly in WebpackDevServerUtils during development
-          formatter: isEnvProduction ? typescriptFormatter : undefined,
-        }),
-    ].filter(Boolean),
-    // Some libraries import Node modules but don't use them in the browser.
-    // Tell Webpack to provide empty mocks for them so importing them works.
-    node: {
-      module: 'empty',
-      dgram: 'empty',
-      dns: 'mock',
-      fs: 'empty',
-      http2: 'empty',
-      net: 'empty',
-      tls: 'empty',
-      child_process: 'empty',
-    },
-    // Turn off performance processing because we utilize
-    // our own hints via the FileSizeReporter
-    performance: false,
-  };
-};

packages/app-clipper/popup/package.json

@@ -4,126 +4,31 @@
   "private": true,
   "homepage": ".",
   "dependencies": {
-    "@babel/core": "7.8.4",
-    "@svgr/webpack": "4.3.3",
-    "@typescript-eslint/eslint-plugin": "^2.10.0",
-    "@typescript-eslint/parser": "^2.10.0",
-    "babel-eslint": "10.0.3",
-    "babel-jest": "^24.9.0",
-    "babel-loader": "8.0.6",
-    "babel-plugin-named-asset-import": "^0.3.6",
-    "babel-preset-react-app": "^9.1.1",
-    "camelcase": "5.3.1",
-    "case-sensitive-paths-webpack-plugin": "2.3.0",
-    "css-loader": "3.6.0",
-    "dotenv": "8.6.0",
-    "dotenv-expand": "5.1.0",
-    "file-loader": "4.3.0",
-    "fs-extra": "10.1.0",
-    "html-webpack-plugin": "4.0.0-beta.11",
-    "identity-obj-proxy": "3.0.0",
-    "jest": "24.9.0",
-    "jest-environment-jsdom-fourteen": "1.0.1",
-    "jest-resolve": "24.9.0",
-    "jest-watch-typeahead": "0.4.2",
-    "mini-css-extract-plugin": "0.9.0",
-    "optimize-css-assets-webpack-plugin": "5.0.8",
-    "pnp-webpack-plugin": "1.6.0",
-    "postcss-flexbugs-fixes": "4.1.0",
-    "postcss-loader": "3.0.0",
-    "postcss-normalize": "8.0.1",
-    "postcss-preset-env": "6.7.1",
-    "postcss-safe-parser": "4.0.2",
-    "react": "^16.12.0",
-    "react-app-polyfill": "^1.0.6",
-    "react-dev-utils": "^10.1.0",
-    "react-dom": "^16.12.0",
-    "react-redux": "^5.0.7",
-    "redux": "4.1.2",
-    "resolve": "1.22.1",
-    "resolve-url-loader": "^3.1.3",
-    "sass-loader": "8.0.2",
-    "semver": "6.3.0",
-    "style-loader": "1.1.3",
-    "terser-webpack-plugin": "2.3.8",
-    "ts-pnp": "1.1.5",
-    "url-loader": "2.3.0",
-    "webpack": "4.41.5",
-    "webpack-dev-server": "^3.11.2",
-    "webpack-manifest-plugin": "2.2.0",
-    "workbox-webpack-plugin": "4.3.1"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "scripts": {
-    "start": "node scripts/start.js",
-    "build": "echo 'Clipper build is disabled due to disabled due to ERR_OSSL_EVP_UNSUPPORTED error on CI'",
-    "build_DISABLED": "node scripts/build.js SKIP_PREFLIGHT_CHECK",
-    "test": "node scripts/test.js --env=jsdom",
-    "watch": "cra-build-watch",
+    "build": "webpack --mode=production",
+    "watch": "webpack watch --mode=development",
     "postinstall": "node postinstall.js && npm run build"
   },
   "devDependencies": {
-    "cra-build-watch": "^3.4.0",
-    "fs-extra": "^10.0.0",
-    "md5": "^2.3.0",
-    "react-scripts": "^3.3.1"
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.7",
+    "@babel/preset-react": "7.23.3",
+    "babel-loader": "9.1.3",
+    "css-loader": "6.8.1",
+    "html-webpack-plugin": "5.6.0",
+    "react-redux": "9.0.4",
+    "redux": "5.0.1",
+    "style-loader": "3.3.3",
+    "webpack": "5.89.0",
+    "webpack-cli": "5.1.4"
   },
   "browserslist": [
     ">0.2%",
     "not dead",
     "not ie <= 11",
     "not op_mini all"
-  ],
-  "jest": {
-    "roots": [
-      "<rootDir>/src"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx,ts,tsx}",
-      "!src/**/*.d.ts"
-    ],
-    "setupFiles": [
-      "react-app-polyfill/jsdom"
-    ],
-    "setupFilesAfterEnv": [],
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
-      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
-    ],
-    "testEnvironment": "jest-environment-jsdom-fourteen",
-    "transform": {
-      "^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
-      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
-      "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
-    },
-    "transformIgnorePatterns": [
-      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
-      "^.+\\.module\\.(css|sass|scss)$"
-    ],
-    "modulePaths": [],
-    "moduleNameMapper": {
-      "^react-native$": "react-native-web",
-      "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
-    },
-    "moduleFileExtensions": [
-      "web.js",
-      "js",
-      "web.ts",
-      "ts",
-      "web.tsx",
-      "tsx",
-      "json",
-      "web.jsx",
-      "jsx",
-      "node"
-    ],
-    "watchPlugins": [
-      "jest-watch-typeahead/filename",
-      "jest-watch-typeahead/testname"
-    ]
-  },
-  "babel": {
-    "presets": [
-      "react-app"
-    ]
-  }
+  ]
 }