update yarn.lock with patch file info

.eslintignore

@@ -396,7 +396,6 @@ packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
 packages/app-mobile/components/NoteEditor/SelectionFormatting.js
 packages/app-mobile/components/NoteEditor/types.js
-packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
@@ -712,7 +711,6 @@ packages/lib/services/searchengine/SearchFilter.test.js
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.test.js
 packages/lib/services/searchengine/gotoAnythingStyleQuery.js
-packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.test.js
@@ -874,8 +872,6 @@ packages/tools/website/updateDownloadPage.js
 packages/tools/website/updateNews.js
 packages/tools/website/utils/applyTranslations.js
 packages/tools/website/utils/applyTranslations.test.js
-packages/tools/website/utils/convertLinksToLocale.js
-packages/tools/website/utils/convertLinksToLocale.test.js
 packages/tools/website/utils/frontMatter.js
 packages/tools/website/utils/news.js
 packages/tools/website/utils/openGraph.js

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

@@ -71,9 +71,7 @@ jobs:
       - uses: olegtarasov/get-tag@v2.1
       - uses: actions/setup-node@v2
         with:
-          # We need to pin the version to 18.15, because 18.16+ fails with this error:
-          # https://github.com/facebook/react-native/issues/36440
-          node-version: '18.15.0'
+          node-version: '18'
 
       - name: Install Yarn
         run: |

.gitignore

@@ -383,7 +383,6 @@ packages/app-mobile/components/NoteEditor/NoteEditor.js
 packages/app-mobile/components/NoteEditor/SearchPanel.js
 packages/app-mobile/components/NoteEditor/SelectionFormatting.js
 packages/app-mobile/components/NoteEditor/types.js
-packages/app-mobile/components/NoteList.js
 packages/app-mobile/components/ProfileSwitcher/ProfileEditor.js
 packages/app-mobile/components/ProfileSwitcher/ProfileSwitcher.js
 packages/app-mobile/components/ProfileSwitcher/useProfileConfig.js
@@ -699,7 +698,6 @@ packages/lib/services/searchengine/SearchFilter.test.js
 packages/lib/services/searchengine/filterParser.js
 packages/lib/services/searchengine/filterParser.test.js
 packages/lib/services/searchengine/gotoAnythingStyleQuery.js
-packages/lib/services/searchengine/gotoAnythingStyleQuery.test.js
 packages/lib/services/searchengine/queryBuilder.js
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.test.js
@@ -861,8 +859,6 @@ packages/tools/website/updateDownloadPage.js
 packages/tools/website/updateNews.js
 packages/tools/website/utils/applyTranslations.js
 packages/tools/website/utils/applyTranslations.test.js
-packages/tools/website/utils/convertLinksToLocale.js
-packages/tools/website/utils/convertLinksToLocale.test.js
 packages/tools/website/utils/frontMatter.js
 packages/tools/website/utils/news.js
 packages/tools/website/utils/openGraph.js

Assets/WebsiteAssets/css/site.css

@@ -657,16 +657,6 @@ footer .bottom-links-row p {
 	font-size: 1.1em;
 }
 
-.language-switcher {
-	display: inline;
-}
-
-.language-switcher > button {
-	border: none;
-	background-color: transparent;
-	color: #0557ba;
-}
-
 /*****************************************************************
  WHAT'S NEW PAGE
 *****************************************************************/

Assets/WebsiteAssets/templates/front.mustache

@@ -421,7 +421,7 @@
 		</div>
 
 		<script
-			src="{{jsBaseUrl}}/bootstrap5.0.2.bundle.min.js"
+			src="{{jsBaseUrl}}/bootstrap5.0.2.min.js"
 			rel="preload"
 			as="script"
 		></script>

Assets/WebsiteAssets/templates/main-new.mustache

@@ -85,11 +85,6 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			{{> footer}}
 		</div>
 
-		<script
-			src="{{jsBaseUrl}}/bootstrap5.0.2.bundle.min.js"
-			rel="preload"
-			as="script"
-		></script>
 		<script src="{{{assetUrls.js.script}}}"></script>
 
 		{{> analytics}}

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -17,21 +17,6 @@
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
 				<a href="{{baseUrl}}/cn/" class="fw500">中文</a>
-
-				<!--
-				<div class="dropdown language-switcher">
-					<button class="fw500" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
-						Language
-					</button>
-					<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-						<li><a class="dropdown-item" href="#">Action</a></li>
-						<li><a class="dropdown-item" href="#">Another action</a></li>
-						<li><a class="dropdown-item" href="#">Something else here</a></li>
-					</ul>
-				</div>
-				-->
-
-
 				{{#showJoplinCloudLinks}}
 					{{> joplinCloudButton}}
 				{{/showJoplinCloudLinks}}

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

@@ -641,8 +641,8 @@ function CodeMirror(props: NoteBodyEditorProps, ref: any) {
 				resourceInfos: props.resourceInfos,
 				contentMaxWidth: props.contentMaxWidth,
 				mapsToLine: true,
-				// turning off custom pdf viewer; ref: https://github.com/laurent22/joplin/issues/8028
-				useCustomPdfViewer: false,
+				// Always using useCustomPdfViewer for now, we can add a new setting for it in future if we need to.
+				useCustomPdfViewer: props.useCustomPdfViewer,
 				noteId: props.noteId,
 				vendorDir: bridge().vendorDir(),
 			}));

packages/app-desktop/gui/PdfViewer.tsx

@@ -7,8 +7,6 @@ import { ContextMenuItemType, ContextMenuOptions } from './NoteEditor/utils/cont
 import CommandService from '@joplin/lib/services/CommandService';
 import styled from 'styled-components';
 import { themeStyle } from '@joplin/lib/theme';
-const Entities = require('html-entities').AllHtmlEntities;
-const htmlentities = new Entities().encode;
 
 const Window = styled.div`
 	height: 100%;
@@ -21,6 +19,12 @@ const Window = styled.div`
 	color: ${(props: any) => props.theme.color};
 	`;
 
+const IFrame = styled.iframe`
+	height: 100%;
+    width: 100%;
+    border: none;
+	`;
+
 interface Props {
 	themeId: number;
 	dispatch: Function;
@@ -89,12 +93,13 @@ export default function PdfViewer(props: Props) {
 
 	const theme = themeStyle(props.themeId);
 
-	const escapedResourcePath = htmlentities(Resource.fullPath(props.resource));
-	const escapedMime = htmlentities('application/pdf');
-
 	return (
 		<Window theme={theme}>
-			<object data={escapedResourcePath} className="media-player media-pdf" type={escapedMime}></object>;
+			<IFrame src="./vendor/lib/@joplin/pdf-viewer/index.html" x-url={Resource.fullPath(props.resource)}
+				x-appearance={theme.appearance} ref={iframeRef}
+				x-title={props.resource.title}
+				x-anchorpage={props.pageNo}
+				x-type="full"></IFrame>
 		</Window>
 	);
 }

packages/app-desktop/package.json

@@ -27,7 +27,6 @@
   },
   "build": {
     "appId": "net.cozic.joplin-desktop",
-    "compression": "maximum",
     "productName": "Joplin",
     "npmRebuild": false,
     "afterSign": "./tools/notarizeMacApp.js",
@@ -138,6 +137,7 @@
     "@fortawesome/fontawesome-free": "5.15.4",
     "@joeattardi/emoji-button": "4.6.4",
     "@joplin/lib": "~2.11",
+    "@joplin/pdf-viewer": "~2.11",
     "@joplin/renderer": "~2.11",
     "async-mutex": "0.4.0",
     "codemirror": "5.65.9",
@@ -149,7 +149,6 @@
     "formatcoords": "1.1.3",
     "fs-extra": "11.1.1",
     "highlight.js": "11.7.0",
-    "html-entities": "1.4.0",
     "immer": "7.0.15",
     "keytar": "7.9.0",
     "mark.js": "8.11.1",

packages/app-desktop/tools/copyApplicationAssets.js

@@ -72,6 +72,10 @@ async function main() {
 			src: langSourceDir,
 			dest: `${buildLibDir}/tinymce/langs`,
 		},
+		{
+			src: resolve(__dirname, '../../pdf-viewer/dist'),
+			dest: `${buildLibDir}/@joplin/pdf-viewer`,
+		},
 	];
 
 	const files = [
@@ -89,6 +93,10 @@ async function main() {
 			src: resolve(__dirname, '../../lib/services/plugins/sandboxProxy.js'),
 			dest: `${buildLibDir}/@joplin/lib/services/plugins/sandboxProxy.js`,
 		},
+		{
+			src: resolve(__dirname, '../../pdf-viewer/index.html'),
+			dest: `${buildLibDir}/@joplin/pdf-viewer/index.html`,
+		},
 	];
 
 	// First we delete all the destination directories, then we copy the files.

packages/app-mobile/components/note-list.js

@@ -1,32 +1,15 @@
 const React = require('react');
-
-import { Component } from 'react';
-
-import { connect } from 'react-redux';
-import { FlatList, Text, StyleSheet, Button, View } from 'react-native';
-import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
-import { AppState } from '../utils/types';
-
+const Component = React.Component;
+const { connect } = require('react-redux');
+const { FlatList, Text, StyleSheet, Button, View } = require('react-native');
 const { _ } = require('@joplin/lib/locale');
 const { NoteItem } = require('./note-item.js');
+const time = require('@joplin/lib/time').default;
 const { themeStyle } = require('./global-style.js');
 
-interface NoteListProps {
-	themeId: string;
-	dispatch: (action: any)=> void;
-	notesSource: string;
-	items: NoteEntity[];
-	folders: FolderEntity[];
-	noteSelectionEnabled?: boolean;
-	selectedFolderId?: string;
-}
-
-class NoteListComponent extends Component<NoteListProps> {
-	private rootRef_: FlatList;
-	private styles_: Record<string, StyleSheet.NamedStyles<any>>;
-
-	public constructor(props: NoteListProps) {
-		super(props);
+class NoteListComponent extends Component {
+	constructor() {
+		super();
 
 		this.state = {
 			items: [],
@@ -38,7 +21,7 @@ class NoteListComponent extends Component<NoteListProps> {
 		this.createNotebookButton_click = this.createNotebookButton_click.bind(this);
 	}
 
-	private styles() {
+	styles() {
 		const themeId = this.props.themeId;
 		const theme = themeStyle(themeId);
 
@@ -64,7 +47,7 @@ class NoteListComponent extends Component<NoteListProps> {
 		return this.styles_[themeId];
 	}
 
-	private createNotebookButton_click() {
+	createNotebookButton_click() {
 		this.props.dispatch({
 			type: 'NAV_GO',
 			routeName: 'Folder',
@@ -72,14 +55,34 @@ class NoteListComponent extends Component<NoteListProps> {
 		});
 	}
 
-	public UNSAFE_componentWillReceiveProps(newProps: NoteListProps) {
+	filterNotes(notes) {
+		const todoFilter = 'all'; // Setting.value('todoFilter');
+		if (todoFilter === 'all') return notes;
+
+		const now = time.unixMs();
+		const maxInterval = 1000 * 60 * 60 * 24;
+		const notRecentTime = now - maxInterval;
+
+		const output = [];
+		for (let i = 0; i < notes.length; i++) {
+			const note = notes[i];
+			if (note.is_todo) {
+				if (todoFilter === 'recent' && note.user_updated_time < notRecentTime && !!note.todo_completed) continue;
+				if (todoFilter === 'nonCompleted' && !!note.todo_completed) continue;
+			}
+			output.push(note);
+		}
+		return output;
+	}
+
+	UNSAFE_componentWillReceiveProps(newProps) {
 		// Make sure scroll position is reset when switching from one folder to another or to a tag list.
 		if (this.rootRef_ && newProps.notesSource !== this.props.notesSource) {
 			this.rootRef_.scrollToOffset({ offset: 0, animated: false });
 		}
 	}
 
-	public render() {
+	render() {
 		// `enableEmptySections` is to fix this warning: https://github.com/FaridSafi/react-native-gifted-listview/issues/39
 
 		if (this.props.items.length) {
@@ -106,7 +109,7 @@ class NoteListComponent extends Component<NoteListProps> {
 	}
 }
 
-const NoteList = connect((state: AppState) => {
+const NoteList = connect(state => {
 	return {
 		items: state.notes,
 		folders: state.folders,
@@ -116,4 +119,4 @@ const NoteList = connect((state: AppState) => {
 	};
 })(NoteListComponent);
 
-export default NoteList;
+module.exports = { NoteList };

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

@@ -2,7 +2,7 @@ const React = require('react');
 import { AppState as RNAppState, View, StyleSheet, NativeEventSubscription } from 'react-native';
 import { stateUtils } from '@joplin/lib/reducer';
 import { connect } from 'react-redux';
-import NoteList from '../NoteList';
+const { NoteList } = require('../note-list.js');
 import Folder from '@joplin/lib/models/Folder';
 import Tag from '@joplin/lib/models/Tag';
 import Note from '@joplin/lib/models/Note';
@@ -254,7 +254,7 @@ class NotesScreenComponent extends BaseScreenComponent<any> {
 		return (
 			<View style={rootStyle}>
 				<ScreenHeader title={iconString + title} showBackButton={false} parentComponent={thisComp} sortButton_press={this.sortButton_press} folderPickerOptions={this.folderPickerOptions()} showSearchButton={true} showSideMenuButton={true} />
-				<NoteList />
+				<NoteList style={this.styles().noteList} />
 				{actionButtonComp}
 				<DialogBox
 					ref={(dialogbox: any) => {

packages/lib/models/Setting.ts

@@ -1395,7 +1395,7 @@ class Setting extends BaseModel {
 			useCustomPdfViewer: {
 				value: false,
 				type: SettingItemType.Bool,
-				public: false,
+				public: true,
 				advanced: true,
 				appTypes: [AppType.Desktop],
 				label: () => 'Use custom PDF viewer (Beta)',

packages/lib/services/searchengine/SearchEngine.test.js

@@ -431,7 +431,6 @@ describe('services_SearchEngine', () => {
 			['title:abcd efgh', { _: ['efgh'], title: ['abcd'] }],
 			['title:abcd', { title: ['abcd'] }],
 			['"abcd efgh"', { _: ['abcd efgh'] }],
-			['"abcd efgh" ijkl', { _: ['abcd efgh', 'ijkl'] }],
 			['title:abcd title:efgh', { title: ['abcd', 'efgh'] }],
 		];
 

packages/lib/services/searchengine/SearchEngine.ts

@@ -5,31 +5,20 @@ import Note from '../../models/Note';
 import BaseModel from '../../BaseModel';
 import ItemChangeUtils from '../ItemChangeUtils';
 import shim from '../../shim';
-import filterParser, { Term } from './filterParser';
+import filterParser from './filterParser';
 import queryBuilder from './queryBuilder';
 import { ItemChangeEntity, NoteEntity } from '../database/types';
 const { sprintf } = require('sprintf-js');
 const { pregQuote, scriptType, removeDiacritics } = require('../../string-utils.js');
 
-enum SearchType {
-	Auto = 'auto',
-	Basic = 'basic',
-	Nonlatin = 'nonlatin',
-	Fts = 'fts',
-}
-
-interface SearchOptions {
-	searchType: SearchType;
-}
-
 export default class SearchEngine {
 
 	public static instance_: SearchEngine = null;
 	public static relevantFields = 'id, title, body, user_created_time, user_updated_time, is_todo, todo_completed, todo_due, parent_id, latitude, longitude, altitude, source_url';
-	public static SEARCH_TYPE_AUTO = SearchType.Auto;
-	public static SEARCH_TYPE_BASIC = SearchType.Basic;
-	public static SEARCH_TYPE_NONLATIN_SCRIPT = SearchType.Nonlatin;
-	public static SEARCH_TYPE_FTS = SearchType.Fts;
+	public static SEARCH_TYPE_AUTO = 'auto';
+	public static SEARCH_TYPE_BASIC = 'basic';
+	public static SEARCH_TYPE_NONLATIN_SCRIPT = 'nonlatin';
+	public static SEARCH_TYPE_FTS = 'fts';
 
 	public dispatch: Function = (_o: any) => {};
 	private logger_ = new Logger();
@@ -428,7 +417,7 @@ export default class SearchEngine {
 
 		const trimQuotes = (str: string) => str.startsWith('"') ? str.substr(1, str.length - 2) : str;
 
-		let allTerms: Term[] = [];
+		let allTerms: any[] = [];
 
 		try {
 			allTerms = filterParser(query);
@@ -440,20 +429,7 @@ export default class SearchEngine {
 		const titleTerms = allTerms.filter(x => x.name === 'title' && !x.negated).map(x => trimQuotes(x.value));
 		const bodyTerms = allTerms.filter(x => x.name === 'body' && !x.negated).map(x => trimQuotes(x.value));
 
-		interface ComplexTerm {
-			type: 'regex' | 'text';
-			value: string;
-			scriptType: any;
-			valueRegex?: RegExp;
-		}
-
-		interface Terms {
-			_: (string | ComplexTerm)[];
-			title: (string | ComplexTerm)[];
-			body: (string | ComplexTerm)[];
-		}
-
-		const terms: Terms = { _: textTerms, 'title': titleTerms, 'body': bodyTerms };
+		const terms: any = { _: textTerms, 'title': titleTerms, 'body': bodyTerms };
 
 		// Filter terms:
 		// - Convert wildcards to regex
@@ -462,9 +438,7 @@ export default class SearchEngine {
 
 		let termCount = 0;
 		const keys = [];
-		for (const col2 in terms) {
-			const col = col2 as '_' | 'title' | 'body';
-
+		for (const col in terms) {
 			if (!terms.hasOwnProperty(col)) continue;
 
 			if (!terms[col].length) {
@@ -473,7 +447,7 @@ export default class SearchEngine {
 			}
 
 			for (let i = terms[col].length - 1; i >= 0; i--) {
-				const term = terms[col][i] as string;
+				const term = terms[col][i];
 
 				// SQlLite FTS doesn't allow "*" queries and neither shall we
 				if (term === '*') {
@@ -494,16 +468,12 @@ export default class SearchEngine {
 		}
 
 		//
-		// The object "allTerms" is used for query construction purposes (this
-		// contains all the filter terms) Since this is used for the FTS match
-		// query, we need to normalize text, title and body terms. Note, we're
-		// not normalizing terms like tag because these are matched using SQL
-		// LIKE operator and so we must preserve their diacritics.
+		// The object "allTerms" is used for query construction purposes (this contains all the filter terms)
+		// Since this is used for the FTS match query, we need to normalize text, title and body terms.
+		// Note, we're not normalizing terms like tag because these are matched using SQL LIKE operator and so we must preserve their diacritics.
 		//
-		// The object "terms" only include text, title, body terms and is used
-		// for highlighting. By not normalizing the text, title, body in
-		// "terms", highlighting still works correctly for words with
-		// diacritics.
+		// The object "terms" only include text, title, body terms and is used for highlighting.
+		// By not normalizing the text, title, body in "terms", highlighting still works correctly for words with diacritics.
 		//
 
 		allTerms = allTerms.map(x => {
@@ -551,9 +521,9 @@ export default class SearchEngine {
 		const searchOptions: any = {};
 
 		for (const key of parsedQuery.keys) {
-			if ((parsedQuery.terms as any)[key].length === 0) continue;
+			if (parsedQuery.terms[key].length === 0) continue;
 
-			const term = (parsedQuery.terms as any)[key].map((x: Term) => x.value).join(' ');
+			const term = parsedQuery.terms[key].map((x: any) => x.value).join(' ');
 			if (key === '_') searchOptions.anywherePattern = `*${term}*`;
 			if (key === 'title') searchOptions.titlePattern = `*${term}*`;
 			if (key === 'body') searchOptions.bodyPattern = `*${term}*`;
@@ -591,13 +561,12 @@ export default class SearchEngine {
 		return SearchEngine.SEARCH_TYPE_FTS;
 	}
 
-	public async search(searchString: string, options: SearchOptions = null) {
+	public async search(searchString: string, options: any = null) {
 		if (!searchString) return [];
 
-		options = {
+		options = Object.assign({}, {
 			searchType: SearchEngine.SEARCH_TYPE_AUTO,
-			...options,
-		};
+		}, options);
 
 		const searchType = this.determineSearchType_(searchString, options.searchType);
 		const parsedQuery = await this.parseQuery(searchString);

packages/lib/services/searchengine/filterParser.ts

@@ -1,5 +1,5 @@
 
-export interface Term {
+interface Term {
 	name: string;
 	value: string;
 	negated: boolean;

packages/lib/services/searchengine/gotoAnythingStyleQuery.test.ts

@@ -1,17 +0,0 @@
-import gotoAnythingStyleQuery from './gotoAnythingStyleQuery';
-
-describe('searchengine/gotoAnythingStyleQuery', () => {
-
-	it('should prepare queries', () => {
-		const testCases: [string, string][] = [
-			['hello', 'hello*'],
-			['hello welc', 'hello* welc*'],
-		];
-
-		for (const [input, expected] of testCases) {
-			const actual = gotoAnythingStyleQuery(input);
-			expect(actual).toBe(expected);
-		}
-	});
-
-});

packages/renderer/MdToHtml/renderMedia.ts

@@ -19,7 +19,7 @@ function resourceUrl(resourceFullPath: string): string {
 	return `file://${toForwardSlashes(resourceFullPath)}`;
 }
 
-export default function(link: Link, options: Options, _linkIndexes: LinkIndexes) {
+export default function(link: Link, options: Options, linkIndexes: LinkIndexes) {
 	const resource = link.resource;
 
 	if (!link.resourceReady || !resource || !resource.mime) return '';
@@ -47,6 +47,32 @@ export default function(link: Link, options: Options, _linkIndexes: LinkIndexes)
 	}
 
 	if (options.pdfViewerEnabled && resource.mime === 'application/pdf') {
+
+		if (options.useCustomPdfViewer) {
+			const resourceId = resource.id;
+			let anchorPageNo = null;
+
+			let id = `${options.noteId}.${resourceId}`;
+			if (linkIndexes && linkIndexes[resourceId]) {
+				linkIndexes[resourceId]++;
+			} else {
+				linkIndexes[resourceId] = 1;
+			}
+			id += `.${linkIndexes[resourceId]}`;
+
+			if (link.href.indexOf('#') > 0) {
+				anchorPageNo = Number(link.href.split('#').pop());
+				if (anchorPageNo < 1) anchorPageNo = null;
+			}
+
+			const src = `${options.vendorDir}/lib/@joplin/pdf-viewer/index.html`;
+
+			return `<iframe src="${src}" x-url="${escapedResourcePath}" 
+			x-appearance="${options.theme.appearance}" ${anchorPageNo ? `x-anchorPage="${anchorPageNo}"` : ''} id="${id}"
+			x-type="mini" x-resourceid="${resourceId}"
+		 class="media-player media-pdf"></iframe>`;
+		}
+
 		return `<object data="${escapedResourcePath}" class="media-player media-pdf" type="${escapedMime}"></object>`;
 	}
 

packages/tools/website/build.ts

@@ -1,20 +1,19 @@
-import { readFileSync, readFile, mkdirpSync, writeFileSync, remove, copy, pathExistsSync, pathExists } from 'fs-extra';
+import { readFileSync, readFile, mkdirpSync, writeFileSync, remove, copy, pathExistsSync } from 'fs-extra';
 import { rootDir } from '../tool-utils';
 import { pressCarouselItems } from './utils/pressCarousel';
 import { getMarkdownIt, loadMustachePartials, markdownToPageHtml, renderMustache } from './utils/render';
-import { AssetUrls, Env, Locale, Partials, PlanPageParams, TemplateParams } from './utils/types';
+import { AssetUrls, Env, Partials, PlanPageParams, TemplateParams } from './utils/types';
 import { createFeatureTableMd, getPlans, loadStripeConfig } from '@joplin/lib/utils/joplinCloud';
 import { stripOffFrontMatter } from './utils/frontMatter';
 import { dirname, basename } from 'path';
 import { readmeFileTitle, replaceGitHubByWebsiteLinks } from './utils/parser';
-import { extractOpenGraphTags, OpenGraphTags } from './utils/openGraph';
+import { extractOpenGraphTags } from './utils/openGraph';
 import { readCredentialFileJson } from '@joplin/lib/utils/credentialFiles';
 import { getNewsDateString } from './utils/news';
 import { parsePoFile, parseTranslations, Translations } from '../utils/translation';
-import { setLocale } from '@joplin/lib/locale';
+import { countryCodeOnly, setLocale } from '@joplin/lib/locale';
 import applyTranslations from './utils/applyTranslations';
 import { loadSponsors } from '../utils/loadSponsors';
-import convertLinksToLocale from './utils/convertLinksToLocale';
 
 interface BuildConfig {
 	env: Env;
@@ -24,12 +23,6 @@ const buildConfig = readCredentialFileJson<BuildConfig>('website-build.json', {
 	env: Env.Prod,
 });
 
-const enGbLocale: Locale = {
-	htmlTranslations: {},
-	lang: 'en-gb',
-	pathPrefix: '',
-};
-
 const glob = require('glob');
 const path = require('path');
 const md5File = require('md5-file');
@@ -48,7 +41,7 @@ const partialDir = `${websiteAssetDir}/templates/partials`;
 const discussLink = 'https://discourse.joplinapp.org/c/news/9';
 
 let tocMd_: string = null;
-const tocHtml_: Record<string, string> = {};
+let tocHtml_: string = null;
 const tocRegex_ = /<!-- TOC -->([^]*)<!-- TOC -->/;
 function tocMd() {
 	if (tocMd_) return tocMd_;
@@ -68,17 +61,15 @@ async function getDonateLinks() {
 	return `<div class="donate-links">\n\n${matches[1].trim()}\n\n</div>`;
 }
 
-function tocHtml(locale: Locale) {
-	if (tocHtml_[locale.lang]) return tocHtml_[locale.lang];
+function tocHtml() {
+	if (tocHtml_) return tocHtml_;
 	const markdownIt = getMarkdownIt();
 	let md = tocMd();
 	md = md.replace(/# Table of contents/, '');
 	md = replaceGitHubByWebsiteLinks(md);
-	md = convertLinksToLocale(md, locale);
-	let output = markdownIt.render(md);
-	output = `<div>${output}</div>`;
-	tocHtml_[locale.lang] = output;
-	return output;
+	tocHtml_ = markdownIt.render(md);
+	tocHtml_ = `<div>${tocHtml_}</div>`;
+	return tocHtml_;
 }
 
 const baseUrl = '';
@@ -99,16 +90,14 @@ async function getAssetUrls(): Promise<AssetUrls> {
 	};
 }
 
-function defaultTemplateParams(assetUrls: AssetUrls, locale: Locale = null): TemplateParams {
-	if (!locale) locale = enGbLocale;
-
+function defaultTemplateParams(assetUrls: AssetUrls): TemplateParams {
 	return {
 		env: buildConfig.env,
 		baseUrl,
 		imageBaseUrl: `${baseUrl}/images`,
 		cssBaseUrl,
 		jsBaseUrl,
-		tocHtml: tocHtml(locale),
+		tocHtml: tocHtml(),
 		yyyy: (new Date()).getFullYear().toString(),
 		templateHtml: mainTemplateHtml,
 		forumUrl: 'https://discourse.joplinapp.org/',
@@ -120,7 +109,6 @@ function defaultTemplateParams(assetUrls: AssetUrls, locale: Locale = null): Tem
 		},
 		assetUrls,
 		openGraph: null,
-		locale,
 	};
 }
 
@@ -129,7 +117,7 @@ function renderPageToHtml(md: string, targetPath: string, templateParams: Templa
 	md = md.replace(/# Joplin\n/, '');
 
 	templateParams = {
-		...defaultTemplateParams(templateParams.assetUrls, templateParams.locale),
+		...defaultTemplateParams(templateParams.assetUrls),
 		...templateParams,
 	};
 
@@ -145,7 +133,6 @@ function renderPageToHtml(md: string, targetPath: string, templateParams: Templa
 	}
 
 	md = replaceGitHubByWebsiteLinks(md);
-	md = convertLinksToLocale(md, templateParams.locale);
 
 	if (templateParams.donateLinksMd) {
 		md = `${templateParams.donateLinksMd}\n\n${md}`;
@@ -174,8 +161,8 @@ function renderFileToHtml(sourcePath: string, targetPath: string, templateParams
 	}
 }
 
-function makeHomePageMd(readmePath: string) {
-	let md = readFileSync(readmePath, 'utf8');
+function makeHomePageMd() {
+	let md = readFileSync(`${rootDir}/README.md`, 'utf8');
 	md = md.replace(tocRegex_, '');
 
 	// HACK: GitHub needs the \| or the inline code won't be displayed correctly inside the table,
@@ -229,20 +216,15 @@ const updatePageLanguage = (html: string, lang: string): string => {
 	return html.replace('<html lang="en-gb">', `<html lang="${lang}">`);
 };
 
-// TODO: Add function that process links and add prefix.
-
 async function main() {
-	const supportedLocales: Record<string, Locale> = {
-		'en_GB': enGbLocale,
+	const supportedLocales = {
+		'en_GB': {
+			htmlTranslations: {},
+			lang: 'en-gb',
+		},
 		'zh_CN': {
 			htmlTranslations: parseTranslations(await parsePoFile(`${websiteAssetDir}/locales/zh_CN.po`)),
 			lang: 'zh-cn',
-			pathPrefix: 'cn',
-		},
-		'fr_FR': {
-			htmlTranslations: {},
-			lang: 'fr-fr',
-			pathPrefix: 'fr',
 		},
 	};
 
@@ -255,53 +237,34 @@ async function main() {
 	const partials = await loadMustachePartials(partialDir);
 	const assetUrls = await getAssetUrls();
 
+	const readmeMd = makeHomePageMd();
 	const donateLinksMd = await getDonateLinks();
 
+	// =============================================================
+	// HELP PAGE
+	// =============================================================
+
+	renderPageToHtml(readmeMd, `${docDir}/help/index.html`, {
+		sourceMarkdownFile: 'README.md',
+		donateLinksMd,
+		partials,
+		sponsors,
+		assetUrls,
+		openGraph: {
+			title: 'Joplin documentation',
+			description: '',
+			url: 'https://joplinapp.org/help/',
+		},
+	});
+
+	// =============================================================
+	// FRONT PAGE
+	// =============================================================
+
 	for (const [localeName, locale] of Object.entries(supportedLocales)) {
 		setLocale(localeName);
 
-		const pathPrefix = localeName !== 'en_GB' ? `/${locale.pathPrefix}` : '';
-
-		// =============================================================
-		// HELP PAGE
-		// =============================================================
-
-		let readmePath = `${rootDir}/README.md`;
-
-		let sourceMarkdownFile = 'README.md';
-		let targetDocDir = docDir;
-
-		if (localeName !== 'en_GB') {
-			const possibleSource = `${rootDir}/readme/_i18n/${localeName}/README.md`;
-			if (await pathExists(possibleSource)) {
-				sourceMarkdownFile = possibleSource;
-				readmePath = possibleSource;
-			} else {
-				console.warn(`Cannot find source file: ${possibleSource}`);
-			}
-
-			targetDocDir = `${docDir}/${locale.pathPrefix}`;
-		}
-
-		const readmeMd = makeHomePageMd(readmePath);
-
-		renderPageToHtml(readmeMd, `${targetDocDir}/help/index.html`, {
-			sourceMarkdownFile,
-			donateLinksMd,
-			partials,
-			sponsors,
-			assetUrls,
-			openGraph: {
-				title: 'Joplin documentation',
-				description: '',
-				url: 'https://joplinapp.org/help/',
-			},
-			locale,
-		});
-
-		// =============================================================
-		// FRONT PAGE
-		// =============================================================
+		const pathPrefix = localeName !== 'en_GB' ? `/${countryCodeOnly(localeName).toLowerCase()}` : '';
 
 		let templateHtml = updatePageLanguage(applyTranslations(frontTemplateHtml, localeName, locale.htmlTranslations), locale.lang);
 		if (localeName === 'zh_CN') templateHtml = templateHtml.replace(/\/plans/g, '/cn/plans');
@@ -329,16 +292,22 @@ async function main() {
 				url: 'https://joplinapp.org',
 			},
 		});
+	}
 
-		// =============================================================
-		// PLANS PAGE
-		// =============================================================
+	setLocale('en_GB');
+
+	// =============================================================
+	// PLANS PAGE
+	// =============================================================
+
+	for (const [localeName, locale] of Object.entries(supportedLocales)) {
+		setLocale(localeName);
 
 		const planPageFaqMd = await readFile(`${readmeDir}/faq_joplin_cloud.md`, 'utf8');
 		const planPageFaqHtml = getMarkdownIt().render(planPageFaqMd, {});
 
 		const planPageParams: PlanPageParams = {
-			...defaultTemplateParams(assetUrls, locale),
+			...defaultTemplateParams(assetUrls),
 			partials: translatePartials(partials, localeName, locale.htmlTranslations),
 			templateHtml: applyTranslations(plansTemplateHtml, localeName, locale.htmlTranslations),
 			plans: getPlans(stripeConfig),
@@ -349,8 +318,10 @@ async function main() {
 
 		const planPageContentHtml = renderMustache('', planPageParams);
 
+		const pathPrefix = localeName !== 'en_GB' ? `/${countryCodeOnly(localeName).toLowerCase()}` : '';
+
 		const templateParams = {
-			...defaultTemplateParams(assetUrls, locale),
+			...defaultTemplateParams(assetUrls),
 			pageName: 'plans',
 			partials,
 			showToc: false,
@@ -371,20 +342,10 @@ async function main() {
 	// Markdown files under /readme
 	// =============================================================
 
-	interface SourceInfo {
-		title: string;
-		donateLinksMd: string;
-		showToc: boolean;
-		openGraph: OpenGraphTags;
-		sourceMarkdownName?: string;
-		sourceMarkdownFile?: string;
-		locale: Locale;
-	}
+	const mdFiles = glob.sync(`${readmeDir}/**/*.md`).map((f: string) => f.substr(rootDir.length + 1));
+	const sources = [];
 
-	const mdFiles: string[] = glob.sync(`${readmeDir}/**/*.md`).map((f: string) => f.substr(rootDir.length + 1));
-	const sources: [string, string, SourceInfo][] = [];
-
-	const makeTargetBasename = (input: string, pathPrefix: string): string => {
+	const makeTargetBasename = (input: string): string => {
 		if (isNewsFile(input)) {
 			const filenameNoExt = basename(input, '.md');
 			return `news/${filenameNoExt}/index.html`;
@@ -403,49 +364,34 @@ async function main() {
 
 			s = s.replace(/readme\//, '');
 
-			if (pathPrefix) s = `${pathPrefix}/${s}`;
-
 			return s;
 		}
 	};
 
-	const makeTargetFilePath = (input: string, pathPrefix: string): string => {
-		return `${docDir}/${makeTargetBasename(input, pathPrefix)}`;
+	const makeTargetFilePath = (input: string): string => {
+		return `${docDir}/${makeTargetBasename(input)}`;
 	};
 
-	const makeTargetUrl = (input: string, pathPrefix: string) => {
-		return `https://joplinapp.org/${makeTargetBasename(input, pathPrefix)}`;
+	const makeTargetUrl = (input: string) => {
+		return `https://joplinapp.org/${makeTargetBasename(input)}`;
 	};
 
 	const newsFilePaths: string[] = [];
 
 	for (const mdFile of mdFiles) {
-		if (mdFile.startsWith('readme/_i18n')) continue;
+		const title = await readmeFileTitle(`${rootDir}/${mdFile}`);
+		const targetFilePath = makeTargetFilePath(mdFile);
+		const openGraph = await extractOpenGraphTags(mdFile, makeTargetUrl(mdFile));
 
-		for (const [localeName, locale] of Object.entries(supportedLocales)) {
-			const title = await readmeFileTitle(`${rootDir}/${mdFile}`);
-			const targetFilePath = makeTargetFilePath(mdFile, locale.pathPrefix);
-			const openGraph = await extractOpenGraphTags(mdFile, makeTargetUrl(mdFile, locale.pathPrefix));
+		const isNews = isNewsFile(mdFile);
+		if (isNews) newsFilePaths.push(mdFile);
 
-			const isNews = isNewsFile(mdFile);
-			if (isNews) newsFilePaths.push(mdFile);
-
-			let sourceFile = mdFile;
-
-			if (localeName !== 'en_GB') {
-				let temp = mdFile.replace(/readme\//, '');
-				temp = `readme/_i18n/${localeName}/${temp}`;
-				if (await pathExists(temp)) sourceFile = temp;
-			}
-
-			sources.push([sourceFile, targetFilePath, {
-				title: title,
-				donateLinksMd: mdFile === 'readme/donate.md' ? '' : donateLinksMd,
-				showToc: mdFile !== 'readme/download.md' && !isNews,
-				openGraph,
-				locale,
-			}]);
-		}
+		sources.push([mdFile, targetFilePath, {
+			title: title,
+			donateLinksMd: mdFile === 'readme/donate.md' ? '' : donateLinksMd,
+			showToc: mdFile !== 'readme/download.md' && !isNews,
+			openGraph,
+		}]);
 	}
 
 	for (const source of sources) {
@@ -472,7 +418,7 @@ async function main() {
 	});
 
 	await makeNewsFrontPage(newsFilePaths, `${docDir}/news/index.html`, {
-		...defaultTemplateParams(assetUrls, null),
+		...defaultTemplateParams(assetUrls),
 		title: 'What\'s new',
 		pageName: 'news',
 		partials,

packages/tools/website/utils/convertLinksToLocale.test.ts

@@ -1,25 +0,0 @@
-import convertLinksToLocale from './convertLinksToLocale';
-
-describe('convertLinksToLocale', () => {
-
-	it('should convert links', async () => {
-		const tests: [string, any, string][] = [
-			[
-				'test [link](/help/link)',
-				{ pathPrefix: 'fr' },
-				'test [link](/fr/help/link)',
-			],
-			[
-				'test [link](/help/link) [link2](/link2)',
-				{ pathPrefix: 'fr' },
-				'test [link](/fr/help/link) [link2](/fr/link2)',
-			],
-		];
-
-		for (const [input, locale, expected] of tests) {
-			const actual = convertLinksToLocale(input, locale);
-			expect(actual).toBe(expected);
-		}
-	});
-
-});

packages/tools/website/utils/convertLinksToLocale.ts

@@ -1,9 +0,0 @@
-import { Locale } from './types';
-
-export default (md: string, locale: Locale) => {
-	if (locale.lang === 'en-gb') return md;
-
-	md = md.replace(/\(\//g, `(/${locale.pathPrefix}/`);
-
-	return md;
-};

packages/tools/website/utils/types.ts

@@ -7,12 +7,6 @@ export enum Env {
 	Prod = 'prod',
 }
 
-export interface Locale {
-	htmlTranslations: Record<string, string>;
-	lang: string;
-	pathPrefix: string;
-}
-
 export interface GithubUser {
 	id: string;
 }
@@ -68,7 +62,6 @@ export interface TemplateParams {
 	showBottomLinks?: boolean;
 	openGraph: OpenGraphTags;
 	isNews?: boolean;
-	locale?: Locale;
 }
 
 export interface PlanPageParams extends TemplateParams {

readme/_i18n/fr_FR/README.md

@@ -1,74 +0,0 @@
-<!-- DONATELINKS -->
-[! [Faire un don via PayPal] (https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [! [Sponsor sur GitHub] (https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [! [Devenez mécène] (https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [! [Faire un don en utilisant un IBAN] (https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
-<!-- DONATELINKS -->
-
-* * * 
-**TEST ONLY**
-* * *
-
-[test link](/spec/e2ee)
-
-<img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" />**Joplin** est une application gratuite et open source de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des carnets de notes. Les notes sont consultables, peuvent être copiées, balisées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format [Markdown] (#markdown).
-
-Les notes exportées depuis Evernote [peuvent être importées] (#importing) dans Joplin, y compris le contenu formaté (qui est converti en Markdown), les ressources (images, pièces jointes, etc.) et les métadonnées complètes (géolocalisation, heure de mise à jour, heure de création, etc.). Les fichiers Markdown simples peuvent également être importés.
-
-Les notes peuvent être [synchronisées] (#synchronisation) en toute sécurité à l'aide du [chiffrement de bout en bout] (#encryption) avec divers services cloud, notamment Nextcloud, Dropbox, OneDrive et [Joplin Cloud] (https://joplinapp.org/plans/).
-
-La recherche en texte intégral est disponible sur toutes les plateformes pour trouver rapidement les informations dont vous avez besoin. L'application peut être personnalisée à l'aide de plugins et de thèmes, et vous pouvez également créer facilement le vôtre.
-
-L'application est disponible pour Windows, Linux, macOS, Android et iOS. Un [Web Clipper] (https://github.com/laurent22/joplin/blob/dev/readme/clipper.md), qui permet d'enregistrer des pages Web et des captures d'écran depuis votre navigateur, est également disponible pour [Firefox] (https://addons.mozilla.org/firefox/addon/joplin-web-clipper/) et [Chrome] (https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek?hl=en-GB).
-
-<div class="top-screenshot"></div><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/home-top-img.png" style="max-width: 100%; max-height: 35em;">
-
-# Installation
-
-Trois types d'applications sont disponibles : pour **bureau** (Windows, macOS et Linux), pour **mobile** (Android et iOS) et pour **terminal** (Windows, macOS, Linux et FreeBSD). Toutes les applications disposent d'interfaces utilisateur similaires et peuvent se synchroniser entre elles.
-
-## Applications de bureau
-
-Système d'exploitation | Télécharger
----|---
-Windows (32 et 64 bits) | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-Setup-2.9.17.exe'><img alt='Get it on Windows' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeWindows.png'/></a>
-MacOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-2.9.17.dmg'><img alt='Get it on macOS' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/Joplin-2.9.17.AppImage'><img alt='Get it on Linux' width="134px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeLinux.png'/></a>
-
-<a href='https://github.com/laurent22/joplin/releases/download/v2.9.17/JoplinPortable.exe'>**Sous Windows**, vous pouvez également utiliser la version portable.</a> L' [application portable] (https://en.wikipedia.org/wiki/Portable_application) permet d'installer le logiciel sur un appareil portable tel qu'une clé USB. Copiez simplement le fichier JoplinPortable.exe dans n'importe quel répertoire de cette clé USB ; l'application créera alors un répertoire appelé « JoplinProfile » à côté du fichier exécutable.
-
-**Sous Linux**, la méthode recommandée est d'utiliser le script d'installation suivant car il gérera également l'icône du bureau :
-
-<pre><code style="word-break: break-all">wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash</code></pre>
-
-## Applications mobiles
-
-Système d'exploitation | Télécharger | Alt. Télécharger
----|---|---
-Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a>| ou téléchargez le fichier APK : [64 bits] (https://github.com/laurent22/joplin-android/releases/download/android-v2.9.8/joplin-v2.9.8.apk) [32 bits] ( https://github.com/laurent22/joplin-android/releases/download/android-v2.9.8/joplin-v2.9.8-32bit.apk)
-iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeIOS.png'/></a>| -
-
-## Application du terminal
-
-Système d'exploitation | Méthode
------------------|----------------
-macOS, Linux ou Windows (via [WSL] (https://msdn.microsoft.com/en-us/commandline/wsl/faq?f=255&MSPPError=-2147217396)) | **Important :** Tout d'abord, [installez Node 12+] (https://nodejs.org/en/download/package-manager/). <br/><br/><br><br>`NPM_CONFIG_PREFIX=~/.joplin-bin npm install -g joplin` `sudo ln -s ~/.joplin-bin/bin/joplin /usr/bin/joplin `Par défaut, le binaire de l'application sera installé sous <br/> `~/.joplin-bin`. Vous pouvez modifier ce répertoire si nécessaire. Sinon, si vos autorisations npm sont configurées comme décrit [ici] (https://docs.npmjs.com/getting-started/fixing-npm-permissions#option-2-change-npms-default-directory-to-another-directory) (Option 2), il suffit d'exécuter `npm -g install joplin`.
-
-Pour le démarrer, tapez `joplin`.
-
-Pour des informations d'utilisation, veuillez consulter la [Documentation complète de l'application Joplin Terminal] (https://joplinapp.org/terminal/).
-
-## Web Clipper
-
-Le Web Clipper est une extension de navigateur qui vous permet d'enregistrer des pages Web et des captures d'écran à partir de votre navigateur. Pour plus d'informations sur son installation et son utilisation, consultez la [Page d'aide de Web Clipper] (https://github.com/laurent22/joplin/blob/dev/readme/clipper.md).
-
-## Distributions alternatives non officielles
-
-Il existe un certain nombre de distributions alternatives non officielles de Joplin. Si vous ne voulez pas ou ne pouvez pas utiliser appimages ou l'une des autres versions officiellement prises en charge, vous pouvez envisager de les utiliser.
-
-Cependant, ils sont assortis d'une mise en garde dans la mesure où ils ne sont pas officiellement pris en charge, de sorte que certains problèmes peuvent ne pas être pris en charge par le projet principal. Les demandes d'assistance, les rapports de bogues et les conseils généraux devraient plutôt être adressés aux responsables de ces distributions.
-
-Une liste de ces distributions gérée par la communauté est disponible ici : [Distributions Joplin non officielles] (https://discourse.joplinapp.org/t/unofficial-alternative-joplin-distributions/23703)
-
-# Sponsors
-
-<!-- SPONSORS-ORG -->
-</a><a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/><a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&mtm_kwd=joplinapp&mtm_source=joplinapp-webseite&mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a><a href="https://residence-greece.com/"><img title="Greece Golden Visa" width="256" src="https://joplinapp.org/images/sponsors/ResidenceGreece.jpg"/></a> <a href="https://grundstueckspreise.info/"><img title="SP Software GmbH" width="256" src="https://joplinapp.org/images/sponsors/Grundstueckspreise.png"/></a>
-<!-- SPONSORS-ORG -->

readme/_i18n/fr_FR/desktop.md

@@ -1,5 +0,0 @@
-# Application de bureau
-
-<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/DemoDesktop.png" style="width: 100%">
-
-Pour des informations générales relatives à toutes les applications, voir aussi [la page de garde](https://joplinapp.org).

readme/cla_signatures.json

@@ -447,22 +447,6 @@
       "created_at": "2023-04-11T19:02:23Z",
       "repoId": 79162682,
       "pullRequestNo": 8042
-    },
-    {
-      "name": "Wladefant",
-      "id": 79611093,
-      "comment_id": 1514649134,
-      "created_at": "2023-04-19T12:28:22Z",
-      "repoId": 79162682,
-      "pullRequestNo": 8069
-    },
-    {
-      "name": "DeeJayLSP",
-      "id": 60024671,
-      "comment_id": 1519381301,
-      "created_at": "2023-04-24T04:56:51Z",
-      "repoId": 79162682,
-      "pullRequestNo": 8077
     }
   ]
 }

yarn.lock

@@ -4839,6 +4839,7 @@ __metadata:
     "@fortawesome/fontawesome-free": 5.15.4
     "@joeattardi/emoji-button": 4.6.4
     "@joplin/lib": ~2.11
+    "@joplin/pdf-viewer": ~2.11
     "@joplin/renderer": ~2.11
     "@joplin/tools": ~2.11
     "@testing-library/react-hooks": 8.0.1
@@ -4863,7 +4864,6 @@ __metadata:
     glob: 8.1.0
     gulp: 4.0.2
     highlight.js: 11.7.0
-    html-entities: 1.4.0
     immer: 7.0.15
     jest: 29.4.3
     jest-environment-jsdom: 29.4.3
@@ -5144,7 +5144,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@joplin/pdf-viewer@workspace:packages/pdf-viewer":
+"@joplin/pdf-viewer@workspace:packages/pdf-viewer, @joplin/pdf-viewer@~2.11":
   version: 0.0.0-use.local
   resolution: "@joplin/pdf-viewer@workspace:packages/pdf-viewer"
   dependencies:
@@ -11234,18 +11234,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"canvas@npm:^2.11.0":
-  version: 2.11.2
-  resolution: "canvas@npm:2.11.2"
-  dependencies:
-    "@mapbox/node-pre-gyp": ^1.0.0
-    nan: ^2.17.0
-    node-gyp: latest
-    simple-get: ^3.0.3
-  checksum: 61e554aef80022841dc836964534082ec21435928498032562089dfb7736215f039c7d99ee546b0cf10780232d9bf310950f8b4d489dc394e0fb6f6adfc97994
-  languageName: node
-  linkType: hard
-
 "capital-case@npm:^1.0.4":
   version: 1.0.4
   resolution: "capital-case@npm:1.0.4"
@@ -13836,15 +13824,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decompress-response@npm:^4.2.0":
-  version: 4.2.1
-  resolution: "decompress-response@npm:4.2.1"
-  dependencies:
-    mimic-response: ^2.0.0
-  checksum: 4e783ca4dfe9417354d61349750fe05236f565a4415a6ca20983a311be2371debaedd9104c0b0e7b36e5f167aeaae04f84f1a0b3f8be4162f1d7d15598b8fdba
-  languageName: node
-  linkType: hard
-
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -14622,7 +14601,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dommatrix@npm:^1.0.3":
+"dommatrix@npm:^1.0.1, dommatrix@npm:^1.0.3":
   version: 1.0.3
   resolution: "dommatrix@npm:1.0.3"
   checksum: 8ac727c1a14cf8de30a5b49a3bd6b2622a661b391fe1ac54e855eaa14a857ed86d63492150b5f70f912acc24fa3acc31d750259c47e9b5801de237624b0a319f
@@ -23548,13 +23527,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-response@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "mimic-response@npm:2.1.0"
-  checksum: 014fad6ab936657e5f2f48bd87af62a8e928ebe84472aaf9e14fec4fcb31257a5edff77324d8ac13ddc6685ba5135cf16e381efac324e5f174fb4ddbf902bf07
-  languageName: node
-  linkType: hard
-
 "mimic-response@npm:^3.1.0":
   version: 3.1.0
   resolution: "mimic-response@npm:3.1.0"
@@ -24062,7 +24034,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nan@npm:2.17.0, nan@npm:^2.17.0":
+"nan@npm:2.17.0":
   version: 2.17.0
   resolution: "nan@npm:2.17.0"
   dependencies:
@@ -24096,7 +24068,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nanoid@npm:3.3.6, nanoid@npm:^3.3.6":
+"nanoid@npm:3.3.6":
   version: 3.3.6
   resolution: "nanoid@npm:3.3.6"
   bin:
@@ -26045,13 +26017,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path2d-polyfill@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "path2d-polyfill@npm:2.0.1"
-  checksum: e38a4f920be3550e8334b899cc56f4fca0a976ca69404ee10d656a45d422996b7e27e294e2cf0aac2e410ce59d6977cde9f95586e62a24e6c904716695e059f8
-  languageName: node
-  linkType: hard
-
 "pbkdf2@npm:^3.0.3":
   version: 3.1.2
   resolution: "pbkdf2@npm:3.1.2"
@@ -26073,16 +26038,17 @@ __metadata:
   linkType: hard
 
 "pdfjs-dist@npm:*":
-  version: 3.5.141
-  resolution: "pdfjs-dist@npm:3.5.141"
+  version: 2.14.305
+  resolution: "pdfjs-dist@npm:2.14.305"
   dependencies:
-    canvas: ^2.11.0
-    path2d-polyfill: ^2.0.1
+    dommatrix: ^1.0.1
     web-streams-polyfill: ^3.2.1
-  dependenciesMeta:
-    canvas:
+  peerDependencies:
+    worker-loader: ^3.0.8
+  peerDependenciesMeta:
+    worker-loader:
       optional: true
-  checksum: b58e801b92a0d7b58b3799c0cf48f35deb45e140ef488744251a3e3dd148acef7aef4edfb8c7622b342c7068e8b7c01b754546ed0e60897e48665fa45af9d845
+  checksum: b75443f81e500856e3a7b61303d1f621f81e82b19fc6216f74d33a70d1ef392bb8b2ca4cfa39f11e7c0a877e6d6d74b474768988dcf3299d5d8a1d996d48f856
   languageName: node
   linkType: hard
 
@@ -26431,12 +26397,12 @@ __metadata:
   linkType: hard
 
 "postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4":
-  version: 6.0.11
-  resolution: "postcss-selector-parser@npm:6.0.11"
+  version: 6.0.10
+  resolution: "postcss-selector-parser@npm:6.0.10"
   dependencies:
     cssesc: ^3.0.0
     util-deprecate: ^1.0.2
-  checksum: 0b01aa9c2d2c8dbeb51e9b204796b678284be9823abc8d6d40a8b16d4149514e922c264a8ed4deb4d6dbced564b9be390f5942c058582d8656351516d6c49cde
+  checksum: 46afaa60e3d1998bd7adf6caa374baf857cc58d3ff944e29459c9a9e4680a7fe41597bd5b755fc81d7c388357e9bf67c0251d047c640a09f148e13606b8a8608
   languageName: node
   linkType: hard
 
@@ -26494,13 +26460,13 @@ __metadata:
   linkType: hard
 
 "postcss@npm:^8.4.19":
-  version: 8.4.23
-  resolution: "postcss@npm:8.4.23"
+  version: 8.4.20
+  resolution: "postcss@npm:8.4.20"
   dependencies:
-    nanoid: ^3.3.6
+    nanoid: ^3.3.4
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 8bb9d1b2ea6e694f8987d4f18c94617971b2b8d141602725fedcc2222fdc413b776a6e1b969a25d627d7b2681ca5aabb56f59e727ef94072e1b6ac8412105a2f
+  checksum: 1a5609ea1c1b204f9c2974a0019ae9eef2d99bf645c2c9aac675166c4cb1005be7b5e2ba196160bc771f5d9ac896ed883f236f888c891e835e59d28fff6651aa
   languageName: node
   linkType: hard
 
@@ -29616,17 +29582,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-get@npm:^3.0.3":
-  version: 3.1.1
-  resolution: "simple-get@npm:3.1.1"
-  dependencies:
-    decompress-response: ^4.2.0
-    once: ^1.3.1
-    simple-concat: ^1.0.0
-  checksum: 80195e70bf171486e75c31e28e5485468195cc42f85940f8b45c4a68472160144d223eb4d07bc82ef80cb974b7c401db021a540deb2d34ac4b3b8883da2d6401
-  languageName: node
-  linkType: hard
-
 "simple-get@npm:^4.0.0":
   version: 4.0.0
   resolution: "simple-get@npm:4.0.0"