Desktop release v2.14.8

Auto-updated using release-website.sh

.eslintignore

@@ -662,6 +662,7 @@ 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
@@ -674,6 +675,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,6 +723,7 @@ 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
@@ -781,6 +784,7 @@ 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/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
 packages/lib/services/debug/populateDatabase.js
@@ -912,16 +916,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

.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:

.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:
@@ -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:

.gitignore

@@ -642,6 +642,7 @@ 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
@@ -654,6 +655,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,6 +703,7 @@ 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
@@ -761,6 +764,7 @@ 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/index.js
 packages/lib/services/database/sqlStringToLines.js
 packages/lib/services/database/types.js
 packages/lib/services/debug/populateDatabase.js
@@ -892,16 +896,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

package.json

@@ -13,7 +13,7 @@
   },
   "scripts": {
     "buildApiDoc": "yarn workspace joplin start apidoc ../../readme/api/references/rest_api.md",
-    "buildCommandIndex": "node packages/tools/gulp/tasks/buildCommandIndexRun.js",
+    "buildScriptIndexes": "node packages/tools/gulp/tasks/buildScriptIndexesRun.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",
@@ -82,7 +82,7 @@
     "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",

packages/app-cli/app/app.js

@@ -1,5 +1,5 @@
 const BaseApplication = require('@joplin/lib/BaseApplication').default;
-const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
+const { refreshFolders } = 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;
@@ -435,7 +435,7 @@ class Application extends BaseApplication {
 			// initialised. So we manually call dispatchUpdateAll() to force an update.
 			Setting.dispatchUpdateAll();
 
-			await FoldersScreenUtils.refreshFolders();
+			await refreshFolders((action) => { this.store().dispatch(action); });
 
 			const tags = await Tag.allWithNotes();
 

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

@@ -5,6 +5,7 @@ const { cliUtils } = require('./cli-utils.js');
 const { app } = require('./app.js');
 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/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.1",
     "sprintf-js": "1.1.3",
     "sqlite3": "5.1.6",
     "string-padding": "1.0.2",

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/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/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/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/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/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-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/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/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"
-    ]
-  }
+  ]
 }

packages/app-clipper/popup/public/index.html

@@ -4,21 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
-    <!--
-      manifest.json provides metadata used when your web app is added to the
-      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
     <title>Joplin Web Clipper</title>
   </head>
   <body>

packages/app-clipper/popup/scripts/build.js

@@ -1,211 +0,0 @@
-'use strict';
-
-if (process.argv && process.argv.indexOf('SKIP_PREFLIGHT_CHECK') >= 0) {
-	process.env.SKIP_PREFLIGHT_CHECK = 'true';
-}
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'production';
-process.env.NODE_ENV = 'production';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-// Ensure environment variables are read.
-require('../config/env');
-
-
-const path = require('path');
-const chalk = require('react-dev-utils/chalk');
-const fs = require('fs-extra');
-const webpack = require('webpack');
-const configFactory = require('../config/webpack.config');
-const paths = require('../config/paths');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
-const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
-const printBuildError = require('react-dev-utils/printBuildError');
-
-const measureFileSizesBeforeBuild =
-  FileSizeReporter.measureFileSizesBeforeBuild;
-const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
-const useYarn = fs.existsSync(paths.yarnLockFile);
-
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
-const isInteractive = process.stdout.isTTY;
-
-// Warn and crash if required files are missing
-if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
-	process.exit(1);
-}
-
-// Generate configuration
-const config = configFactory('production');
-
-// We require that you explicitly set browsers and do not fall back to
-// browserslist defaults.
-const { checkBrowsers } = require('react-dev-utils/browsersHelper');
-checkBrowsers(paths.appPath, isInteractive)
-	.then(() => {
-		// First, read the current file sizes in build directory.
-		// This lets us display how much they changed later.
-		return measureFileSizesBeforeBuild(paths.appBuild);
-	})
-	.then(previousFileSizes => {
-		// Remove all content but keep the directory so that
-		// if you're in it, you don't end up in Trash
-		fs.emptyDirSync(paths.appBuild);
-		// Merge with the public folder
-		copyPublicFolder();
-		// Start the webpack build
-		return build(previousFileSizes);
-	})
-	.then(
-		({ stats, previousFileSizes, warnings }) => {
-			if (warnings.length) {
-				console.log(chalk.yellow('Compiled with warnings.\n'));
-				console.log(warnings.join('\n\n'));
-				console.log(
-					`\nSearch for the ${
-						chalk.underline(chalk.yellow('keywords'))
-					} to learn more about each warning.`
-				);
-				console.log(
-					`To ignore, add ${
-						chalk.cyan('// eslint-disable-next-line')
-					} to the line before.\n`
-				);
-			} else {
-				console.log(chalk.green('Compiled successfully.\n'));
-			}
-
-			console.log('File sizes after gzip:\n');
-			printFileSizesAfterBuild(
-				stats,
-				previousFileSizes,
-				paths.appBuild,
-				WARN_AFTER_BUNDLE_GZIP_SIZE,
-				WARN_AFTER_CHUNK_GZIP_SIZE
-			);
-			console.log();
-
-			const appPackage = require(paths.appPackageJson);
-			const publicUrl = paths.publicUrl;
-			const publicPath = config.output.publicPath;
-			const buildFolder = path.relative(process.cwd(), paths.appBuild);
-			printHostingInstructions(
-				appPackage,
-				publicUrl,
-				publicPath,
-				buildFolder,
-				useYarn
-			);
-		},
-		err => {
-			const tscCompileOnError = process.env.TSC_COMPILE_ON_ERROR === 'true';
-			if (tscCompileOnError) {
-				console.log(
-					chalk.yellow(
-						'Compiled with the following type errors (you may want to check these before deploying your app):\n'
-					)
-				);
-				printBuildError(err);
-			} else {
-				console.log(chalk.red('Failed to compile.\n'));
-				printBuildError(err);
-				process.exit(1);
-			}
-		}
-	)
-	.catch(err => {
-		if (err && err.message) {
-			console.log(err.message);
-		}
-		process.exit(1);
-	});
-
-// Create the production build and print the deployment instructions.
-function build(previousFileSizes) {
-	// We used to support resolving modules according to `NODE_PATH`.
-	// This now has been deprecated in favor of jsconfig/tsconfig.json
-	// This lets you use absolute paths in imports inside large monorepos:
-	if (process.env.NODE_PATH) {
-		console.log(
-			chalk.yellow(
-				'Setting NODE_PATH to resolve modules absolutely has been deprecated in favor of setting baseUrl in jsconfig.json (or tsconfig.json if you are using TypeScript) and will be removed in a future major release of create-react-app.'
-			)
-		);
-		console.log();
-	}
-
-	console.log('Creating an optimized production build...');
-
-	const compiler = webpack(config);
-	return new Promise((resolve, reject) => {
-		compiler.run((err, stats) => {
-			let messages;
-			if (err) {
-				if (!err.message) {
-					return reject(err);
-				}
-
-				let errMessage = err.message;
-
-				// Add additional information for postcss errors
-				if (Object.prototype.hasOwnProperty.call(err, 'postcssNode')) {
-					errMessage +=
-            `\nCompileError: Begins at CSS selector ${
-            	err['postcssNode'].selector}`;
-				}
-
-				messages = formatWebpackMessages({
-					errors: [errMessage],
-					warnings: [],
-				});
-			} else {
-				messages = formatWebpackMessages(
-					stats.toJson({ all: false, warnings: true, errors: true })
-				);
-			}
-			if (messages.errors.length) {
-				// Only keep the first error. Others are often indicative
-				// of the same problem, but confuse the reader with noise.
-				if (messages.errors.length > 1) {
-					messages.errors.length = 1;
-				}
-				return reject(new Error(messages.errors.join('\n\n')));
-			}
-			if (
-				process.env.CI &&
-        (typeof process.env.CI !== 'string' ||
-          process.env.CI.toLowerCase() !== 'false') &&
-        messages.warnings.length
-			) {
-				console.log(
-					chalk.yellow(
-						'\nTreating warnings as errors because process.env.CI = true.\n' +
-              'Most CI servers set it automatically.\n'
-					)
-				);
-				return reject(new Error(messages.warnings.join('\n\n')));
-			}
-
-			return resolve({
-				stats,
-				previousFileSizes,
-				warnings: messages.warnings,
-			});
-		});
-	});
-}
-
-function copyPublicFolder() {
-	fs.copySync(paths.appPublic, paths.appBuild, {
-		dereference: true,
-		filter: file => file !== paths.appHtml,
-	});
-}

packages/app-clipper/popup/scripts/start.js

@@ -1,146 +0,0 @@
-'use strict';
-
-/* eslint-disable no-console */
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'development';
-process.env.NODE_ENV = 'development';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-// Ensure environment variables are read.
-require('../config/env');
-
-
-const fs = require('fs');
-const chalk = require('react-dev-utils/chalk');
-const webpack = require('webpack');
-const WebpackDevServer = require('webpack-dev-server');
-const clearConsole = require('react-dev-utils/clearConsole');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const {
-	choosePort,
-	createCompiler,
-	prepareProxy,
-	prepareUrls,
-} = require('react-dev-utils/WebpackDevServerUtils');
-const openBrowser = require('react-dev-utils/openBrowser');
-const paths = require('../config/paths');
-const configFactory = require('../config/webpack.config');
-const createDevServerConfig = require('../config/webpackDevServer.config');
-
-const useYarn = fs.existsSync(paths.yarnLockFile);
-const isInteractive = process.stdout.isTTY;
-
-// Warn and crash if required files are missing
-if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
-	process.exit(1);
-}
-
-// Tools like Cloud9 rely on this.
-const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
-const HOST = process.env.HOST || '0.0.0.0';
-
-if (process.env.HOST) {
-	console.log(
-		chalk.cyan(
-			`Attempting to bind to HOST environment variable: ${chalk.yellow(
-				chalk.bold(process.env.HOST),
-			)}`,
-		),
-	);
-	console.log(
-		'If this was unintentional, check that you haven\'t mistakenly set it in your shell.',
-	);
-	console.log(
-		`Learn more here: ${chalk.yellow('https://bit.ly/CRA-advanced-config')}`,
-	);
-	console.log();
-}
-
-// We require that you explicitly set browsers and do not fall back to
-// browserslist defaults.
-const { checkBrowsers } = require('react-dev-utils/browsersHelper');
-checkBrowsers(paths.appPath, isInteractive)
-	.then(() => {
-		// We attempt to use the default port but if it is busy, we offer the user to
-		// run on a different port. `choosePort()` Promise resolves to the next free port.
-		return choosePort(HOST, DEFAULT_PORT);
-	})
-	.then(port => {
-		if (!port) {
-			// We have not found a port.
-			return;
-		}
-		const config = configFactory('development');
-		const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
-		const appName = require(paths.appPackageJson).name;
-		const useTypeScript = fs.existsSync(paths.appTsConfig);
-		const tscCompileOnError = process.env.TSC_COMPILE_ON_ERROR === 'true';
-		const urls = prepareUrls(protocol, HOST, port);
-		const devSocket = {
-			warnings: warnings =>
-				devServer.sockWrite(devServer.sockets, 'warnings', warnings),
-			errors: errors =>
-				devServer.sockWrite(devServer.sockets, 'errors', errors),
-		};
-		// Create a webpack compiler that is configured with custom messages.
-		const compiler = createCompiler({
-			appName,
-			config,
-			devSocket,
-			urls,
-			useYarn,
-			useTypeScript,
-			tscCompileOnError,
-			webpack,
-		});
-		// Load proxy config
-		const proxySetting = require(paths.appPackageJson).proxy;
-		const proxyConfig = prepareProxy(proxySetting, paths.appPublic);
-		// Serve webpack assets generated by the compiler over a web server.
-		const serverConfig = createDevServerConfig(
-			proxyConfig,
-			urls.lanUrlForConfig,
-		);
-		const devServer = new WebpackDevServer(compiler, serverConfig);
-		// Launch WebpackDevServer.
-		devServer.listen(port, HOST, error => {
-			if (error) {
-				return console.log(error);
-			}
-			if (isInteractive) {
-				clearConsole();
-			}
-
-			// We used to support resolving modules according to `NODE_PATH`.
-			// This now has been deprecated in favor of jsconfig/tsconfig.json
-			// This lets you use absolute paths in imports inside large monorepos:
-			if (process.env.NODE_PATH) {
-				console.log(
-					chalk.yellow(
-						'Setting NODE_PATH to resolve modules absolutely has been deprecated in favor of setting baseUrl in jsconfig.json (or tsconfig.json if you are using TypeScript) and will be removed in a future major release of create-react-app.',
-					),
-				);
-				console.log();
-			}
-
-			console.log(chalk.cyan('Starting the development server...\n'));
-			openBrowser(urls.localUrlForBrowser);
-		});
-
-		// eslint-disable-next-line github/array-foreach -- Old code before rule was applied
-		['SIGINT', 'SIGTERM'].forEach((sig) => {
-			process.on(sig, () => {
-				devServer.close();
-				process.exit();
-			});
-		});
-	})
-	.catch(error => {
-		if (error && error.message) {
-			console.log(error.message);
-		}
-		process.exit(1);
-	});

packages/app-clipper/popup/scripts/test.js

@@ -1,49 +0,0 @@
-'use strict';
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'test';
-process.env.NODE_ENV = 'test';
-process.env.PUBLIC_URL = '';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-// Ensure environment variables are read.
-require('../config/env');
-
-
-const jest = require('jest');
-const execSync = require('child_process').execSync;
-const argv = process.argv.slice(2);
-
-function isInGitRepository() {
-	try {
-		execSync('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
-		return true;
-	} catch (e) {
-		return false;
-	}
-}
-
-function isInMercurialRepository() {
-	try {
-		execSync('hg --cwd . root', { stdio: 'ignore' });
-		return true;
-	} catch (e) {
-		return false;
-	}
-}
-
-// Watch unless on CI or explicitly running all tests
-if (
-	!process.env.CI &&
-  argv.indexOf('--watchAll') === -1 &&
-  argv.indexOf('--watchAll=false') === -1
-) {
-	// https://github.com/facebook/create-react-app/issues/5210
-	const hasSourceControl = isInGitRepository() || isInMercurialRepository();
-	argv.push(hasSourceControl ? '--watch' : '--watchAll');
-}
-
-
-jest.run(argv);

packages/app-clipper/popup/src/App.js

@@ -179,6 +179,7 @@ class AppComponent extends Component {
 	}
 
 	async loadContentScripts() {
+		await bridge().tabsExecuteScript({ file: '/content_scripts/setUpEnvironment.js' });
 		await bridge().tabsExecuteScript({ file: '/content_scripts/JSDOMParser.js' });
 		await bridge().tabsExecuteScript({ file: '/content_scripts/Readability.js' });
 		await bridge().tabsExecuteScript({ file: '/content_scripts/Readability-readerable.js' });

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

@@ -0,0 +1,42 @@
+const path = require('path');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+
+module.exports = (env, argv) => ({
+	entry: './src/index.js',
+	output: {
+		filename: 'index.js',
+		path: path.resolve(__dirname, 'build'),
+	},
+	plugins: [
+		new HtmlWebpackPlugin({
+			template: './public/index.html',
+		}),
+	],
+	// Avoid the default 'eval-source-map' -- Chrome seems to prevent usage of eval
+	// in popups.
+	devtool: argv.mode === 'development' ? 'cheap-source-map' : undefined,
+	module: {
+		rules: [
+			{
+				test: /\.(?:js|mjs|cjs)$/i,
+				exclude: /node_modules/,
+				use: {
+					loader: 'babel-loader',
+					options: {
+						presets: [
+							['@babel/preset-react'],
+						],
+					},
+				},
+			},
+			{
+				test: /\.css$/i,
+				use: ['style-loader', 'css-loader'],
+			},
+			{
+				test: /.png$/i,
+				type: 'asset/inline',
+			},
+		],
+	},
+});

packages/app-desktop/app.ts

@@ -22,7 +22,6 @@ import stateToWhenClauseContext from './services/commands/stateToWhenClauseConte
 import ResourceService from '@joplin/lib/services/ResourceService';
 import ExternalEditWatcher from '@joplin/lib/services/ExternalEditWatcher';
 import appReducer, { createAppDefaultState } from './app.reducer';
-const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
 import Folder from '@joplin/lib/models/Folder';
 import Tag from '@joplin/lib/models/Tag';
 import { reg } from '@joplin/lib/registry';
@@ -70,8 +69,9 @@ import userFetcher, { initializeUserFetcher } from '@joplin/lib/utils/userFetche
 import { parseNotesParent } from '@joplin/lib/reducer';
 import OcrService from '@joplin/lib/services/ocr/OcrService';
 import OcrDriverTesseract from '@joplin/lib/services/ocr/drivers/OcrDriverTesseract';
-import SearchEngine from '@joplin/lib/services/searchengine/SearchEngine';
+import SearchEngine from '@joplin/lib/services/search/SearchEngine';
 import { PackageInfo } from '@joplin/lib/versionInfo';
+import { refreshFolders } from '@joplin/lib/folders-screen-utils';
 
 const pluginClasses = [
 	require('./plugins/GotoAnything').default,
@@ -482,7 +482,7 @@ class Application extends BaseApplication {
 		// manually call dispatchUpdateAll() to force an update.
 		Setting.dispatchUpdateAll();
 
-		await FoldersScreenUtils.refreshFolders();
+		await refreshFolders((action: any) => this.dispatch(action));
 
 		const tags = await Tag.allWithNotes();
 

packages/app-desktop/commands/index.ts

@@ -1,4 +1,4 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as copyDevCommand from './copyDevCommand';
 import * as editProfileConfig from './editProfileConfig';
 import * as exportFolders from './exportFolders';
@@ -16,7 +16,7 @@ import * as switchProfile3 from './switchProfile3';
 import * as toggleExternalEditing from './toggleExternalEditing';
 import * as toggleSafeMode from './toggleSafeMode';
 
-const index:any[] = [
+const index: any[] = [
 	copyDevCommand,
 	editProfileConfig,
 	exportFolders,
@@ -36,4 +36,4 @@ const index:any[] = [
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/app-desktop/gui/MainScreen/commands/index.ts

@@ -1,4 +1,4 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as addProfile from './addProfile';
 import * as commandPalette from './commandPalette';
 import * as deleteFolder from './deleteFolder';
@@ -44,7 +44,7 @@ import * as togglePerFolderSortOrder from './togglePerFolderSortOrder';
 import * as toggleSideBar from './toggleSideBar';
 import * as toggleVisiblePanes from './toggleVisiblePanes';
 
-const index:any[] = [
+const index: any[] = [
 	addProfile,
 	commandPalette,
 	deleteFolder,
@@ -92,4 +92,4 @@ const index:any[] = [
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.tsx

@@ -377,6 +377,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			.tox .tox-dialog,
 			.tox textarea,
 			.tox input,
+			.tox .tox-menu,
 			.tox .tox-dialog__footer {
 				background-color: ${theme.backgroundColor} !important;
 			}
@@ -385,6 +386,12 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 				color: ${theme.color};
 			}
 
+			.tox .tox-menu {
+				/* Ensures that popover menus (the color swatch menu) has a visible border
+				   even in dark mode. */
+				border: 1px solid rgba(140, 140, 140, 0.3);
+			}
+
 			/*
 			When creating dialogs, TinyMCE doesn't seem to offer a way to style the components or to assign classes to them.
 			We want the code dialog box text area to be monospace, and since we can't target this precisely, we apply the style
@@ -406,6 +413,8 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 
 			.tox .tox-tbtn,
 			.tox .tox-tbtn svg,
+			.tox .tox-menu button > svg,
+			.tox .tox-split-button,
 			.tox .tox-dialog__header,
 			.tox .tox-button--icon .tox-icon svg,
 			.tox .tox-button.tox-button--icon .tox-icon svg,
@@ -427,7 +436,9 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			}
 
 			.tox .tox-tbtn--enabled,
-			.tox .tox-tbtn--enabled:hover {
+			.tox .tox-tbtn--enabled:hover,
+			.tox .tox-menu button:hover,
+			.tox .tox-split-button {
 				background-color: ${theme.selectedColor};
 			}
 
@@ -435,11 +446,13 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 				background-color: ${theme.backgroundColor} !important;
 			}
 			
-			.tox .tox-tbtn:focus {
+			.tox .tox-tbtn:focus,
+			.tox .tox-split-button:focus {
 				background-color: ${theme.backgroundColor3}
 			}
 			
-			.tox .tox-tbtn:hover {
+			.tox .tox-tbtn:hover,
+			.tox .tox-menu button:hover > svg {
 				color: ${theme.colorHover3} !important;
 				fill: ${theme.colorHover3} !important;
 				background-color: ${theme.backgroundColorHover3}
@@ -470,6 +483,10 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 				background-color: ${theme.backgroundColor3} !important;
 			}
 
+			.tox .tox-split-button:hover {
+				box-shadow: none;
+			}
+
 			.tox-tinymce,
 			.tox .tox-toolbar__group,
 			.tox.tox-tinymce-aux .tox-toolbar__overflow,
@@ -613,6 +630,7 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 					joplinSub: { inline: 'sub', remove: 'all' },
 					joplinSup: { inline: 'sup', remove: 'all' },
 					code: { inline: 'code', remove: 'all', attributes: { spellcheck: false } },
+					forecolor: { inline: 'span', styles: { color: '%value' } },
 				},
 				setup: (editor: Editor) => {
 					editor.addCommand('joplinAttach', () => {
@@ -1036,7 +1054,15 @@ const TinyMCE = (props: NoteBodyEditorProps, ref: any) => {
 			//
 			// Any maybe others, so to catch them all we only check the prefix
 
-			const changeCommands = ['mceBlockQuote', 'ToggleJoplinChecklistItem', 'Bold', 'Italic', 'Underline', 'Paragraph'];
+			const changeCommands = [
+				'mceBlockQuote',
+				'ToggleJoplinChecklistItem',
+				'Bold',
+				'Italic',
+				'Underline',
+				'Paragraph',
+				'mceApplyTextcolor',
+			];
 
 			if (
 				changeCommands.includes(c) ||

packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.ts

@@ -60,6 +60,9 @@ export default function(editor: any) {
 
 	const items: string[] = definitions.filter(d => !!d.grouped).map(d => d.name);
 
+	// Additional built-in buttons to show in the formatting sub-menu:
+	items.push('forecolor');
+
 	editor.ui.registry.addGroupToolbarButton('formattingExtras', {
 		icon: 'image-options',
 		items: items.join(' '),

packages/app-desktop/gui/NoteEditor/commands/index.ts

@@ -1,11 +1,11 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as focusElementNoteBody from './focusElementNoteBody';
 import * as focusElementNoteTitle from './focusElementNoteTitle';
 import * as pasteAsText from './pasteAsText';
 import * as showLocalSearch from './showLocalSearch';
 import * as showRevisions from './showRevisions';
 
-const index:any[] = [
+const index: any[] = [
 	focusElementNoteBody,
 	focusElementNoteTitle,
 	pasteAsText,
@@ -14,4 +14,4 @@ const index:any[] = [
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/app-desktop/gui/NoteEditor/utils/index.ts

@@ -12,6 +12,7 @@ export async function htmlToMarkdown(markupLanguage: number, html: string, origi
 		newBody = htmlToMd.parse(html, {
 			preserveImageTagsWithSize: true,
 			preserveNestedTables: true,
+			preserveColorStyles: true,
 		});
 		newBody = await Note.replaceResourceExternalToInternalLinks(newBody, { useAbsolutePaths: true });
 	} else {

packages/app-desktop/gui/NoteEditor/utils/types.ts

@@ -5,7 +5,7 @@ import { MarkupLanguage } from '@joplin/renderer';
 import { RenderResult, RenderResultPluginAsset } from '@joplin/renderer/MarkupToHtml';
 import { MarkupToHtmlOptions } from './useMarkupToHtml';
 import { Dispatch } from 'redux';
-import { ProcessResultsRow } from '@joplin/lib/services/searchengine/SearchEngine';
+import { ProcessResultsRow } from '@joplin/lib/services/search/SearchEngine';
 
 export interface AllAssetsOptions {
 	contentMaxWidthTarget?: string;

packages/app-desktop/gui/NoteList/commands/index.ts

@@ -1,9 +1,9 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as focusElementNoteList from './focusElementNoteList';
 
-const index:any[] = [
+const index: any[] = [
 	focusElementNoteList,
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/app-desktop/gui/NoteListControls/commands/index.ts

@@ -1,9 +1,9 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as focusSearch from './focusSearch';
 
-const index:any[] = [
+const index: any[] = [
 	focusSearch,
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/app-desktop/gui/Sidebar/Sidebar.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 import { useEffect, useRef, useCallback, useMemo } from 'react';
-import styled, { css } from 'styled-components';
-import shim from '@joplin/lib/shim';
-import { StyledRoot, StyledAddButton, StyledShareIcon, StyledHeader, StyledHeaderIcon, StyledAllNotesIcon, StyledHeaderLabel, StyledListItem, StyledListItemAnchor, StyledExpandLink, StyledNoteCount, StyledSyncReportText, StyledSyncReport, StyledSynchronizeButton } from './styles';
+import { StyledRoot, StyledAddButton, StyledShareIcon, StyledHeader, StyledHeaderIcon, StyledAllNotesIcon, StyledHeaderLabel, StyledListItem, StyledListItemAnchor, StyledExpandLink, StyledNoteCount, StyledSyncReportText, StyledSyncReport, StyledSynchronizeButton, StyledSpanFix } from './styles';
 import { ButtonLevel } from '../Button/Button';
 import CommandService from '@joplin/lib/services/CommandService';
 import InteropService from '@joplin/lib/services/interop/InteropService';
@@ -29,7 +27,7 @@ import FolderIconBox from '../FolderIconBox';
 import { Theme } from '@joplin/lib/themes/type';
 import { RuntimeProps } from './commands/focusElementSideBar';
 const { connect } = require('react-redux');
-const shared = require('@joplin/lib/components/shared/side-menu-shared.js');
+import { renderFolders, renderTags } from '@joplin/lib/components/shared/side-menu-shared';
 const { themeStyle } = require('@joplin/lib/theme');
 const bridge = require('@electron/remote').require('./bridge').default;
 const Menu = bridge().Menu;
@@ -40,15 +38,6 @@ const { clipboard } = require('electron');
 
 const logger = Logger.create('Sidebar');
 
-// Workaround sidebar rendering bug on Linux Intel GPU.
-// https://github.com/laurent22/joplin/issues/7506
-const StyledSpanFix = styled.span`
-	${shim.isLinux() && css`
-		position: relative;
-	`}
-`;
-
-
 interface Props {
 	themeId: number;
 	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
@@ -715,7 +704,7 @@ const SidebarComponent = (props: Props) => {
 
 	if (props.folders.length) {
 		const allNotesSelected = props.notesParentType === 'SmartFilter' && props.selectedSmartFilterId === ALL_NOTES_FILTER_ID;
-		const result = shared.renderFolders(props, renderFolderItem);
+		const result = renderFolders(props, renderFolderItem);
 		const folderItems = [renderAllNotesItem(theme, allNotesSelected)].concat(result.items);
 		folderItemsOrder_.current = result.order;
 		items.push(
@@ -736,7 +725,7 @@ const SidebarComponent = (props: Props) => {
 	);
 
 	if (props.tags.length) {
-		const result = shared.renderTags(props, renderTag);
+		const result = renderTags(props, renderTag);
 		const tagItems = result.items;
 		tagItemsOrder_.current = result.order;
 

packages/app-desktop/gui/Sidebar/commands/index.ts

@@ -1,9 +1,9 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as focusElementSideBar from './focusElementSideBar';
 
-const index:any[] = [
+const index: any[] = [
 	focusElementSideBar,
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/app-desktop/gui/Sidebar/styles/index.ts

@@ -1,4 +1,6 @@
+import shim from '@joplin/lib/shim';
 import Button from '../../Button/Button';
+import { css } from 'styled-components';
 const styled = require('styled-components').default;
 
 export const StyledRoot = styled.div`
@@ -132,3 +134,11 @@ export const StyledSyncReportText = styled.div`
 	word-wrap: break-word;
 	width: 100%;
 `;
+
+// Workaround sidebar rendering bug on Linux Intel GPU.
+// https://github.com/laurent22/joplin/issues/7506
+export const StyledSpanFix = styled.span`
+	${shim.isLinux() && css`
+		position: relative;
+	`}
+`;

packages/app-desktop/gulpfile.ts

@@ -39,7 +39,7 @@ const tasks = {
 	},
 	tsc: require('@joplin/tools/gulp/tasks/tsc'),
 	updateIgnoredTypeScriptBuild: require('@joplin/tools/gulp/tasks/updateIgnoredTypeScriptBuild'),
-	buildCommandIndex: require('@joplin/tools/gulp/tasks/buildCommandIndex'),
+	buildScriptIndexes: require('@joplin/tools/gulp/tasks/buildScriptIndexes'),
 	compileSass: {
 		fn: async () => {
 			await compileSass(
@@ -58,7 +58,7 @@ const buildBeforeStartParallel = [
 	'copyPluginAssets',
 	'copyApplicationAssets',
 	'updateIgnoredTypeScriptBuild',
-	'buildCommandIndex',
+	'buildScriptIndexes',
 	'compileSass',
 ];
 

packages/app-desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.14.2",
+  "version": "2.14.8",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,
@@ -127,8 +127,8 @@
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.5.8",
     "@types/node": "18.18.14",
-    "@types/react": "18.2.42",
-    "@types/react-redux": "7.1.32",
+    "@types/react": "18.2.43",
+    "@types/react-redux": "7.1.33",
     "@types/styled-components": "5.1.32",
     "@types/tesseract.js": "2.0.0",
     "electron": "26.5.0",
@@ -140,7 +140,7 @@
     "js-sha512": "0.8.0",
     "nan": "2.18.0",
     "react-test-renderer": "18.2.0",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "typescript": "5.2.2"
   },
   "dependencies": {
@@ -161,7 +161,7 @@
     "debounce": "1.2.1",
     "electron-window-state": "5.0.3",
     "formatcoords": "1.1.3",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "highlight.js": "11.9.0",
     "immer": "7.0.15",
     "keytar": "7.9.0",
@@ -190,7 +190,7 @@
     "styled-components": "5.3.11",
     "styled-system": "5.1.5",
     "taboverride": "4.0.3",
-    "tesseract.js": "5.0.3",
+    "tesseract.js": "5.0.4",
     "tinymce": "5.10.6"
   }
 }

packages/app-desktop/plugins/GotoAnything.tsx

@@ -6,8 +6,8 @@ import shim from '@joplin/lib/shim';
 const { connect } = require('react-redux');
 import { _ } from '@joplin/lib/locale';
 import { themeStyle } from '@joplin/lib/theme';
-import SearchEngine from '@joplin/lib/services/searchengine/SearchEngine';
-import gotoAnythingStyleQuery from '@joplin/lib/services/searchengine/gotoAnythingStyleQuery';
+import SearchEngine from '@joplin/lib/services/search/SearchEngine';
+import gotoAnythingStyleQuery from '@joplin/lib/services/search/gotoAnythingStyleQuery';
 import BaseModel, { ModelType } from '@joplin/lib/BaseModel';
 import Tag from '@joplin/lib/models/Tag';
 import Folder from '@joplin/lib/models/Folder';

packages/app-mobile/android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         applicationId "net.cozic.joplin"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097731
-		versionName "2.14.1"
+		versionCode 2097733
+		versionName "2.14.3"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}

packages/app-mobile/components/ExtendedWebView.tsx

@@ -149,6 +149,7 @@ const ExtendedWebView = (props: Props, ref: Ref<WebViewControl>) => {
 			mixedContentMode={props.mixedContentMode}
 			allowFileAccess={true}
 			allowFileAccessFromFileURLs={props.allowFileAccessFromJs}
+			webviewDebuggingEnabled={Setting.value('env') === 'dev'}
 			injectedJavaScript={props.injectedJavaScript}
 			onMessage={props.onMessage}
 			onError={props.onError}

packages/app-mobile/components/screens/ConfigScreen/ConfigScreen.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Platform, Linking, View, Switch, ScrollView, Text, TouchableOpacity, Alert, PermissionsAndroid, Dimensions, AccessibilityInfo } from 'react-native';
 import Setting, { AppType, SettingMetadataSection } from '@joplin/lib/models/Setting';
 import NavService from '@joplin/lib/services/NavService';
-import SearchEngine from '@joplin/lib/services/searchengine/SearchEngine';
+import SearchEngine from '@joplin/lib/services/search/SearchEngine';
 import checkPermissions from '../../../utils/checkPermissions';
 import setIgnoreTlsErrors from '../../../utils/TlsUtils';
 import { reg } from '@joplin/lib/registry';

packages/app-mobile/components/screens/search.tsx

@@ -10,8 +10,8 @@ const { NoteItem } = require('../note-item.js');
 const { BaseScreenComponent } = require('../base-screen');
 const { themeStyle } = require('../global-style.js');
 const DialogBox = require('react-native-dialogbox').default;
-import SearchEngineUtils from '@joplin/lib/services/searchengine/SearchEngineUtils';
-import SearchEngine from '@joplin/lib/services/searchengine/SearchEngine';
+import SearchEngineUtils from '@joplin/lib/services/search/SearchEngineUtils';
+import SearchEngine from '@joplin/lib/services/search/SearchEngine';
 import { AppState } from '../../utils/types';
 import { NoteEntity } from '@joplin/lib/services/database/types';
 

packages/app-mobile/components/side-menu-content.tsx

@@ -8,7 +8,7 @@ import Synchronizer from '@joplin/lib/Synchronizer';
 import NavService from '@joplin/lib/services/NavService';
 import { _ } from '@joplin/lib/locale';
 const { themeStyle } = require('./global-style.js');
-const shared = require('@joplin/lib/components/shared/side-menu-shared.js');
+import { renderFolders } from '@joplin/lib/components/shared/side-menu-shared';
 import { FolderEntity, FolderIcon } from '@joplin/lib/services/database/types';
 import { AppState } from '../utils/types';
 import Setting from '@joplin/lib/models/Setting';
@@ -37,6 +37,8 @@ interface Props {
 	opacity: number;
 	profileConfig: ProfileConfig;
 	inboxJopId: string;
+	selectedFolderId: string;
+	selectedTagId: string;
 }
 
 const syncIconRotationValue = new Animated.Value(0);
@@ -488,7 +490,7 @@ const SideMenuContentComponent = (props: Props) => {
 	items.push(renderSidebarButton('folder_header', _('Notebooks'), 'folder'));
 
 	if (props.folders.length) {
-		const result = shared.renderFolders(props, renderFolderItem, false);
+		const result = renderFolders(props, renderFolderItem);
 		const folderItems = result.items;
 		items = items.concat(folderItems);
 	}

packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj

@@ -523,13 +523,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 107;
+				CURRENT_PROJECT_VERSION = 109;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.14.0;
+				MARKETING_VERSION = 12.14.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -552,12 +552,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
-				CURRENT_PROJECT_VERSION = 107;
+				CURRENT_PROJECT_VERSION = 109;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				INFOPLIST_FILE = Joplin/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 12.14.0;
+				MARKETING_VERSION = 12.14.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -704,14 +704,14 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 107;
+				CURRENT_PROJECT_VERSION = 109;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.14.0;
+				MARKETING_VERSION = 12.14.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@@ -735,14 +735,14 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 107;
+				CURRENT_PROJECT_VERSION = 109;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = A9BXAFS6CT;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = ShareExtension/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 12.14.0;
+				MARKETING_VERSION = 12.14.2;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";

packages/app-mobile/ios/Podfile.lock

@@ -333,7 +333,7 @@ PODS:
   - React-jsinspector (0.71.10)
   - React-logger (0.71.10):
     - glog
-  - react-native-alarm-notification (2.13.0):
+  - react-native-alarm-notification (2.14.0):
     - React
   - react-native-camera (4.2.1):
     - React-Core
@@ -349,27 +349,28 @@ PODS:
     - React
   - react-native-geolocation (3.1.0):
     - React-Core
-  - react-native-get-random-values (1.9.0):
+  - react-native-get-random-values (1.10.0):
     - React-Core
-  - react-native-image-picker (5.7.0):
+  - react-native-image-picker (7.0.3):
     - React-Core
   - react-native-image-resizer (3.0.7):
     - React-Core
-  - react-native-netinfo (9.4.1):
+  - react-native-netinfo (9.5.0):
     - React-Core
   - react-native-rsa-native (2.0.5):
     - React
-  - react-native-saf-x (2.13.3):
+  - react-native-saf-x (2.14.0):
     - React-Core
   - react-native-safe-area-context (4.7.4):
     - React-Core
-  - react-native-slider (4.4.3):
+  - react-native-slider (4.4.4):
+    - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - react-native-sqlite-storage (6.0.1):
     - React-Core
   - react-native-version-info (1.1.1):
     - React-Core
-  - react-native-webview (13.6.2):
+  - react-native-webview (13.6.3):
     - React-Core
   - React-perflogger (0.71.10)
   - React-RCTActionSheet (0.71.10):
@@ -461,7 +462,7 @@ PODS:
     - React-Core
   - RNCPushNotificationIOS (1.11.0):
     - React-Core
-  - RNDateTimePicker (7.6.1):
+  - RNDateTimePicker (7.6.2):
     - React-Core
   - RNDeviceInfo (10.11.0):
     - React-Core
@@ -471,7 +472,7 @@ PODS:
     - React-Core
   - RNFS (2.20.0):
     - React-Core
-  - RNLocalize (3.0.2):
+  - RNLocalize (3.0.4):
     - React-Core
   - RNQuickAction (0.3.13):
     - React
@@ -479,7 +480,7 @@ PODS:
     - React
   - RNShare (9.4.1):
     - React-Core
-  - RNVectorIcons (10.0.1):
+  - RNVectorIcons (10.0.2):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNZipArchive (6.1.0):
@@ -777,22 +778,22 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 4bb480a183a354e4dbfb1012936b1a2bb9357de7
   React-jsinspector: cdc854f8b13abd202afa54bc12578e5afb9cfae1
   React-logger: ef2269b3afa6ba868da90496c3e17a4ec4f4cee0
-  react-native-alarm-notification: a0fb2ff7ad6973faf141f6a87db7dd924468ad91
+  react-native-alarm-notification: f27565d7b14c206fd1b0caac4aee82d2e7939b7d
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
   react-native-document-picker: 2b8f18667caee73a96708a82b284a4f40b30a156
   react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe
   react-native-geolocation: ef66fb798d96284c6043f0b16c15d9d1d4955db4
-  react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
-  react-native-image-picker: 3269f75c251cdcd61ab51b911dd30d6fff8c6169
+  react-native-get-random-values: 384787fd76976f5aec9465aff6fa9e9129af1e74
+  react-native-image-picker: 2381c008bbb09e72395a2d043c147b11bd1523d9
   react-native-image-resizer: 681f7607418b97c084ba2d0999b153b103040d8a
-  react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
+  react-native-netinfo: 48c5f79a84fbc3ba1d28a8b0d04adeda72885fa8
   react-native-rsa-native: 12132eb627797529fdb1f0d22fd0f8f9678df64a
-  react-native-saf-x: 0f7531c9f8bdbb62bbd55ceb7433de7bb756cd73
+  react-native-saf-x: e0d30813901e54dad462dacda96555f725c2284f
   react-native-safe-area-context: 2cd91d532de12acdb0a9cbc8d43ac72a8e4c897c
-  react-native-slider: 1cdd6ba29675df21f30544253bf7351d3c2d68c4
+  react-native-slider: ae9441a884f8465762f1f68d31eafad42663adb4
   react-native-sqlite-storage: f6d515e1c446d1e6d026aa5352908a25d4de3261
   react-native-version-info: a106f23009ac0db4ee00de39574eb546682579b9
-  react-native-webview: 8fc09f66a1a5b16bbe37c3878fda27d5982bb776
+  react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
   React-perflogger: 217095464d5c4bb70df0742fa86bf2a363693468
   React-RCTActionSheet: 8deae9b85a4cbc6a2243618ea62a374880a2c614
   React-RCTAnimation: 59c62353a8b59ce206044786c5d30e4754bffa64
@@ -809,16 +810,16 @@ SPEC CHECKSUMS:
   rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
   RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
   RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
-  RNDateTimePicker: 8fb39263b721223e095248acaf6f406d5b7f6713
+  RNDateTimePicker: fc2e4f2795877d45e84d85659bebe627eba5c931
   RNDeviceInfo: bf8a32acbcb875f568217285d1793b0e8588c974
   RNExitApp: 00036cabe7bacbb413d276d5520bf74ba39afa6a
   RNFileViewer: ce7ca3ac370e18554d35d6355cffd7c30437c592
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
+  RNLocalize: 1ce4263770515f53d3de442ce7657b3661b16a37
   RNQuickAction: 6d404a869dc872cde841ad3147416a670d13fa93
   RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef
   RNShare: 32e97adc8d8c97d4a26bcdd3c45516882184f8b6
-  RNVectorIcons: ace237de89f1574ef3c963ae9d5da3bd6fbeb02a
+  RNVectorIcons: 23b6e11af4aaf104d169b1b0afa7e5cf96c676ce
   RNZipArchive: ef9451b849c45a29509bf44e65b788829ab07801
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef

packages/app-mobile/package.json

@@ -35,7 +35,7 @@
     "buffer": "6.0.3",
     "constants-browserify": "1.0.0",
     "crypto-browserify": "3.12.0",
-    "deprecated-react-native-prop-types": "4.2.3",
+    "deprecated-react-native-prop-types": "5.0.0",
     "events": "3.3.0",
     "jsc-android": "241213.1.0",
     "lodash": "4.17.21",
@@ -46,7 +46,7 @@
     "react": "18.2.0",
     "react-native": "0.71.10",
     "react-native-camera": "4.2.1",
-    "react-native-device-info": "10.11.0",
+    "react-native-device-info": "10.12.0",
     "react-native-dialogbox": "0.6.10",
     "react-native-document-picker": "9.0.1",
     "react-native-dropdownalert": "5.1.0",
@@ -54,11 +54,11 @@
     "react-native-file-viewer": "2.1.5",
     "react-native-fingerprint-scanner": "6.0.0",
     "react-native-fs": "2.20.0",
-    "react-native-get-random-values": "1.9.0",
+    "react-native-get-random-values": "1.10.0",
     "react-native-image-picker": "7.0.3",
     "react-native-localize": "3.0.4",
     "react-native-modal-datetime-picker": "17.1.0",
-    "react-native-paper": "5.11.3",
+    "react-native-paper": "5.11.4",
     "react-native-popup-menu": "0.16.1",
     "react-native-quick-actions": "0.3.13",
     "react-native-rsa-native": "2.0.5",
@@ -68,7 +68,7 @@
     "react-native-side-menu-updated": "1.3.2",
     "react-native-sqlite-storage": "6.0.1",
     "react-native-url-polyfill": "2.0.0",
-    "react-native-vector-icons": "10.0.2",
+    "react-native-vector-icons": "10.0.3",
     "react-native-version-info": "1.1.1",
     "react-native-vosk": "0.1.12",
     "react-native-webview": "13.6.3",
@@ -94,13 +94,13 @@
     "@tsconfig/react-native": "2.0.2",
     "@types/fs-extra": "11.0.4",
     "@types/jest": "29.5.8",
-    "@types/react": "18.2.42",
+    "@types/react": "18.2.43",
     "@types/react-native": "0.70.6",
-    "@types/react-redux": "7.1.32",
+    "@types/react-redux": "7.1.33",
     "@types/tar-stream": "3.1.3",
     "babel-jest": "29.7.0",
     "babel-plugin-module-resolver": "4.1.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "gulp": "4.0.2",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
@@ -113,7 +113,7 @@
     "sqlite3": "5.1.6",
     "ts-jest": "29.1.1",
     "ts-loader": "9.5.1",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "typescript": "5.2.2",
     "uglify-js": "3.17.4",
     "webpack": "5.74.0"

packages/app-mobile/pluginAssets/index.js

@@ -1,5 +1,5 @@
 module.exports = {
-hash:"6cf170562f87803f3d6b9455bc66ccc9", files: {
+hash:"d4cb80ea030d8b01caeb56299491f244", files: {
 'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
 'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
 'katex/fonts/KaTeX_AMS-Regular.woff2': { data: require('./katex/fonts/KaTeX_AMS-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },

packages/app-mobile/pluginAssets/mermaid/mermaid_render.js.base64.js

@@ -1 +1 @@
-module.exports = `LyogZ2xvYmFsIG1lcm1haWQgKi8KCmZ1bmN0aW9uIG1lcm1haWRSZWFkeSgpIHsKCS8vIFRoZSBNZXJtYWlkIGluaXRpYWxpemF0aW9uIGNvZGUgcmVuZGVycyB0aGUgTWVybWFpZCBjb2RlIHdpdGhpbiBhbnkgZWxlbWVudCB3aXRoIGNsYXNzICJtZXJtYWlkIiBvcgoJLy8gSUQgIm1lcm1haWQiLiBIb3dldmVyIGluIHNvbWUgY2FzZXMgc29tZSBlbGVtZW50cyBtaWdodCBoYXZlIHRoaXMgSUQgYnV0IG5vdCBiZSBNZXJtYWlkIGNvZGUuCgkvLyBGb3IgZXhhbXBsZSwgTWFya2Rvd24gY29kZSBsaWtlIHRoaXM6CgkvLwoJLy8gICAgICMgTWVybWFpZAoJLy8KCS8vIFdpbGwgZ2VuZXJhdGUgdGhpcyBIVE1MOgoJLy8KCS8vICAgICA8aDEgaWQ9Im1lcm1haWQiPk1lcm1haWQ8L2gxPgoJLy8KCS8vIEFuZCB0aGF0J3MgZ29pbmcgdG8gbWFrZSB0aGUgbGliIHNldCB0aGUgYG1lcm1haWRgIG9iamVjdCB0byB0aGUgSDEgZWxlbWVudC4KCS8vIFNvIGJlbG93LCB3ZSBkb3VibGUtY2hlY2sgdGhhdCB3aGF0IHdlIGhhdmUgcmVhbGx5IGlzIGFuIGluc3RhbmNlIG9mIHRoZSBsaWJyYXJ5LgoJcmV0dXJuIHR5cGVvZiBtZXJtYWlkICE9PSAndW5kZWZpbmVkJyAmJiBtZXJtYWlkICE9PSBudWxsICYmIHR5cGVvZiBtZXJtYWlkID09PSAnb2JqZWN0JyAmJiAhIW1lcm1haWQuaW5pdDsKfQoKZnVuY3Rpb24gbWVybWFpZEluaXQoKSB7CgkvLyBNZXJtYWlkJ3Mgd29uZGVyZnVsIEFQSSBoYXMgdHdvIGluaXQgbWV0aG9kczogaW5pdCgpIGFuZCBpbml0aWFsaXplKCkuCgkvLyBpbml0KCkgaXMgZGVwcmVjdGF0ZWQgYnV0IHdvcmtzLCBhbmQgaW5pdGlhbGl6ZSgpIGlzIHJlY29tbWVuZGVkIGJ1dCBkb2Vzbid0CgkvLyB3b3JrLCBzbyBsZXQncyB1c2UgaW5pdCgpIGZvciBub3cuCglpZiAobWVybWFpZFJlYWR5KCkpIHsKCQl0cnkgewoJCQltZXJtYWlkLmluaXQoKTsKCQl9IGNhdGNoIChlcnJvcikgewoJCQljb25zb2xlLmVycm9yKCdNZXJtYWlkIGVycm9yJywgZXJyb3IpOwoJCX0KCgkJLy8gUmVzZXR0aW5nIGVsZW1lbnRzIHNpemUgLSBzZWUgbWVybWFpZC50cwoJCWNvbnN0IGVsZW1lbnRzID0gZG9jdW1lbnQuZ2V0RWxlbWVudHNCeUNsYXNzTmFtZSgnbWVybWFpZCcpOwoJCWZvciAoY29uc3QgZWxlbWVudCBvZiBlbGVtZW50cykgewoJCQllbGVtZW50LnN0eWxlLndpZHRoID0gJzEwMCUnOwoJCX0KCX0KfQoKZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcignam9wbGluLW5vdGVEaWRVcGRhdGUnLCAoKSA9PiB7CgltZXJtYWlkSW5pdCgpOwp9KTsKCmNvbnN0IGluaXRJSURfID0gc2V0SW50ZXJ2YWwoKCkgPT4gewoJY29uc3QgaXNSZWFkeSA9IG1lcm1haWRSZWFkeSgpOwoJaWYgKGlzUmVhZHkpIHsKCQljbGVhckludGVydmFsKGluaXRJSURfKTsKCQltZXJtYWlkSW5pdCgpOwoJfQp9LCAxMDApOwo=`;
+module.exports = `LyogZ2xvYmFsIG1lcm1haWQgKi8KCmZ1bmN0aW9uIG1lcm1haWRSZWFkeSgpIHsKCS8vIFRoZSBNZXJtYWlkIGluaXRpYWxpemF0aW9uIGNvZGUgcmVuZGVycyB0aGUgTWVybWFpZCBjb2RlIHdpdGhpbiBhbnkgZWxlbWVudCB3aXRoIGNsYXNzICJtZXJtYWlkIiBvcgoJLy8gSUQgIm1lcm1haWQiLiBIb3dldmVyIGluIHNvbWUgY2FzZXMgc29tZSBlbGVtZW50cyBtaWdodCBoYXZlIHRoaXMgSUQgYnV0IG5vdCBiZSBNZXJtYWlkIGNvZGUuCgkvLyBGb3IgZXhhbXBsZSwgTWFya2Rvd24gY29kZSBsaWtlIHRoaXM6CgkvLwoJLy8gICAgICMgTWVybWFpZAoJLy8KCS8vIFdpbGwgZ2VuZXJhdGUgdGhpcyBIVE1MOgoJLy8KCS8vICAgICA8aDEgaWQ9Im1lcm1haWQiPk1lcm1haWQ8L2gxPgoJLy8KCS8vIEFuZCB0aGF0J3MgZ29pbmcgdG8gbWFrZSB0aGUgbGliIHNldCB0aGUgYG1lcm1haWRgIG9iamVjdCB0byB0aGUgSDEgZWxlbWVudC4KCS8vIFNvIGJlbG93LCB3ZSBkb3VibGUtY2hlY2sgdGhhdCB3aGF0IHdlIGhhdmUgcmVhbGx5IGlzIGFuIGluc3RhbmNlIG9mIHRoZSBsaWJyYXJ5LgoJcmV0dXJuIHR5cGVvZiBtZXJtYWlkICE9PSAndW5kZWZpbmVkJyAmJiBtZXJtYWlkICE9PSBudWxsICYmIHR5cGVvZiBtZXJtYWlkID09PSAnb2JqZWN0JyAmJiAhIW1lcm1haWQuaW5pdGlhbGl6ZTsKfQoKY29uc3QgaXNEYXJrTW9kZSA9ICgpID0+IHsKCS8vIElmIGFueSBtZXJtYWlkIGVsZW1lbnRzIGFyZSBtYXJrZWQgYXMgcmVxdWlyaW5nIGRhcmsgbW9kZSwgcmVuZGVyICphbGwqCgkvLyBtZXJtYWlkIGVsZW1lbnRzIGluIGRhcmsgbW9kZS4KCXJldHVybiAhIWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJy5tZXJtYWlkLmpvcGxpbi0tbWVybWFpZC11c2UtZGFyay10aGVtZScpOwp9OwoKZnVuY3Rpb24gbWVybWFpZEluaXQoKSB7CglpZiAobWVybWFpZFJlYWR5KCkpIHsKCQljb25zdCBtZXJtYWlkVGFyZ2V0Tm9kZXMgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5Q2xhc3NOYW1lKCdtZXJtYWlkJyk7CgoJCXRyeSB7CgkJCWNvbnN0IGRhcmtNb2RlID0gaXNEYXJrTW9kZSgpOwoJCQltZXJtYWlkLmluaXRpYWxpemUoewoJCQkJLy8gV2UgY2FsbCBtZXJtYWlkLnJ1biBvdXJzZWx2ZXMgd2hlbmV2ZXIgdGhlIG5vdGUgdXBkYXRlcy4gRG9uJ3QgYXV0by1zdGFydAoJCQkJc3RhcnRPbkxvYWQ6IGZhbHNlLAoKCQkJCWRhcmtNb2RlLAoJCQkJdGhlbWU6IGRhcmtNb2RlID8gJ2RhcmsnIDogJ2RlZmF1bHQnLAoJCQl9KTsKCQkJbWVybWFpZC5ydW4oewoJCQkJbm9kZXM6IG1lcm1haWRUYXJnZXROb2RlcywKCQkJfSk7CgkJfSBjYXRjaCAoZXJyb3IpIHsKCQkJY29uc29sZS5lcnJvcignTWVybWFpZCBlcnJvcicsIGVycm9yKTsKCQl9CgoJCS8vIFJlc2V0dGluZyBlbGVtZW50cyBzaXplIC0gc2VlIG1lcm1haWQudHMKCQlmb3IgKGNvbnN0IGVsZW1lbnQgb2YgbWVybWFpZFRhcmdldE5vZGVzKSB7CgkJCWVsZW1lbnQuc3R5bGUud2lkdGggPSAnMTAwJSc7CgkJfQoJfQp9Cgpkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCdqb3BsaW4tbm90ZURpZFVwZGF0ZScsICgpID0+IHsKCW1lcm1haWRJbml0KCk7Cn0pOwoKY29uc3QgaW5pdElJRF8gPSBzZXRJbnRlcnZhbCgoKSA9PiB7Cgljb25zdCBpc1JlYWR5ID0gbWVybWFpZFJlYWR5KCk7CglpZiAoaXNSZWFkeSkgewoJCWNsZWFySW50ZXJ2YWwoaW5pdElJRF8pOwoJCW1lcm1haWRJbml0KCk7Cgl9Cn0sIDEwMCk7Cgpkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCdET01Db250ZW50TG9hZGVkJywgKCkgPT4gewoJLy8gSW4gc29tZSBlbnZpcm9ubWVudHMsIHdlIGNhbiBsb2FkIE1lcm1haWQgaW1tZWRpYXRlbHkgKGUuZy4gbW9iaWxlKS4KCS8vIElmIHdlIGRvbid0IGxvYWQgaXQgaW1tZWRpYXRlbHkgaW4gdGhlc2UgZW52aXJvbm1lbnRzLCBNZXJtYWlkIHNlZW1zCgkvLyB0byBpbml0aWFsaXplIGFuZCBhdXRvLXJ1biwgYnV0IHdpdGhvdXQgb3VyIGNvbmZpZ3VyYXRpb24gY2hhbmdlcy4KCWlmIChtZXJtYWlkUmVhZHkoKSkgewoJCW1lcm1haWRJbml0KCk7Cgl9IGVsc2UgewoJCWNsZWFySW50ZXJ2YWwoaW5pdElJRF8pOwoJfQp9KTsK`;

packages/app-mobile/root.tsx

@@ -40,13 +40,12 @@ import { Provider as PaperProvider, MD3DarkTheme, MD3LightTheme } from 'react-na
 const { BackButtonService } = require('./services/back-button.js');
 import NavService from '@joplin/lib/services/NavService';
 import { createStore, applyMiddleware } from 'redux';
-const reduxSharedMiddleware = require('@joplin/lib/components/shared/reduxSharedMiddleware');
+import reduxSharedMiddleware from '@joplin/lib/components/shared/reduxSharedMiddleware';
 const { shimInit } = require('./utils/shim-init-react.js');
 const { AppNav } = require('./components/app-nav.js');
 import Note from '@joplin/lib/models/Note';
 import Folder from '@joplin/lib/models/Folder';
 import BaseSyncTarget from '@joplin/lib/BaseSyncTarget';
-const { FoldersScreenUtils } = require('@joplin/lib/folders-screen-utils.js');
 import Resource from '@joplin/lib/models/Resource';
 import Tag from '@joplin/lib/models/Tag';
 import NoteTag from '@joplin/lib/models/NoteTag';
@@ -75,7 +74,7 @@ import { reg } from '@joplin/lib/registry';
 const { defaultState } = require('@joplin/lib/reducer');
 const { FileApiDriverLocal } = require('@joplin/lib/file-api-driver-local');
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
-import SearchEngine from '@joplin/lib/services/searchengine/SearchEngine';
+import SearchEngine from '@joplin/lib/services/search/SearchEngine';
 import WelcomeUtils from '@joplin/lib/WelcomeUtils';
 const { themeStyle } = require('./components/global-style.js');
 import SyncTargetRegistry from '@joplin/lib/SyncTargetRegistry';
@@ -122,6 +121,7 @@ import { ReactNode } from 'react';
 import { parseShareCache } from '@joplin/lib/services/share/reducer';
 import autodetectTheme, { onSystemColorSchemeChange } from './utils/autodetectTheme';
 import runOnDeviceFsDriverTests from './utils/fs-driver/runOnDeviceTests';
+import { refreshFolders } from '@joplin/lib/folders-screen-utils';
 
 type SideMenuPosition = 'left' | 'right';
 
@@ -149,7 +149,7 @@ const generalMiddleware = (store: any) => (next: any) => async (action: any) =>
 	const result = next(action);
 	const newState = store.getState();
 
-	await reduxSharedMiddleware(store, next, action);
+	await reduxSharedMiddleware(store, next, action, storeDispatch as any);
 
 	if (action.type === 'NAV_GO') Keyboard.dismiss();
 
@@ -515,7 +515,6 @@ async function initialize(dispatch: Function) {
 
 	// reg.dispatch = dispatch;
 	BaseModel.dispatch = dispatch;
-	FoldersScreenUtils.dispatch = dispatch;
 	BaseSyncTarget.dispatch = dispatch;
 	NavService.dispatch = dispatch;
 	BaseModel.setDb(db);
@@ -637,7 +636,7 @@ async function initialize(dispatch: Function) {
 
 		reg.logger().info('Loading folders...');
 
-		await FoldersScreenUtils.refreshFolders();
+		await refreshFolders((action: any) => dispatch(action));
 
 		const tags = await Tag.allWithNotes();
 
@@ -999,7 +998,7 @@ class AppComponent extends React.Component {
 
 	public UNSAFE_componentWillReceiveProps(newProps: any) {
 		if (newProps.syncStarted !== this.lastSyncStarted_) {
-			if (!newProps.syncStarted) FoldersScreenUtils.refreshFolders();
+			if (!newProps.syncStarted) void refreshFolders((action: any) => this.props.dispatch(action));
 			this.lastSyncStarted_ = newProps.syncStarted;
 		}
 	}

packages/default-plugins/package.json

@@ -14,12 +14,12 @@
   },
   "devDependencies": {
     "@types/yargs": "17.0.32",
-    "ts-node": "10.9.1",
+    "ts-node": "10.9.2",
     "typescript": "5.2.2"
   },
   "dependencies": {
     "@joplin/utils": "~2.14",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "yargs": "17.7.2"
   }
 }

packages/default-plugins/pluginRepositories.json

@@ -2,6 +2,6 @@
 	"io.github.jackgruber.backup": {
 		"cloneUrl": "https://github.com/JackGruber/joplin-plugin-backup.git",
 		"branch": "master",
-		"commit": "021085cc37ed83a91a7950744e462782e27c04a6"
+		"commit": "bd49c665bf60c1e0dd9b9862b2ba69cad3d4c9ae"
 	}
 }

packages/editor/package.json

@@ -17,8 +17,8 @@
     "@joplin/lib": "~2.14",
     "@testing-library/react-hooks": "8.0.1",
     "@types/jest": "29.5.8",
-    "@types/react": "18.2.42",
-    "@types/react-redux": "7.1.32",
+    "@types/react": "18.2.43",
+    "@types/react-redux": "7.1.33",
     "@types/styled-components": "5.1.32",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",

packages/fork-sax/package.json

@@ -16,7 +16,7 @@
   ],
   "devDependencies": {
     "standard": "17.1.0",
-    "tap": "16.3.9"
+    "tap": "16.3.10"
   },
   "gitHead": "05a29b450962bf05a8642bbd39446a1f679a96ba"
 }

packages/htmlpack/package.json

@@ -14,10 +14,10 @@
   "author": "Laurent Cozic",
   "license": "MIT",
   "dependencies": {
+    "@adobe/css-tools": "4.3.2",
     "@joplin/fork-htmlparser2": "^4.1.50",
-    "css": "3.0.0",
     "datauri": "4.1.0",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "html-entities": "1.4.0"
   },
   "devDependencies": {

packages/htmlpack/src/index.ts

@@ -2,8 +2,7 @@ import * as fs from 'fs-extra';
 const Entities = require('html-entities').AllHtmlEntities;
 const htmlparser2 = require('@joplin/fork-htmlparser2');
 const Datauri = require('datauri/sync');
-const cssParse = require('css/lib/parse');
-const cssStringify = require('css/lib/stringify');
+import { CssTypes, parse as cssParse, stringify as cssStringify } from '@adobe/css-tools';
 
 const selfClosingElements = [
 	'area',
@@ -72,6 +71,10 @@ const processCssContent = (cssBaseDir: string, content: string): string => {
 	for (const rule of o.stylesheet.rules) {
 		if (rule.type === 'font-face') {
 			for (const declaration of rule.declarations) {
+				if (declaration.type === CssTypes.comment) {
+					continue;
+				}
+
 				if (declaration.property === 'src') {
 					declaration.value = declaration.value.replace(/url\((.*?)\)/g, (_v: any, url: string) => {
 						const cssFilePath = `${cssBaseDir}/${url}`;

packages/lib/BaseApplication.ts

@@ -13,7 +13,7 @@ import SyncTargetOneDrive from './SyncTargetOneDrive';
 import { createStore, applyMiddleware, Store } from 'redux';
 const { defaultState, stateUtils } = require('./reducer');
 import JoplinDatabase from './JoplinDatabase';
-const { FoldersScreenUtils } = require('./folders-screen-utils.js');
+import { cancelTimers as folderScreenUtilsCancelTimers, refreshFolders, scheduleRefreshFolders } from './folders-screen-utils';
 const { DatabaseDriverNode } = require('./database-driver-node.js');
 import BaseModel from './BaseModel';
 import Folder from './models/Folder';
@@ -24,7 +24,7 @@ import { splitCommandString } from '@joplin/utils';
 import { reg } from './registry';
 import time from './time';
 import BaseSyncTarget from './BaseSyncTarget';
-const reduxSharedMiddleware = require('./components/shared/reduxSharedMiddleware');
+import reduxSharedMiddleware from './components/shared/reduxSharedMiddleware';
 const os = require('os');
 import dns = require('dns');
 import fs = require('fs-extra');
@@ -38,8 +38,8 @@ const SyncTargetDropbox = require('./SyncTargetDropbox.js');
 const SyncTargetAmazonS3 = require('./SyncTargetAmazonS3.js');
 import EncryptionService from './services/e2ee/EncryptionService';
 import ResourceFetcher from './services/ResourceFetcher';
-import SearchEngineUtils from './services/searchengine/SearchEngineUtils';
-import SearchEngine, { ProcessResultsRow } from './services/searchengine/SearchEngine';
+import SearchEngineUtils from './services/search/SearchEngineUtils';
+import SearchEngine, { ProcessResultsRow } from './services/search/SearchEngine';
 import RevisionService from './services/RevisionService';
 import ResourceService from './services/ResourceService';
 import DecryptionWorker from './services/DecryptionWorker';
@@ -107,7 +107,7 @@ export default class BaseApplication {
 		await ResourceFetcher.instance().destroy();
 		await SearchEngine.instance().destroy();
 		await DecryptionWorker.instance().destroy();
-		await FoldersScreenUtils.cancelTimers();
+		await folderScreenUtilsCancelTimers();
 		await BaseItem.revisionService_.cancelTimers();
 		await ResourceService.instance().cancelTimers();
 		await reg.cancelTimers();
@@ -418,12 +418,11 @@ export default class BaseApplication {
 
 		const result = next(action);
 		let refreshNotes = false;
-		let refreshFolders: boolean | string = false;
-		// let refreshTags = false;
+		let doRefreshFolders: boolean | string = false;
 		let refreshNotesUseSelectedNoteId = false;
 		let refreshNotesHash = '';
 
-		await reduxSharedMiddleware(store, next, action);
+		await reduxSharedMiddleware(store, next, action, ((action: any) => { this.dispatch(action); }) as any);
 		const newState = store.getState() as State;
 
 		if (this.hasGui() && ['NOTE_UPDATE_ONE', 'NOTE_DELETE', 'FOLDER_UPDATE_ONE', 'FOLDER_DELETE'].indexOf(action.type) >= 0) {
@@ -434,7 +433,7 @@ export default class BaseApplication {
 		// Don't add FOLDER_UPDATE_ALL as refreshFolders() is calling it too, which
 		// would cause the sidebar to refresh all the time.
 		if (this.hasGui() && ['FOLDER_UPDATE_ONE'].indexOf(action.type) >= 0) {
-			refreshFolders = true;
+			doRefreshFolders = true;
 		}
 
 		if (action.type === 'HISTORY_BACKWARD' || action.type === 'HISTORY_FORWARD') {
@@ -510,23 +509,23 @@ export default class BaseApplication {
 				action.changedFields.includes('encryption_applied') ||
 				action.changedFields.includes('is_conflict')
 			) {
-				refreshFolders = true;
+				doRefreshFolders = true;
 			}
 		}
 
 		if (action.type === 'NOTE_DELETE') {
-			refreshFolders = true;
+			doRefreshFolders = true;
 		}
 
 		if (this.hasGui() && action.type === 'SETTING_UPDATE_ALL') {
-			refreshFolders = 'now';
+			doRefreshFolders = 'now';
 		}
 
 		if (this.hasGui() && action.type === 'SETTING_UPDATE_ONE' && (
 			action.key.indexOf('folders.sortOrder') === 0 ||
 			action.key === 'showNoteCounts' ||
 			action.key === 'showCompletedTodos')) {
-			refreshFolders = 'now';
+			doRefreshFolders = 'now';
 		}
 
 		if (this.hasGui() && action.type === 'SYNC_GOT_ENCRYPTED_ITEM') {
@@ -543,11 +542,11 @@ export default class BaseApplication {
 			await this.applySettingsSideEffects();
 		}
 
-		if (refreshFolders) {
-			if (refreshFolders === 'now') {
-				await FoldersScreenUtils.refreshFolders();
+		if (doRefreshFolders) {
+			if (doRefreshFolders === 'now') {
+				await refreshFolders((action: any) => this.dispatch(action));
 			} else {
-				await FoldersScreenUtils.scheduleRefreshFolders();
+				await scheduleRefreshFolders((action: any) => this.dispatch(action));
 			}
 		}
 		return result;
@@ -571,8 +570,6 @@ export default class BaseApplication {
 		});
 
 		BaseModel.dispatch = this.store().dispatch;
-		FoldersScreenUtils.dispatch = this.store().dispatch;
-		// reg.dispatch = this.store().dispatch;
 		BaseSyncTarget.dispatch = this.store().dispatch;
 		DecryptionWorker.instance().dispatch = this.store().dispatch;
 		ResourceFetcher.instance().dispatch = this.store().dispatch;
@@ -582,8 +579,6 @@ export default class BaseApplication {
 	public deinitRedux() {
 		this.store_ = null;
 		BaseModel.dispatch = function() {};
-		FoldersScreenUtils.dispatch = function() {};
-		// reg.dispatch = function() {};
 		BaseSyncTarget.dispatch = function() {};
 		DecryptionWorker.instance().dispatch = function() {};
 		ResourceFetcher.instance().dispatch = function() {};

packages/lib/BaseModel.ts

@@ -1,5 +1,4 @@
 import paginationToSql from './models/utils/paginationToSql';
-
 import Database from './database';
 import uuid from './uuid';
 import time from './time';
@@ -271,11 +270,15 @@ class BaseModel {
 		return this.modelSelectAll(`SELECT * FROM \`${this.tableName()}\` WHERE \`id\` LIKE ?`, [`${partialId}%`]);
 	}
 
-	public static applySqlOptions(options: any, sql: string, params: any[] = null) {
+	public static applySqlOptions(options: LoadOptions, sql: string, params: any[] = null) {
 		if (!options) options = {};
 
 		if (options.order && options.order.length) {
-			sql += ` ORDER BY ${paginationToSql(options)}`;
+			sql += ` ORDER BY ${paginationToSql({
+				limit: options.limit,
+				order: options.order as any,
+				page: 1,
+			})}`;
 		}
 
 		if (options.limit) sql += ` LIMIT ${options.limit}`;
@@ -289,7 +292,7 @@ class BaseModel {
 		return rows.map((r: any) => r.id);
 	}
 
-	public static async all(options: any = null) {
+	public static async all(options: LoadOptions = null) {
 		if (!options) options = {};
 		if (!options.fields) options.fields = '*';
 

packages/lib/HtmlToMd.ts

@@ -8,6 +8,7 @@ export interface ParseOptions {
 	anchorNames?: string[];
 	preserveImageTagsWithSize?: boolean;
 	preserveNestedTables?: boolean;
+	preserveColorStyles?: boolean;
 	baseUrl?: string;
 	disableEscapeContent?: boolean;
 	convertEmbeddedPdfsToLinks?: boolean;
@@ -22,6 +23,7 @@ export default class HtmlToMd {
 			codeBlockStyle: 'fenced',
 			preserveImageTagsWithSize: !!options.preserveImageTagsWithSize,
 			preserveNestedTables: !!options.preserveNestedTables,
+			preserveColorStyles: !!options.preserveColorStyles,
 			bulletListMarker: '-',
 			emDelimiter: '*',
 			strongDelimiter: '**',

packages/lib/JoplinDatabase.ts

@@ -1,13 +1,10 @@
 import Resource from './models/Resource';
 import shim from './shim';
 import Database from './database';
-import migration42 from './services/database/migrations/42';
-import migration43 from './services/database/migrations/43';
-import migration44 from './services/database/migrations/44';
-import migration45 from './services/database/migrations/45';
-import { SqlQuery, Migration } from './services/database/types';
+import { SqlQuery } from './services/database/types';
 import addMigrationFile from './services/database/addMigrationFile';
 import sqlStringToLines from './services/database/sqlStringToLines';
+import migrations from './services/database/migrations';
 
 const { sprintf } = require('sprintf-js');
 
@@ -125,13 +122,6 @@ CREATE TABLE version (
 INSERT INTO version (version) VALUES (1);
 `;
 
-const migrations: Migration[] = [
-	migration42,
-	migration43,
-	migration44,
-	migration45,
-];
-
 export interface TableField {
 	name: string;
 	type: number;

packages/lib/Synchronizer.ts

@@ -26,10 +26,11 @@ import { fetchSyncInfo, getActiveMasterKey, localSyncInfo, mergeSyncInfos, saveL
 import { getMasterPassword, setupAndDisableEncryption, setupAndEnableEncryption } from './services/e2ee/utils';
 import { generateKeyPair } from './services/e2ee/ppk';
 import syncDebugLog from './services/synchronizer/syncDebugLog';
-import handleConflictAction, { ConflictAction } from './services/synchronizer/utils/handleConflictAction';
+import handleConflictAction from './services/synchronizer/utils/handleConflictAction';
 import resourceRemotePath from './services/synchronizer/utils/resourceRemotePath';
 import syncDeleteStep from './services/synchronizer/utils/syncDeleteStep';
 import { ErrorCode } from './errors';
+import { SyncAction } from './services/synchronizer/utils/types';
 const { sprintf } = require('sprintf-js');
 const { Dirnames } = require('./services/synchronizer/utils/types');
 
@@ -199,7 +200,7 @@ export default class Synchronizer {
 		return lines;
 	}
 
-	public logSyncOperation(action: string, local: any = null, remote: RemoteItem = null, message: string = null, actionCount = 1) {
+	public logSyncOperation(action: SyncAction | 'cancelling' | 'starting' | 'fetchingTotal' | 'fetchingProcessed' | 'finished', local: any = null, remote: RemoteItem = null, message: string = null, actionCount = 1) {
 		const line = ['Sync'];
 		line.push(action);
 		if (message) line.push(message);
@@ -577,20 +578,20 @@ export default class Synchronizer {
 						if (donePaths.indexOf(path) >= 0) throw new JoplinError(sprintf('Processing a path that has already been done: %s. sync_time was not updated? Remote item has an updated_time in the future?', path), 'processingPathTwice');
 
 						const remote: RemoteItem = result.neverSyncedItemIds.includes(local.id) ? null : await this.apiCall('stat', path);
-						let action = null;
+						let action: SyncAction = null;
 						let itemIsReadOnly = false;
 						let reason = '';
 						let remoteContent = null;
 
 						const getConflictType = (conflictedItem: any) => {
-							if (conflictedItem.type_ === BaseModel.TYPE_NOTE) return 'noteConflict';
-							if (conflictedItem.type_ === BaseModel.TYPE_RESOURCE) return 'resourceConflict';
-							return 'itemConflict';
+							if (conflictedItem.type_ === BaseModel.TYPE_NOTE) return SyncAction.NoteConflict;
+							if (conflictedItem.type_ === BaseModel.TYPE_RESOURCE) return SyncAction.ResourceConflict;
+							return SyncAction.ItemConflict;
 						};
 
 						if (!remote) {
 							if (!local.sync_time) {
-								action = 'createRemote';
+								action = SyncAction.CreateRemote;
 								reason = 'remote does not exist, and local is new and has never been synced';
 							} else {
 								// Note or item was modified after having been deleted remotely
@@ -635,7 +636,7 @@ export default class Synchronizer {
 								action = getConflictType(local);
 								reason = 'both remote and local have changes';
 							} else {
-								action = 'updateRemote';
+								action = SyncAction.UpdateRemote;
 								reason = 'local has changes';
 							}
 						}
@@ -648,7 +649,7 @@ export default class Synchronizer {
 
 						this.logSyncOperation(action, local, remote, reason);
 
-						if (local.type_ === BaseModel.TYPE_RESOURCE && (action === 'createRemote' || action === 'updateRemote')) {
+						if (local.type_ === BaseModel.TYPE_RESOURCE && (action === SyncAction.CreateRemote || action === SyncAction.UpdateRemote)) {
 							const localState = await Resource.localState(local.id);
 							if (localState.fetch_status !== Resource.FETCH_STATUS_DONE) {
 								// This condition normally shouldn't happen
@@ -722,7 +723,7 @@ export default class Synchronizer {
 							}
 						}
 
-						if (action === 'createRemote' || action === 'updateRemote') {
+						if (action === SyncAction.CreateRemote || action === SyncAction.UpdateRemote) {
 							let canSync = true;
 							try {
 								if (this.testingHooks_.indexOf('notesRejectedByTarget') >= 0 && local.type_ === BaseModel.TYPE_NOTE) throw new JoplinError('Testing rejectedByTarget', 'rejectedByTarget');
@@ -766,7 +767,7 @@ export default class Synchronizer {
 						}
 
 						await handleConflictAction(
-							action as ConflictAction,
+							action,
 							ItemClass,
 							!!remote,
 							remoteContent,
@@ -826,6 +827,8 @@ export default class Synchronizer {
 
 					const supportsDeltaWithItems = getSupportsDeltaWithItems(listResult);
 
+					logger.info('supportsDeltaWithItems = ', supportsDeltaWithItems);
+
 					const remotes = listResult.items;
 
 					this.logSyncOperation('fetchingTotal', null, null, 'Fetching delta items from sync target', remotes.length);
@@ -875,7 +878,7 @@ export default class Synchronizer {
 
 						const path = remote.path;
 						const remoteId = BaseItem.pathToId(path);
-						let action = null;
+						let action: SyncAction = null;
 						let reason = '';
 						let local = locals.find(l => l.id === remoteId);
 						let ItemClass = null;
@@ -884,7 +887,7 @@ export default class Synchronizer {
 						try {
 							if (!local) {
 								if (remote.isDeleted !== true) {
-									action = 'createLocal';
+									action = SyncAction.CreateLocal;
 									reason = 'remote exists but local does not';
 									content = await loadContent();
 									ItemClass = content ? BaseItem.itemClass(content) : null;
@@ -893,7 +896,7 @@ export default class Synchronizer {
 								ItemClass = BaseItem.itemClass(local);
 								local = ItemClass.filter(local);
 								if (remote.isDeleted) {
-									action = 'deleteLocal';
+									action = SyncAction.DeleteLocal;
 									reason = 'remote has been deleted';
 								} else {
 									if (this.api().supportsAccurateTimestamp && remote.jop_updated_time === local.updated_time) {
@@ -901,7 +904,7 @@ export default class Synchronizer {
 									} else {
 										content = await loadContent();
 										if (content && content.updated_time > local.updated_time) {
-											action = 'updateLocal';
+											action = SyncAction.UpdateLocal;
 											reason = 'remote is more recent than local';
 										}
 									}
@@ -924,7 +927,7 @@ export default class Synchronizer {
 
 						this.logSyncOperation(action, local, remote, reason);
 
-						if (action === 'createLocal' || action === 'updateLocal') {
+						if (action === SyncAction.CreateLocal || action === SyncAction.UpdateLocal) {
 							if (content === null) {
 								logger.warn(`Remote has been deleted between now and the delta() call? In that case it will be handled during the next sync: ${path}`);
 								continue;
@@ -944,10 +947,10 @@ export default class Synchronizer {
 								nextQueries: BaseItem.updateSyncTimeQueries(syncTargetId, content, time.unixMs()),
 								changeSource: ItemChange.SOURCE_SYNC,
 							};
-							if (action === 'createLocal') options.isNew = true;
-							if (action === 'updateLocal') options.oldItem = local;
+							if (action === SyncAction.CreateLocal) options.isNew = true;
+							if (action === SyncAction.UpdateLocal) options.oldItem = local;
 
-							const creatingOrUpdatingResource = content.type_ === BaseModel.TYPE_RESOURCE && (action === 'createLocal' || action === 'updateLocal');
+							const creatingOrUpdatingResource = content.type_ === BaseModel.TYPE_RESOURCE && (action === SyncAction.CreateLocal || action === SyncAction.UpdateLocal);
 
 							if (creatingOrUpdatingResource) {
 								if (content.size >= this.maxResourceSize()) {
@@ -991,7 +994,7 @@ export default class Synchronizer {
 							// }
 
 							if (content.encryption_applied) this.dispatch({ type: 'SYNC_GOT_ENCRYPTED_ITEM' });
-						} else if (action === 'deleteLocal') {
+						} else if (action === SyncAction.DeleteLocal) {
 							if (local.type_ === BaseModel.TYPE_FOLDER) {
 								localFoldersToDelete.push(local);
 								continue;

packages/lib/clipperUtils.ts

@@ -1,3 +1,6 @@
+// Do not import anything here -- the built version of this file is copied to packages/app-clipper's
+// content_scripts folder.
+
 function absoluteUrl(url: string) {
 	if (!url) return url;
 	const protocol = url.toLowerCase().split(':')[0];
@@ -133,3 +136,7 @@ export function getStyleSheets(doc: Document) {
 	}
 	return output;
 }
+
+// Required to run in Firefox with tabs.executeScript. See
+// https://stackoverflow.com/a/44774834
+undefined;

packages/lib/commands/index.ts

@@ -1,10 +1,10 @@
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`
 import * as historyBackward from './historyBackward';
 import * as historyForward from './historyForward';
 import * as openMasterPasswordDialog from './openMasterPasswordDialog';
 import * as synchronize from './synchronize';
 
-const index:any[] = [
+const index: any[] = [
 	historyBackward,
 	historyForward,
 	openMasterPasswordDialog,
@@ -12,4 +12,4 @@ const index:any[] = [
 ];
 
 export default index;
-// AUTO-GENERATED using `gulp buildCommandIndex`
+// AUTO-GENERATED using `gulp buildScriptIndexes`

packages/lib/components/shared/reduxSharedMiddleware.ts

@@ -7,13 +7,19 @@ import ResourceFetcher from '../../services/ResourceFetcher';
 import DecryptionWorker from '../../services/DecryptionWorker';
 import eventManager from '../../eventManager';
 import BaseItem from '../../models/BaseItem';
+import shim from '../../shim';
+import { Dispatch } from 'redux';
+import { State } from '../../reducer';
 
-const reduxSharedMiddleware = async function(store: any, _next: any, action: any) {
-	const newState = store.getState();
+let sortNoteListTimeout: any = null;
+
+export default async (store: any, _next: any, action: any, dispatch: Dispatch) => {
+	const newState: State = store.getState();
 
 	eventManager.appStateEmit(newState);
 
 	let refreshTags = false;
+	let sortNoteList = false;
 
 	if (action.type === 'FOLDER_SET_COLLAPSED' || action.type === 'FOLDER_TOGGLE') {
 		Setting.setValue('collapsedFolderIds', newState.collapsedFolderIds);
@@ -57,6 +63,9 @@ const reduxSharedMiddleware = async function(store: any, _next: any, action: any
 		refreshTags = true;
 	}
 
+	if (action.type === 'NOTE_UPDATE_ONE') {
+		sortNoteList = true;
+	}
 
 	if (action.type === 'NOTE_SELECT' || action.type === 'NAV_BACK') {
 		const noteIds = newState.provisionalNoteIds.slice();
@@ -98,6 +107,22 @@ const reduxSharedMiddleware = async function(store: any, _next: any, action: any
 		});
 	}
 
+	if (sortNoteList) {
+		if (sortNoteListTimeout) shim.clearTimeout(sortNoteListTimeout);
+		sortNoteListTimeout = null;
+
+		// We sort the note lists with two seconds debounce because doing can be
+		// very slow and would have to be done every time a note is added.
+		if (Date.now() - newState.noteListLastSortTime > 10000) {
+			dispatch({ type: 'NOTE_SORT' });
+		} else {
+			sortNoteListTimeout = shim.setTimeout(() => {
+				sortNoteListTimeout = null;
+				dispatch({ type: 'NOTE_SORT' });
+			}, 2000);
+		}
+	}
+
 	if (action.type.startsWith('SHARE_')) {
 		const serialized = JSON.stringify(newState.shareService);
 		Setting.setValue('sync.shareCache', serialized);
@@ -116,6 +141,3 @@ const reduxSharedMiddleware = async function(store: any, _next: any, action: any
 		}
 	}
 };
-
-module.exports = reduxSharedMiddleware;
-

packages/lib/components/shared/side-menu-shared.ts

@@ -1,9 +1,20 @@
-const Folder = require('../../models/Folder').default;
-const BaseModel = require('../../BaseModel').default;
+import Folder from '../../models/Folder';
+import BaseModel from '../../BaseModel';
+import { FolderEntity, TagEntity } from '../../services/database/types';
 
-const shared = {};
+interface Props {
+	folders: FolderEntity[];
+	selectedFolderId: string;
+	notesParentType: string;
+	collapsedFolderIds: string[];
+	selectedTagId: string;
+	tags?: TagEntity[];
+}
 
-function folderHasChildren_(folders, folderId) {
+type RenderFolderItem = (folder: FolderEntity, selected: boolean, hasChildren: boolean, depth: number)=> any;
+type RenderTagItem = (tag: TagEntity, selected: boolean)=> any;
+
+function folderHasChildren_(folders: FolderEntity[], folderId: string) {
 	for (let i = 0; i < folders.length; i++) {
 		const folder = folders[i];
 		if (folder.parent_id === folderId) return true;
@@ -11,7 +22,7 @@ function folderHasChildren_(folders, folderId) {
 	return false;
 }
 
-function folderIsVisible(folders, folderId, collapsedFolderIds) {
+function folderIsVisible(folders: FolderEntity[], folderId: string, collapsedFolderIds: string[]) {
 	if (!collapsedFolderIds || !collapsedFolderIds.length) return true;
 
 	while (true) {
@@ -23,7 +34,7 @@ function folderIsVisible(folders, folderId, collapsedFolderIds) {
 	}
 }
 
-function renderFoldersRecursive_(props, renderItem, items, parentId, depth, order) {
+function renderFoldersRecursive_(props: Props, renderItem: RenderFolderItem, items: any[], parentId: string, depth: number, order: string[]) {
 	const folders = props.folders;
 	for (let i = 0; i < folders.length; i++) {
 		const folder = folders[i];
@@ -44,11 +55,11 @@ function renderFoldersRecursive_(props, renderItem, items, parentId, depth, orde
 	};
 }
 
-shared.renderFolders = function(props, renderItem) {
+export const renderFolders = (props: Props, renderItem: RenderFolderItem) => {
 	return renderFoldersRecursive_(props, renderItem, [], '', 0, []);
 };
 
-shared.renderTags = function(props, renderItem) {
+export const renderTags = (props: Props, renderItem: RenderTagItem) => {
 	const tags = props.tags.slice();
 	tags.sort((a, b) => {
 		// It seems title can sometimes be undefined (perhaps when syncing
@@ -75,5 +86,3 @@ shared.renderTags = function(props, renderItem) {
 		order: order,
 	};
 };
-
-module.exports = shared;

packages/lib/file-api-driver-joplinServer.ts

@@ -50,15 +50,19 @@ export default class FileApiDriverJoplinServer {
 	}
 
 	private metadataToStat_(md: any, path: string, isDeleted = false, rootPath: string) {
-		const output = {
+		const output: any = {
 			path: rootPath ? path.substr(rootPath.length + 1) : path,
 			updated_time: md.updated_time,
 			jop_updated_time: md.jop_updated_time,
 			isDir: false,
 			isDeleted: isDeleted,
-			jopItem: md.jopItem,
 		};
 
+		// Only add this object is it's also present in the raw data. This is
+		// because `getSupportsDeltaWithItems()` relies on it being present or
+		// not to decide if the sync target supports "delta with items".
+		if ('jopItem' in md) output.jopItem = md.jopItem;
+
 		return output;
 	}
 

packages/lib/folders-screen-utils.js

@@ -1,75 +0,0 @@
-const Folder = require('./models/Folder').default;
-const Setting = require('./models/Setting').default;
-const shim = require('./shim').default;
-
-class FoldersScreenUtils {
-	static async allForDisplay(options = {}) {
-		const orderDir = Setting.value('folders.sortOrder.reverse') ? 'DESC' : 'ASC';
-
-		const folderOptions = {
-
-			caseInsensitive: true,
-			order: [
-				{
-					by: 'title',
-					dir: orderDir,
-				},
-			],
-			...options,
-		};
-
-		let folders = await Folder.all(folderOptions);
-
-		if (Setting.value('folders.sortOrder.field') === 'last_note_user_updated_time') {
-			folders = await Folder.orderByLastModified(folders, orderDir);
-		}
-
-		if (Setting.value('showNoteCounts')) {
-			await Folder.addNoteCounts(folders,
-				Setting.value('showCompletedTodos'));
-		}
-
-		return folders;
-	}
-
-	static async refreshFolders() {
-		FoldersScreenUtils.refreshCalls_.push(true);
-		try {
-			const folders = await this.allForDisplay({ includeConflictFolder: true });
-
-			this.dispatch({
-				type: 'FOLDER_UPDATE_ALL',
-				items: folders,
-			});
-		} finally {
-			FoldersScreenUtils.refreshCalls_.pop();
-		}
-	}
-
-	static scheduleRefreshFolders() {
-		if (this.scheduleRefreshFoldersIID_) shim.clearTimeout(this.scheduleRefreshFoldersIID_);
-		this.scheduleRefreshFoldersIID_ = shim.setTimeout(() => {
-			this.scheduleRefreshFoldersIID_ = null;
-			this.refreshFolders();
-		}, 1000);
-	}
-
-	static async cancelTimers() {
-		if (this.scheduleRefreshFoldersIID_) {
-			shim.clearTimeout(this.scheduleRefreshFoldersIID_);
-			this.scheduleRefreshFoldersIID_ = null;
-		}
-		return new Promise((resolve) => {
-			const iid = shim.setInterval(() => {
-				if (!FoldersScreenUtils.refreshCalls_.length) {
-					shim.clearInterval(iid);
-					resolve();
-				}
-			}, 100);
-		});
-	}
-}
-
-FoldersScreenUtils.refreshCalls_ = [];
-
-module.exports = { FoldersScreenUtils };

packages/lib/folders-screen-utils.ts

@@ -0,0 +1,73 @@
+import { Dispatch } from 'redux';
+import Folder from './models/Folder';
+import Setting from './models/Setting';
+import shim from './shim';
+import { FolderLoadOptions } from './models/utils/types';
+
+const refreshCalls_: boolean[] = [];
+let scheduleRefreshFoldersIID_: any = null;
+
+export const allForDisplay = async (options: FolderLoadOptions = {}) => {
+	const orderDir = Setting.value('folders.sortOrder.reverse') ? 'DESC' : 'ASC';
+
+	const folderOptions: FolderLoadOptions = {
+		caseInsensitive: true,
+		order: [
+			{
+				by: 'title',
+				dir: orderDir,
+			},
+		],
+		...options,
+	};
+
+	let folders = await Folder.all(folderOptions);
+
+	if (Setting.value('folders.sortOrder.field') === 'last_note_user_updated_time') {
+		folders = await Folder.orderByLastModified(folders, orderDir);
+	}
+
+	if (Setting.value('showNoteCounts')) {
+		await Folder.addNoteCounts(folders,
+			Setting.value('showCompletedTodos'));
+	}
+
+	return folders;
+};
+
+export const refreshFolders = async (dispatch: Dispatch) => {
+	refreshCalls_.push(true);
+	try {
+		const folders = await allForDisplay({ includeConflictFolder: true });
+
+		dispatch({
+			type: 'FOLDER_UPDATE_ALL',
+			items: folders,
+		});
+	} finally {
+		refreshCalls_.pop();
+	}
+};
+
+export const scheduleRefreshFolders = async (dispatch: Dispatch) => {
+	if (scheduleRefreshFoldersIID_) shim.clearTimeout(scheduleRefreshFoldersIID_);
+	scheduleRefreshFoldersIID_ = shim.setTimeout(() => {
+		scheduleRefreshFoldersIID_ = null;
+		void refreshFolders(dispatch);
+	}, 1000);
+};
+
+export const cancelTimers = async () => {
+	if (scheduleRefreshFoldersIID_) {
+		shim.clearTimeout(scheduleRefreshFoldersIID_);
+		scheduleRefreshFoldersIID_ = null;
+	}
+	return new Promise((resolve) => {
+		const iid = shim.setInterval(() => {
+			if (!refreshCalls_.length) {
+				shim.clearInterval(iid);
+				resolve(null);
+			}
+		}, 100);
+	});
+};

packages/lib/import-enex-md-gen.test.ts

@@ -6,16 +6,16 @@ const os = require('os');
 const { filename } = require('./path-utils');
 import { setupDatabaseAndSynchronizer, switchClient, expectNotThrow, supportDir, expectThrow } from './testing/test-utils';
 const { enexXmlToMd } = require('./import-enex-md-gen.js');
-import importEnex from './import-enex';
+import importEnex, { ImportOptions } from './import-enex';
 import Note from './models/Note';
 import Tag from './models/Tag';
 import Resource from './models/Resource';
 
 const enexSampleBaseDir = `${supportDir}/../enex_to_md`;
 
-const importEnexFile = async (filename: string) => {
+const importEnexFile = async (filename: string, options: ImportOptions = null) => {
 	const filePath = `${enexSampleBaseDir}/${filename}`;
-	await importEnex('', filePath);
+	await importEnex('', filePath, options);
 };
 
 const readExpectedFile = async (filename: string) => {
@@ -142,22 +142,28 @@ describe('import-enex-md-gen', () => {
 		expect(all[0].mime).toBe('application/zip');
 	});
 
-	it('should keep importing notes when one of them is corrupted', async () => {
-		const filePath = `${enexSampleBaseDir}/ImportTestCorrupt.enex`;
-		const errors: any[] = [];
-		const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(jest.fn());
-		await importEnex('', filePath, {
-			onError: (error: any) => errors.push(error),
-		});
-		consoleSpy.mockRestore();
-		const notes = await Note.all();
-		expect(notes.length).toBe(2);
+	// Disabled for now because the ENEX parser has become so error-tolerant
+	// that it's no longer possible to generate a note that would generate a
+	// failure.
 
-		// Check that an error was recorded and that it includes the title
-		// of the note, so that it can be found back by the user
-		expect(errors.length).toBe(1);
-		expect(errors[0].message.includes('Note 2')).toBe(true);
-	});
+	// it('should keep importing notes when one of them is corrupted', async () => {
+	// 	const filePath = `${enexSampleBaseDir}/ImportTestCorrupt.enex`;
+	// 	const errors: any[] = [];
+	// 	const consoleSpy = jest.spyOn(console, 'warn').mockImplementation(jest.fn());
+	// 	await importEnex('', filePath, {
+	// 		onError: (error: any) => errors.push(error),
+	// 	});
+	// 	consoleSpy.mockRestore();
+	// 	const notes:NoteEntity[] = await Note.all();
+	// 	expect(notes.length).toBe(2);
+	// 	expect(notes.find(n => n.title === 'Note 1')).toBeTruthy();
+	// 	expect(notes.find(n => n.title === 'Note 3')).toBeTruthy();
+
+	// 	// Check that an error was recorded and that it includes the title
+	// 	// of the note, so that it can be found back by the user
+	// 	expect(errors.length).toBe(1);
+	// 	expect(errors[0].message.includes('Note 2')).toBe(true);
+	// });
 
 	it('should throw an error and stop if the outer XML is invalid', async () => {
 		await expectThrow(async () => importEnexFile('invalid_html.enex'));
@@ -215,7 +221,7 @@ describe('import-enex-md-gen', () => {
 	});
 
 	it('should resolve note links', async () => {
-		await importEnexFile('linked_notes.enex');
+		await importEnexFile('linked_notes.enex', { batchSize: 1 });
 		const notes: NoteEntity[] = await Note.all();
 
 		const note1 = notes.find(n => n.title === 'Note 1');

packages/lib/import-enex-md-gen.ts

@@ -4,7 +4,7 @@ import { htmlentities } from '@joplin/utils/html';
 const stringPadding = require('string-padding');
 const stringToStream = require('string-to-stream');
 const resourceUtils = require('./resourceUtils.js');
-const cssParser = require('css');
+const cssParser = require('@adobe/css-tools');
 
 const BLOCK_OPEN = '[[BLOCK_OPEN]]';
 const BLOCK_CLOSE = '[[BLOCK_CLOSE]]';
@@ -58,7 +58,6 @@ interface ParserState {
 	spanAttributes: string[];
 	tags: ParserStateTag[];
 	currentCode?: string;
-	evernoteLinkTitles: Record<string, string>;
 }
 
 
@@ -608,7 +607,6 @@ function enexXmlToMdArray(stream: any, resources: ResourceEntity[], tasks: Extra
 			anchorAttributes: [],
 			spanAttributes: [],
 			tags: [],
-			evernoteLinkTitles: {},
 		};
 
 		const options = {};
@@ -1241,6 +1239,14 @@ function drawTable(table: Section) {
 			continue;
 		}
 
+		if (typeof tr === 'string') {
+			// A <TABLE> tag should only have <TR> tags as direct children.
+			// However certain Evernote notes can contain other random tags
+			// such as empty DIVs. In that case we just skip the content.
+			// See test "table_with_invalid_content.html".
+			continue;
+		}
+
 		const isHeader = tr.isHeader;
 		const line = [];
 		const headerLine = [];
@@ -1249,10 +1255,7 @@ function drawTable(table: Section) {
 			const td = tr.lines[tdIndex];
 
 			if (typeof td === 'string') {
-				// A <TR> tag should only have <TD> tags as direct children.
-				// However certain Evernote notes can contain other random tags
-				// such as empty DIVs. In that case we just skip the content.
-				// See test "table_with_invalid_content.html".
+				// Same comment as above the <TR> tags.
 				continue;
 			}
 

packages/lib/import-enex.ts

@@ -1,10 +1,8 @@
 import uuid from './uuid';
-import BaseModel from './BaseModel';
 import Note from './models/Note';
 import Tag from './models/Tag';
 import Resource from './models/Resource';
 import Setting from './models/Setting';
-import time from './time';
 import shim from './shim';
 import { NoteEntity, ResourceEntity } from './services/database/types';
 import { enexXmlToMd } from './import-enex-md-gen';
@@ -15,7 +13,6 @@ import { extractUrls as extractUrlsFromMarkdown } from '@joplin/utils/markdown';
 const moment = require('moment');
 const { wrapError } = require('./errorUtils');
 const { enexXmlToHtml } = require('./import-enex-html-gen.js');
-const Levenshtein = require('levenshtein');
 const md5 = require('md5');
 const { Base64Decode } = require('base64-stream');
 const md5File = require('md5-file');
@@ -96,38 +93,6 @@ function removeUndefinedProperties(note: NoteEntity) {
 	return output;
 }
 
-function levenshteinPercent(s1: string, s2: string) {
-	const l = new Levenshtein(s1, s2);
-	if (!s1.length || !s2.length) return 1;
-	return Math.abs(l.distance / s1.length);
-}
-
-async function fuzzyMatch(note: ExtractedNote) {
-	if (note.created_time < time.unixMs() - 1000 * 60 * 60 * 24 * 360) {
-		const notes = await Note.modelSelectAll('SELECT * FROM notes WHERE is_conflict = 0 AND created_time = ? AND title = ?', [note.created_time, note.title]);
-		return notes.length !== 1 ? null : notes[0];
-	}
-
-	const notes = await Note.modelSelectAll('SELECT * FROM notes WHERE is_conflict = 0 AND created_time = ?', [note.created_time]);
-	if (notes.length === 0) return null;
-	if (notes.length === 1) return notes[0];
-
-	let lowestL = 1;
-	let lowestN = null;
-	for (let i = 0; i < notes.length; i++) {
-		const n = notes[i];
-		const l = levenshteinPercent(note.title, n.title);
-		if (l < lowestL) {
-			lowestL = l;
-			lowestN = n;
-		}
-	}
-
-	if (lowestN && lowestL < 0.2) return lowestN;
-
-	return null;
-}
-
 interface ExtractedResource {
 	hasData?: boolean;
 	id?: string;
@@ -155,6 +120,14 @@ interface ExtractedNote extends NoteEntity {
 	bodyXml?: string;
 }
 
+// Those are the notes that have been parsed and saved to Joplin. We don't keep
+// in memory the whole `ExtractedNote` because it contains resource data, etc.
+// We only keep what is needed to restore the note links.
+interface SavedNote {
+	id: string;
+	body: string;
+}
+
 // At this point we have the resource as it's been parsed from the XML, but
 // additional processing needs to be done to get the final resource file, its
 // size, MD5, etc.
@@ -245,26 +218,19 @@ async function saveNoteTags(note: ExtractedNote) {
 	return notesTagged;
 }
 
-interface ImportOptions {
-	fuzzyMatching?: boolean;
+export interface ImportOptions {
 	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
 	onProgress?: Function;
 	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
 	onError?: Function;
 	outputFormat?: string;
+	batchSize?: number;
 }
 
-async function saveNoteToStorage(note: ExtractedNote, importOptions: ImportOptions) {
-	importOptions = { fuzzyMatching: false, ...importOptions };
-
+async function saveNoteToStorage(note: ExtractedNote) {
 	note = Note.filter(note as any);
 
-	const existingNote = importOptions.fuzzyMatching ? await fuzzyMatch(note) : null;
-
 	const result = {
-		noteCreated: false,
-		noteUpdated: false,
-		noteSkipped: false,
 		resourcesCreated: 0,
 		notesTagged: 0,
 	};
@@ -275,28 +241,10 @@ async function saveNoteToStorage(note: ExtractedNote, importOptions: ImportOptio
 	const notesTagged = await saveNoteTags(note);
 	result.notesTagged += notesTagged;
 
-	if (existingNote) {
-		const diff = BaseModel.diffObjects(existingNote, note);
-		delete diff.tags;
-		delete diff.resources;
-		delete diff.id;
-
-		if (!Object.getOwnPropertyNames(diff).length) {
-			result.noteSkipped = true;
-			return result;
-		}
-
-		diff.id = existingNote.id;
-		diff.type_ = existingNote.type_;
-		await Note.save(diff, { autoTimestamp: false });
-		result.noteUpdated = true;
-	} else {
-		await Note.save(note, {
-			isNew: true,
-			autoTimestamp: false,
-		});
-		result.noteCreated = true;
-	}
+	await Note.save(note, {
+		isNew: true,
+		autoTimestamp: false,
+	});
 
 	return result;
 }
@@ -345,12 +293,47 @@ const preProcessFile = async (filePath: string): Promise<string> => {
 	// return newFilePath;
 };
 
-export default async function importEnex(parentFolderId: string, filePath: string, importOptions: ImportOptions = null) {
-	if (!importOptions) importOptions = {};
-	if (!('fuzzyMatching' in importOptions)) importOptions.fuzzyMatching = false;
-	if (!('onProgress' in importOptions)) importOptions.onProgress = function() {};
-	if (!('onError' in importOptions)) importOptions.onError = function() {};
 
+const restoreNoteLinks = async (notes: SavedNote[], noteTitlesToIds: Record<string, string[]>, importOptions: ImportOptions) => {
+	// --------------------------------------------------------
+	// Convert the Evernote note links to Joplin note links. If
+	// we don't find a matching note, or if there are multiple
+	// matching notes, we leave the Evernote links as is.
+	// --------------------------------------------------------
+
+	for (const note of notes) {
+		const links = importOptions.outputFormat === 'html' ?
+			extractUrlsFromHtml(note.body) :
+			extractUrlsFromMarkdown(note.body);
+
+		let noteChanged = false;
+
+		for (const link of links) {
+			const matchingNoteIds = noteTitlesToIds[link.title];
+			if (matchingNoteIds && matchingNoteIds.length === 1) {
+				note.body = note.body.replace(link.url, `:/${matchingNoteIds[0]}`);
+				noteChanged = true;
+			}
+		}
+
+		if (noteChanged) {
+			await Note.save({
+				id: note.id,
+				body: note.body,
+				updated_time: Date.now(),
+			}, {
+				autoTimestamp: false,
+			});
+		}
+	}
+};
+
+interface ParseNotesResult {
+	savedNotes: SavedNote[];
+	noteTitlesToIds: Record<string, string[]>;
+}
+
+const parseNotes = async (parentFolderId: string, filePath: string, importOptions: ImportOptions = null): Promise<ParseNotesResult> => {
 	// eslint-disable-next-line @typescript-eslint/ban-types -- Old code before rule was applied
 	function handleSaxStreamEvent(fn: Function) {
 		return function(...args: any[]) {
@@ -397,6 +380,9 @@ export default async function importEnex(parentFolderId: string, filePath: strin
 		let noteResourceRecognition: NoteResourceRecognition = null;
 		const notes: ExtractedNote[] = [];
 		let processingNotes = false;
+		const savedNotes: SavedNote[] = [];
+		const createdNoteIds: string[] = [];
+		const noteTitlesToIds: Record<string, string[]> = {};
 
 		const createErrorWithNoteTitle = (fnThis: any, error: any) => {
 			const line = [];
@@ -437,15 +423,6 @@ export default async function importEnex(parentFolderId: string, filePath: strin
 			processingNotes = true;
 			stream.pause();
 
-			// Set the note ID so that we can create a title-to-id map, which
-			// will be needed to recreate the note links below.
-			const noteTitleToId: Record<string, string[]> = {};
-			for (const note of notes) {
-				if (!noteTitleToId[note.title]) noteTitleToId[note.title] = [];
-				note.id = uuid.create();
-				noteTitleToId[note.title].push(note.id);
-			}
-
 			while (notes.length) {
 				const note = notes.shift();
 
@@ -467,32 +444,16 @@ export default async function importEnex(parentFolderId: string, filePath: strin
 					// Convert the ENEX body to either Markdown or HTML
 					// --------------------------------------------------------
 
-					let body: string = importOptions.outputFormat === 'html' ?
+					const body: string = importOptions.outputFormat === 'html' ?
 						await enexXmlToHtml(note.bodyXml, note.resources) :
 						await enexXmlToMd(note.bodyXml, note.resources, note.tasks);
 					delete note.bodyXml;
 
-					// --------------------------------------------------------
-					// Convert the Evernote note links to Joplin note links. If
-					// we don't find a matching note, or if there are multiple
-					// matching notes, we leave the Evernote links as is.
-					// --------------------------------------------------------
-
-					const links = importOptions.outputFormat === 'html' ?
-						extractUrlsFromHtml(body) :
-						extractUrlsFromMarkdown(body);
-
-					for (const link of links) {
-						const matchingNoteIds = noteTitleToId[link.title];
-						if (matchingNoteIds && matchingNoteIds.length === 1) {
-							body = body.replace(link.url, `:/${matchingNoteIds[0]}`);
-						}
-					}
-
 					// --------------------------------------------------------
 					// Finish setting up the note
 					// --------------------------------------------------------
 
+					note.id = uuid.create();
 					note.markup_language = importOptions.outputFormat === 'html' ?
 						MarkupToHtml.MARKUP_LANGUAGE_HTML :
 						MarkupToHtml.MARKUP_LANGUAGE_MARKDOWN;
@@ -511,15 +472,17 @@ export default async function importEnex(parentFolderId: string, filePath: strin
 					// that case
 					if (!note.updated_time) note.updated_time = note.created_time;
 
-					const result = await saveNoteToStorage(note, importOptions);
+					const result = await saveNoteToStorage(note);
 
-					if (result.noteUpdated) {
-						progressState.updated++;
-					} else if (result.noteCreated) {
-						progressState.created++;
-					} else if (result.noteSkipped) {
-						progressState.skipped++;
-					}
+					createdNoteIds.push(note.id);
+					if (!noteTitlesToIds[note.title]) noteTitlesToIds[note.title] = [];
+					noteTitlesToIds[note.title].push(note.id);
+					savedNotes.push({
+						id: note.id,
+						body: note.body,
+					});
+
+					progressState.created++;
 					progressState.resourcesCreated += result.resourcesCreated;
 					progressState.notesTagged += result.notesTagged;
 					importOptions.onProgress(progressState);
@@ -648,7 +611,7 @@ export default async function importEnex(parentFolderId: string, filePath: strin
 
 				notes.push(note);
 
-				if (notes.length >= 10) {
+				if (notes.length >= importOptions.batchSize) {
 					// eslint-disable-next-line promise/prefer-await-to-then -- Old code before rule was applied
 					processNotes().catch(error => {
 						importOptions.onError(createErrorWithNoteTitle(this, error));
@@ -718,12 +681,25 @@ export default async function importEnex(parentFolderId: string, filePath: strin
 					if (allDone) {
 						shim.clearTimeout(iid);
 						if (needToDeleteFileToProcess) void shim.fsDriver().remove(fileToProcess);
-						resolve(null);
+						resolve({
+							savedNotes,
+							noteTitlesToIds,
+						});
 					}
 				});
-			}, 500);
+			}, 1000);
 		}));
 
 		stream.pipe(saxStream);
 	});
+};
+
+export default async function importEnex(parentFolderId: string, filePath: string, importOptions: ImportOptions = null) {
+	if (!importOptions) importOptions = {};
+	if (!('onProgress' in importOptions)) importOptions.onProgress = function() {};
+	if (!('onError' in importOptions)) importOptions.onError = function() {};
+	if (!('batchSize' in importOptions)) importOptions.batchSize = 10;
+
+	const result = await parseNotes(parentFolderId, filePath, importOptions);
+	await restoreNoteLinks(result.savedNotes, result.noteTitlesToIds, importOptions);
 }

packages/lib/locales/ar.json

@@ -59,6 +59,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s : %d"
 	],
@@ -326,6 +329,9 @@
 	"Browse...": [
 		"استعراض..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"قائمة تعداد نقطي"
 	],
@@ -1027,6 +1033,9 @@
 	"Enable note history": [
 		"تمكين تاريخ الملاحظة"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"تمكين عارض PDF"
 	],
@@ -2984,6 +2993,9 @@
 	"When creating a new to-do:": [
 		"عند إنشاء قائمة جديدة للمهام:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/bg_BG.json

@@ -53,6 +53,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d notes": [
 		"%s: %d бележки"
 	],
@@ -269,6 +272,9 @@
 	"Browse...": [
 		"Търсене..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Неномериран списък"
 	],
@@ -767,6 +773,9 @@
 	"Enable note history": [
 		"Пусни история за бележките"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		""
 	],
@@ -2054,6 +2063,10 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		""
 	],
+	"The following attachment matches your search query:": [
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -2405,6 +2418,9 @@
 	"When creating a new to-do:": [
 		"Когато се създава нова задача:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/bs_BA.json

@@ -50,6 +50,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d notes": [
 		"%s: %d bilješki"
 	],
@@ -275,6 +278,9 @@
 	"Browse...": [
 		"Pregledaj..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Nabrajanje"
 	],
@@ -767,6 +773,9 @@
 	"Enable note history": [
 		"Aktiviraj historiju bilješki"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"Omogući PDF"
 	],
@@ -2048,6 +2057,11 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		"Faktor određuje kako će se stavka povećavati ili smanjivati da bi stala u raspoloživi prostor skupa sa drugim stavkama. Tako će stavka čiji je faktor 2 zauzimati dvostruko više prostora od stavke s faktorom 1. Ponovo pokrenite aplikaciju da primijenite izmjene."
 	],
+	"The following attachment matches your search query:": [
+		"",
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -2399,6 +2413,9 @@
 	"When creating a new to-do:": [
 		"Prilikom kreiranja novog zadatka:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/ca.json

@@ -62,6 +62,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s: %d"
 	],
@@ -329,6 +332,9 @@
 	"Browse...": [
 		"Navega..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Llista de pics"
 	],
@@ -1035,6 +1041,9 @@
 	"Enable note history": [
 		"Activa l'historial de notes"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"Habilita el visor de PDF"
 	],
@@ -3179,6 +3188,9 @@
 	"When creating a new to-do:": [
 		"En crear un llistat de tasques pendents:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/cs_CZ.json

@@ -62,6 +62,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s: %d"
 	],
@@ -329,6 +332,9 @@
 	"Browse...": [
 		"Procházet..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Seznam s odrážkami"
 	],
@@ -1012,6 +1018,9 @@
 	"Enable note history": [
 		"Povolit historii poznámky"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"Povolit zobrazení PDF"
 	],
@@ -3122,6 +3131,9 @@
 	"When creating a new to-do:": [
 		"Při vytváření nového úkolu:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/da_DK.json

@@ -62,6 +62,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s: %d"
 	],
@@ -237,7 +240,7 @@
 		"Der blev fundet en automatisk gemt tegning. Vedhæfter en kopi af den til noten?"
 	],
 	"An error occurred: %s": [
-		""
+		"Der opstod en fejl: %s"
 	],
 	"An update is available, do you want to download it now?": [
 		"Opdatering er tilgængelig, vil du hente den nu?"
@@ -338,6 +341,9 @@
 	"Browse...": [
 		"Gennemse..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Punktliste"
 	],
@@ -888,6 +894,9 @@
 	"Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": [
 		"Glem ikke adgangkoden, da den af sikkerhedshensyn er den *eneste* mulighed for dekryptering af data! For at aktivere kryptering til, skal du indtaste din adgangskode herunder."
 	],
+	"Donate, website": [
+		"Donér, hjemmeside"
+	],
 	"Done": [
 		"Færdig"
 	],
@@ -1002,6 +1011,9 @@
 	"Email to Note": [
 		"E-mail til note"
 	],
+	"Email To Note, login information": [
+		"E-mail til note, loginoplysninger"
+	],
 	"Emails": [
 		"E-mails"
 	],
@@ -1059,6 +1071,9 @@
 	"Enable note history": [
 		"Slå note-historie til"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"Aktivér PDF-viser"
 	],
@@ -1176,6 +1191,9 @@
 	"Export profile": [
 		"Eksporter profil"
 	],
+	"Export your data": [
+		"Eksportér dine data"
+	],
 	"Exported successfully!": [
 		"Eksporteret med succes!"
 	],
@@ -1298,7 +1316,7 @@
 		"Opretter links..."
 	],
 	"Geolocation, spellcheck, editor toolbar, image resize": [
-		""
+		"Geolokalisering, stavekontrol, redigeringsværktøjslinje, ændring af billedstørrelse"
 	],
 	"Get it now:": [
 		"Få den nu:"
@@ -1573,6 +1591,9 @@
 	"Language": [
 		"Sprog"
 	],
+	"Language, date format": [
+		"Sprog, datoformat"
+	],
 	"Last error: %s": [
 		"Sidste fejl: %s"
 	],
@@ -1656,7 +1677,7 @@
 		"Log ud"
 	],
 	"Logs, profiles, sync status": [
-		""
+		"Logfiler, profiler, synkroniseringsstatus"
 	],
 	"Make a donation": [
 		"Giv en donation"
@@ -1719,7 +1740,7 @@
 		"Maks samlet størrelse"
 	],
 	"Media player, math, diagrams, table of contents": [
-		""
+		"Medieafspiller, matematik, diagrammer, indholdsfortegnelse"
 	],
 	"Missing keys": [
 		"Manglende nøgler"
@@ -1989,7 +2010,7 @@
 		"Åbn..."
 	],
 	"Opening section %s": [
-		""
+		"Åbner sektion %s"
 	],
 	"Operation cancelled": [
 		"Udførelse annulleret"
@@ -2288,6 +2309,9 @@
 	"Restart and upgrade": [
 		"Genstart og upgradér"
 	],
+	"Restart in safe mode": [
+		"Genstart i fejlsikret tilstand"
+	],
 	"Restart now": [
 		"Genstart nu"
 	],
@@ -2402,6 +2426,9 @@
 	"Select parent notebook": [
 		"Vælg overordnet notesbog"
 	],
+	"Send bug report": [
+		"Send fejlrapport"
+	],
 	"Server is already running on port %d": [
 		"Serveren kører allerede på port %d"
 	],
@@ -2666,6 +2693,9 @@
 	"Sync your notes": [
 		"Synk dine noter"
 	],
+	"Sync, encryption, proxy": [
+		"Synkronisering, kryptering, proxy"
+	],
 	"Synchronisation": [
 		"Synkronisering"
 	],
@@ -2843,6 +2873,9 @@
 	"Theme": [
 		"Tema"
 	],
+	"Themes, editor font": [
+		"Temaer, editorskrifttype"
+	],
 	"There are currently no notes. Create one by clicking on the (+) button.": [
 		"Der er ingen noter. Opret note ved at klikke på (+) knappen."
 	],
@@ -2993,6 +3026,9 @@
 	"Toggle external editing": [
 		"Slå ekstern redigering til eller fra"
 	],
+	"Toggle note history, keep notes for": [
+		"Skift notehistorik, gem noter til"
+	],
 	"Toggle note list": [
 		"Slå noteliste til eller fra"
 	],
@@ -3227,9 +3263,12 @@
 	"When creating a new to-do:": [
 		"Ved oprettelse af ny opgave:"
 	],
-	"Window unresponsive.": [
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
 		""
 	],
+	"Window unresponsive.": [
+		"Vinduet reagerer ikke."
+	],
 	"Words": [
 		"Ord"
 	],

packages/lib/locales/de_DE.json

@@ -62,6 +62,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s: %d"
 	],
@@ -74,6 +77,9 @@
 	"%s: %s": [
 		"%s: %s"
 	],
+	"%s: Missing password.": [
+		"%s: Fehlendes Passwort."
+	],
 	"&Edit": [
 		"&Bearbeiten"
 	],
@@ -108,7 +114,7 @@
 		"(WYSIWYG: %s)"
 	],
 	"(You may disable this prompt in the options)": [
-		""
+		"(Diese Meldung ist in den Einstellungen deaktivierbar)"
 	],
 	"- Camera: to allow taking a picture and attaching it to a note.": [
 		"- Kamera: um ein Bild aufzunehmen und an eine Notiz anzuhängen."
@@ -218,6 +224,12 @@
 	"Always": [
 		"Immer"
 	],
+	"Always ask": [
+		"Immer fragen"
+	],
+	"Always resize": [
+		"Größe immer anpassen"
+	],
 	"Ambiguous notebook \"%s\". Please use notebook id instead - press \"ti\" to see the short notebook id or use $b for current selected notebook": [
 		"Zweideutiges Notizbuch „%s“. Bitte verwende stattdessen die Notizbuch-ID - drücke „ti“, um die kurze Notizbuch-ID zu sehen oder verwende $b für das aktuell ausgewählte Notizbuch"
 	],
@@ -225,10 +237,10 @@
 		"Zweideutiges Notizbuch „%s“. Bitte verwende stattdessen die kurze Notizbuch-ID - drücke „ti“, um die kurze Notizbuch-ID zu sehen"
 	],
 	"An autosaved drawing was found. Attach a copy of it to the note?": [
-		""
+		"Es wurde eine automatisch gespeicherte Zeichnung gefunden. Eine Kopie davon an die Notiz anhängen?"
 	],
 	"An error occurred: %s": [
-		""
+		"Ein Fehler trat auf: %s"
 	],
 	"An update is available, do you want to download it now?": [
 		"Es ist eine Aktualisierung verfügbar. Soll sie jetzt heruntergeladen werden?"
@@ -329,6 +341,9 @@
 	"Browse...": [
 		"Durchsuchen ..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Aufzählung"
 	],
@@ -467,6 +482,9 @@
 	"Code View": [
 		"Code-Ansicht"
 	],
+	"Collaborate on a notebook with others": [
+		"Gemeinsam mit anderen an einem Notizbuch arbeiten"
+	],
 	"Collaborate on notebooks with others": [
 		"Gemeinsam mit anderen an Notizbüchern arbeiten"
 	],
@@ -491,6 +509,9 @@
 	"Command palette...": [
 		"Befehlspalette..."
 	],
+	"Compact": [
+		"Kompakt"
+	],
 	"Completed": [
 		"Abgeschlossen"
 	],
@@ -654,6 +675,12 @@
 	"Creates a new to-do.": [
 		"Erstellt eine neue Aufgabe."
 	],
+	"Creating new note...": [
+		"Neue Notiz erstellen..."
+	],
+	"Creating new to-do...": [
+		"Neues To-Do erstellen..."
+	],
 	"Creating report...": [
 		"Bericht wird erstellt ..."
 	],
@@ -676,7 +703,7 @@
 		"Benutzerdefinierte TLS-Zertifikate"
 	],
 	"Customise the note publishing banner": [
-		""
+		"Passe den Banner zur Veröffentlichung von Notizen an"
 	],
 	"Cut": [
 		"Ausschneiden"
@@ -796,7 +823,7 @@
 		"Zielformat: %s"
 	],
 	"Detailed": [
-		""
+		"Detailliert"
 	],
 	"Directory": [
 		"Verzeichnis"
@@ -822,6 +849,9 @@
 	"Disabling encryption means *all* your notes and attachments are going to be re-synchronised and sent unencrypted to the sync target. Do you wish to continue?": [
 		"Durch die Deaktivierung der Verschlüsselung werden *alle* Notizen und Anhänge neu synchronisiert und unverschlüsselt an das Synchronisationsziel gesendet. Möchtest du fortfahren?"
 	],
+	"Discard": [
+		"Verwerfen"
+	],
 	"Discard changes": [
 		"Änderungen verwerfen"
 	],
@@ -864,6 +894,9 @@
 	"Do not lose the password as, for security purposes, this will be the *only* way to decrypt the data! To enable encryption, please enter your password below.": [
 		"Achte darauf, dass du das Passwort nicht verlierst, da dies aus Sicherheitsgründen die *einzige* Möglichkeit ist, deine Daten zu entschlüsseln! Um die Verschlüsselung zu aktivieren, gib bitte unten dein Passwort ein."
 	],
+	"Donate, website": [
+		"Spenden, Webseite"
+	],
 	"Done": [
 		"Fertig"
 	],
@@ -895,10 +928,10 @@
 		"Dracula"
 	],
 	"Draw picture": [
-		""
+		"Bild zeichnen"
 	],
 	"Drawing": [
-		""
+		"Zeichnen"
 	],
 	"Drop notes or files here": [
 		"Notizen oder Dateien hierher ziehen"
@@ -978,6 +1011,9 @@
 	"Email to Note": [
 		"E-Mail zu Notiz"
 	],
+	"Email To Note, login information": [
+		"E-Mail zu Notiz, Login-Informationen"
+	],
 	"Emails": [
 		"E-Mails"
 	],
@@ -1035,6 +1071,9 @@
 	"Enable note history": [
 		"Notizenverlauf aktivieren"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"PDF-Betrachter aktivieren"
 	],
@@ -1101,6 +1140,9 @@
 	"Enter notebook title": [
 		"Titel des Notizbuchs eingeben"
 	],
+	"Enter password": [
+		"Passwort eingeben"
+	],
 	"Enum": [
 		"Aufzählung"
 	],
@@ -1149,6 +1191,9 @@
 	"Export profile": [
 		"Profil exportieren"
 	],
+	"Export your data": [
+		"Exportiere deine Daten"
+	],
 	"Exported successfully!": [
 		"Exportieren erfolgreich!"
 	],
@@ -1271,7 +1316,7 @@
 		"Links werden erzeugt ..."
 	],
 	"Geolocation, spellcheck, editor toolbar, image resize": [
-		""
+		"Geolokalisierung, Rechtschreibprüfung, Editor-Symbolleiste, Bildgrößenanpassung"
 	],
 	"Get it now:": [
 		"Hole es jetzt:"
@@ -1340,7 +1385,7 @@
 		"HTML-Verzeichnis"
 	],
 	"HTML document": [
-		""
+		"HTML-Dokument"
 	],
 	"HTML File": [
 		"HTML-Datei"
@@ -1546,6 +1591,9 @@
 	"Language": [
 		"Sprache"
 	],
+	"Language, date format": [
+		"Sprache, Datumsformat"
+	],
 	"Last error: %s": [
 		"Letzte Fehlermeldung: %s"
 	],
@@ -1629,7 +1677,7 @@
 		"Abmelden"
 	],
 	"Logs, profiles, sync status": [
-		""
+		"Protokolle, Profile, Synchronisierungsstatus"
 	],
 	"Make a donation": [
 		"Spenden"
@@ -1692,7 +1740,7 @@
 		"Maximale Gesamtgröße"
 	],
 	"Media player, math, diagrams, table of contents": [
-		""
+		"Medienspieler, Mathematik, Diagramme, Inhaltsverzeichnis"
 	],
 	"Missing keys": [
 		"Fehlende Schlüssel"
@@ -1740,7 +1788,7 @@
 		"N"
 	],
 	"Never resize": [
-		""
+		"Größe niemals anpassen"
 	],
 	"New note": [
 		"Neue Notiz"
@@ -1871,6 +1919,9 @@
 	"Note list growth factor": [
 		"Notiz-Listenwachstumsfaktor"
 	],
+	"Note list style": [
+		"Stil der Notiz-Liste"
+	],
 	"Note properties": [
 		"Notiz-Eigenschaften"
 	],
@@ -1959,7 +2010,7 @@
 		"Öffnen ..."
 	],
 	"Opening section %s": [
-		""
+		"Öffne Abschnitt %s"
 	],
 	"Operation cancelled": [
 		"Vorgang abgebrochen"
@@ -2249,12 +2300,18 @@
 	"Reset master password": [
 		"Master-Passwort zurücksetzen"
 	],
+	"Resize large images:": [
+		"Größe großer Bilder anpassen:"
+	],
 	"Resources: %d.": [
 		"Anhänge: %d."
 	],
 	"Restart and upgrade": [
 		"Neustarten und aktualisieren"
 	],
+	"Restart in safe mode": [
+		"Neustart im abgesicherten Modus"
+	],
 	"Restart now": [
 		"Jetzt neu starten"
 	],
@@ -2321,6 +2378,9 @@
 	"Save changes": [
 		"Änderungen speichern"
 	],
+	"Save changes?": [
+		"Änderungen speichern?"
+	],
 	"Save geo-location with notes": [
 		"Momentanen Standort zusammen mit Notizen speichern"
 	],
@@ -2366,6 +2426,9 @@
 	"Select parent notebook": [
 		"Eltern-Notizbuch auswählen"
 	],
+	"Send bug report": [
+		"Fehlerprotokoll senden"
+	],
 	"Server is already running on port %d": [
 		"Server läuft bereits auf Port %d"
 	],
@@ -2396,6 +2459,9 @@
 	"Share a copy of all notes in a file format that can be imported by Joplin on a computer.": [
 		"Teile eine Kopie aller Notizen in einem Dateiformat, welches von Joplin auf einem anderen Computer importiert werden kann."
 	],
+	"Share a notebook with others": [
+		"Teile ein Notizbuch mit anderen"
+	],
 	"Share Notebook": [
 		"Notizbuch teilen"
 	],
@@ -2403,7 +2469,7 @@
 		"Notizbuch teilen..."
 	],
 	"Share permissions": [
-		""
+		"Teile Berechtigungen"
 	],
 	"Sharing notebook...": [
 		"Notizbuch wird geteilt ..."
@@ -2445,10 +2511,13 @@
 		"Zeige/Verstecke die Seitenleiste"
 	],
 	"Shrink large images before adding them to notes.": [
-		""
+		"Große Bilder verkleinern, bevor sie an eine Notiz angehängt werden."
+	],
+	"Side menu closed": [
+		"Seitenmenü geschlossen"
 	],
 	"Side menu opened": [
-		""
+		"Seitenmenü geöffnet"
 	],
 	"Sidebar": [
 		"Seitenleiste"
@@ -2624,6 +2693,9 @@
 	"Sync your notes": [
 		"Synchronisiere deine Notizen"
 	],
+	"Sync, encryption, proxy": [
+		"Synchronisation, Verschlüsselung, Proxy"
+	],
 	"Synchronisation": [
 		"Synchronisation"
 	],
@@ -2681,6 +2753,9 @@
 	"Teams": [
 		"Teams"
 	],
+	"Text document": [
+		"Textdokument"
+	],
 	"Text editor command": [
 		"Texteditor-Befehl"
 	],
@@ -2774,6 +2849,9 @@
 	"The sync target needs to be upgraded. Press this banner to proceed.": [
 		"Das Synchronisationsziel muss aktualisiert werden! Klicke auf diesen Banner, um fortzufahren."
 	],
+	"The synchronisation password is missing.": [
+		"Das Synchronisationspasswort fehlt."
+	],
 	"The tag \"%s\" already exists. Please choose a different name.": [
 		"Das Schlagwort „%s“ existiert bereits. Bitte wähle einen anderen Namen."
 	],
@@ -2795,6 +2873,9 @@
 	"Theme": [
 		"Design"
 	],
+	"Themes, editor font": [
+		"Themen, Editor-Schriftart"
+	],
 	"There are currently no notes. Create one by clicking on the (+) button.": [
 		"Momentan existieren noch keine Notizen. Erstelle eine, indem du auf den (+)-Knopf drückst."
 	],
@@ -2823,7 +2904,7 @@
 		"Diese Erweiterungen erweitern den Markdown-Renderer um zusätzliche Funktionen. Bitte beachte, dass diese Funktionen zwar nützlich sein können, es sich dabei jedoch nicht um Standard-Markdown handelt und die meisten von ihnen daher nur in Joplin funktionieren. Außerdem sind einige von ihnen *inkompatibel* mit dem WYSIWYG-Editor. Wenn du eine Notiz, die eine dieser Erweiterungen verwendet, in diesem Editor öffnest, verlierst du die Formatierung der Erweiterung. Es ist unten angegeben, welche Erweiterungen mit dem WYSIWYG-Editor kompatibel sind oder nicht."
 	],
 	"This allows another user to share a notebook with you, and you can then both collaborate on it. It does not however allow you to share a notebook with someone else, unless you have the feature \"%s\".": [
-		""
+		"Dadurch können andere Nutzer ein Notizbuch zur gemeinsamen Bearbeitung mit dir teilen. Allerdings kannst du keine Notizbücher mit anderen teilen, wenn du die Funktion \"%s\" nicht hast."
 	],
 	"This attachment is not downloaded or not decrypted yet": [
 		"Dieser Anhang wurde noch nicht heruntergeladen oder entschlüsselt"
@@ -2834,6 +2915,9 @@
 	"This authorisation token is only needed to allow third-party applications to access Joplin.": [
 		"Dieser Berechtigungstoken wird nur benötigt, um Drittanbieter-Anwendungen Zugriff auf Joplin zu gewähren."
 	],
+	"This drawing may have unsaved changes.": [
+		"Diese Zeichnung kann ungespeicherte Änderungen enthalten."
+	],
 	"This is an advanced tool to show the attachments that are linked to your notes. Please be careful when deleting one of them as they cannot be restored afterwards.": [
 		"Dies ist ein Werkzeug für Fortgeschrittene, um die Anhänge anzuzeigen, die mit deinen Notizen verknüpft sind. Bitte sei vorsichtig, wenn du einen davon löschst, da sie danach nicht wiederhergestellt werden können."
 	],
@@ -2942,6 +3026,9 @@
 	"Toggle external editing": [
 		"Externe Bearbeitung ein/ausschalten"
 	],
+	"Toggle note history, keep notes for": [
+		"Notizverlauf umschalten, Notizen aufbewahren für"
+	],
 	"Toggle note list": [
 		"Notiz-Liste ein-/ausschalten"
 	],
@@ -2990,9 +3077,15 @@
 	"Type: %s.": [
 		"Typ: %s."
 	],
+	"Unable to edit resource of type %s": [
+		"Ressource vom Typ %s kann nicht bearbeitet werden"
+	],
 	"Unable to export or share data. Reason: %s": [
 		"Exportieren oder Teilen der Daten nicht möglich. Grund: %s"
 	],
+	"Unable to share log data. Reason: %s": [
+		"Protokolldaten können nicht geteilt werden. Grund: %s"
+	],
 	"Uncompleted to-dos on top": [
 		"Unvollständige Aufgaben oben"
 	],
@@ -3170,9 +3263,12 @@
 	"When creating a new to-do:": [
 		"Wenn eine neue Aufgabe erstellt wird:"
 	],
-	"Window unresponsive.": [
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
 		""
 	],
+	"Window unresponsive.": [
+		"Fenster antwortet nicht."
+	],
 	"Words": [
 		"Wörter"
 	],

packages/lib/locales/en_GB.json

@@ -62,6 +62,9 @@
 	"%s = %s (%s)": [
 		""
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		""
 	],
@@ -338,6 +341,9 @@
 	"Browse...": [
 		""
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		""
 	],
@@ -1065,6 +1071,9 @@
 	"Enable note history": [
 		""
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		""
 	],
@@ -2384,12 +2393,18 @@
 	"Search for...": [
 		""
 	],
+	"Search hidden": [
+		""
+	],
 	"Search in all the notes": [
 		""
 	],
 	"Search in current note": [
 		""
 	],
+	"Search shown": [
+		""
+	],
 	"Search...": [
 		""
 	],
@@ -2798,6 +2813,10 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		""
 	],
+	"The following attachment matches your search query:": [
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -3254,6 +3273,9 @@
 	"When creating a new to-do:": [
 		""
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/en_US.json

@@ -62,6 +62,9 @@
 	"%s = %s (%s)": [
 		""
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		""
 	],
@@ -338,6 +341,9 @@
 	"Browse...": [
 		""
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		""
 	],
@@ -1065,6 +1071,9 @@
 	"Enable note history": [
 		""
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		""
 	],
@@ -2384,12 +2393,18 @@
 	"Search for...": [
 		""
 	],
+	"Search hidden": [
+		""
+	],
 	"Search in all the notes": [
 		"Search in all notes"
 	],
 	"Search in current note": [
 		""
 	],
+	"Search shown": [
+		""
+	],
 	"Search...": [
 		""
 	],
@@ -2798,6 +2813,10 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		""
 	],
+	"The following attachment matches your search query:": [
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -3251,6 +3270,9 @@
 	"When creating a new to-do:": [
 		""
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/eo.json

@@ -50,6 +50,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d notes": [
 		"%s: %d notoj"
 	],
@@ -281,6 +284,9 @@
 	"Browse...": [
 		"Esplori..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		""
 	],
@@ -830,6 +836,9 @@
 	"Enable note history": [
 		"Ebligi notan historion"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		""
 	],
@@ -2193,6 +2202,10 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		""
 	],
+	"The following attachment matches your search query:": [
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -2561,6 +2574,9 @@
 	"When creating a new to-do:": [
 		""
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/es_ES.json

@@ -59,6 +59,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s: %d"
 	],
@@ -326,6 +329,9 @@
 	"Browse...": [
 		"Explorar..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Lista con Viñetas"
 	],
@@ -1002,6 +1008,9 @@
 	"Enable note history": [
 		"Habilitar historial de notas"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		"Activar visor de PDF"
 	],
@@ -3104,6 +3113,9 @@
 	"When creating a new to-do:": [
 		"Al crear una tarea nueva:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/et_EE.json

@@ -53,6 +53,9 @@
 	"%s = %s (%s)": [
 		"%s = %s ( %s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d": [
 		"%s: %d"
 	],
@@ -275,6 +278,9 @@
 	"Browse...": [
 		"Sirvi..."
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		"Täpp-loend"
 	],
@@ -726,6 +732,9 @@
 	"Enable encryption": [
 		"Luba krüptimine"
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		""
 	],
@@ -1907,6 +1916,10 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		""
 	],
+	"The following attachment matches your search query:": [
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -2231,6 +2244,9 @@
 	"When creating a new note:": [
 		"Uue märkme loomisel:"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],

packages/lib/locales/eu.json

@@ -50,6 +50,9 @@
 	"%s = %s (%s)": [
 		"%s = %s (%s)"
 	],
+	"%s is not optimised for synchronising many small files so your initial synchronisation will be slow.": [
+		""
+	],
 	"%s: %d notes": [
 		"%s: %d oharrak"
 	],
@@ -257,6 +260,9 @@
 	"Browse...": [
 		""
 	],
+	"Built in": [
+		""
+	],
 	"Bulleted List": [
 		""
 	],
@@ -762,6 +768,9 @@
 	"Enable multimarkdown table extension": [
 		""
 	],
+	"Enable optical character recognition (OCR)": [
+		""
+	],
 	"Enable PDF viewer": [
 		""
 	],
@@ -1942,6 +1951,10 @@
 	"The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes.": [
 		""
 	],
+	"The following attachment matches your search query:": [
+		"",
+		""
+	],
 	"The following attachments are being watched for changes:": [
 		""
 	],
@@ -2272,6 +2285,9 @@
 	"Welcome to Joplin!\n\nType `:help shortcuts` for the list of keyboard shortcuts, or just `:help` for usage information.\n\nFor example, to create a notebook press `mb`; to create a note press `mn`.": [
 		"Ongi etorri Joplin-era!\n\nIdatz `:help shortcuts` lasterbideak ikusteko, edo soilik `:help`erabilerako informaziorako.\n\nEsate baterako, koadernoa sortzeko sakatu `mb`: oharra sortzeko sakatu `mn`"
 	],
+	"When enabled, the application will scan your attachments and extract the text from it. This will allow you to search for text in these attachments.": [
+		""
+	],
 	"Window unresponsive.": [
 		""
 	],