diff --git a/Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts b/Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts index d152446db..1f0558e7f 100644 --- a/Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts +++ b/Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts @@ -48,7 +48,7 @@ const listState = function (editor: Editor, listName, options:any = {}) { // dependent on how the checkbox is styled, so if the style is changed, this might need // to be updated too. // For the styling, see: - // packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/checkbox.ts + // packages/renderer/MdToHtml/rules/checkbox.ts // // The previous solution was to use "pointer-event: none", which mostly work, however // it means that links are no longer clickable when they are within the checkbox label. diff --git a/joplin.code-workspace b/joplin.code-workspace index 8be37e1c4..166bd792e 100644 --- a/joplin.code-workspace +++ b/joplin.code-workspace @@ -102,9 +102,9 @@ "./packages/app-mobile/fastlane/Preview.html": true, "./packages/app-mobile/fastlane/report.xml": true, "./packages/app-mobile/fastlane/screenshots": true, - "./packages/app-mobile/lib/joplin-renderer/**/.vscode/": true, - "./packages/app-mobile/lib/joplin-renderer/**/copyLib.bat": true, - "./packages/app-mobile/lib/joplin-renderer/**/node_modules/": true, + "./packages/renderer/**/.vscode/": true, + "./packages/renderer/**/copyLib.bat": true, + "./packages/renderer/**/node_modules/": true, "./packages/app-tools/**/*-kct.*": true, "./packages/app-tools/**/github_username_cache.json": true, "./packages/app-tools/**/patreon_oauth_token.txt": true, @@ -300,13 +300,13 @@ "packages/app-mobile/fastlane/screenshots": true, "packages/app-mobile/ios/build/": true, "packages/app-mobile/lib/csstojs/": true, - "packages/app-mobile/lib/joplin-renderer/**/.vscode/": true, - "packages/app-mobile/lib/joplin-renderer/**/copyLib.bat": true, - "packages/app-mobile/lib/joplin-renderer/**/node_modules/": true, - "packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/checkbox.js": true, - "packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/fence.js": true, - "packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/mermaid.js": true, - "packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/sanitize_html.js": true, + "packages/renderer/**/.vscode/": true, + "packages/renderer/**/copyLib.bat": true, + "packages/renderer/**/node_modules/": true, + "packages/renderer/MdToHtml/rules/checkbox.js": true, + "packages/renderer/MdToHtml/rules/fence.js": true, + "packages/renderer/MdToHtml/rules/mermaid.js": true, + "packages/renderer/MdToHtml/rules/sanitize_html.js": true, "packages/app-mobile/lib/rnInjectedJs/": true, "packages/app-mobile/lib/sql-extensions/spellfix.so": true, "packages/generator-joplin/generators/app/templates/api/": true, diff --git a/packages/app-cli/gulpfile.js b/packages/app-cli/gulpfile.js index 80097d346..0bdb729fc 100644 --- a/packages/app-cli/gulpfile.js +++ b/packages/app-cli/gulpfile.js @@ -52,7 +52,7 @@ tasks.prepareTestBuild = { // await utils.copyDir(`${rootDir}/packages/app-mobile/lib`, `${testBuildDir}/lib`, { // excluded: [ - // `${rootDir}/packages/app-mobile/lib/joplin-renderer/node_modules`, + // `${rootDir}/packages/renderer/node_modules`, // ], // }); // await utils.copyDir(`${rootDir}/packages/app-mobile/locales`, `${testBuildDir}/locales`); diff --git a/packages/lib/services/plugins/api/types.ts b/packages/lib/services/plugins/api/types.ts index 094331cf2..6353ac0cc 100644 --- a/packages/lib/services/plugins/api/types.ts +++ b/packages/lib/services/plugins/api/types.ts @@ -353,9 +353,9 @@ export enum ContentScriptType { * * - The `context` argument is currently unused but could be used later on to provide access to your own plugin so that the content script and plugin can communicate. * - * - The **required** `plugin` key is the actual Markdown-It plugin - check the [official doc](https://github.com/markdown-it/markdown-it) for more information. The `options` parameter is of type [RuleOptions](https://github.com/laurent22/joplin/blob/dev/packages/app-mobile/lib/joplin-renderer/MdToHtml.ts), which contains a number of options, mostly useful for Joplin's internal code. + * - The **required** `plugin` key is the actual Markdown-It plugin - check the [official doc](https://github.com/markdown-it/markdown-it) for more information. The `options` parameter is of type [RuleOptions](https://github.com/laurent22/joplin/blob/dev/packages/renderer/MdToHtml.ts), which contains a number of options, mostly useful for Joplin's internal code. * - * - Using the **optional** `assets` key you may specify assets such as JS or CSS that should be loaded in the rendered HTML document. Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to see how the data should be structured. + * - Using the **optional** `assets` key you may specify assets such as JS or CSS that should be loaded in the rendered HTML document. Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/packages/renderer/MdToHtml/rules/mermaid.ts) to see how the data should be structured. * * To include a regular Markdown-It plugin, that doesn't make use of any Joplin-specific features, you would simply create a file such as this: * @@ -400,7 +400,7 @@ export enum ContentScriptType { * * - The `codeMirrorOptions` key contains all the [CodeMirror](https://codemirror.net/doc/manual.html#config) options that will be set or changed by this plugin. New options can alse be declared via [`CodeMirror.defineOption`](https://codemirror.net/doc/manual.html#defineOption), and then have their value set here. For example, a plugin that enables line numbers would set `codeMirrorOptions` to `{'lineNumbers': true}`. * - * - Using the **optional** `assets` key you may specify **only** CSS assets that should be loaded in the rendered HTML document. Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/mermaid.ts) to see how the data should be structured. + * - Using the **optional** `assets` key you may specify **only** CSS assets that should be loaded in the rendered HTML document. Check for example the Joplin [Mermaid plugin](https://github.com/laurent22/joplin/blob/dev/packages/renderer/MdToHtml/rules/mermaid.ts) to see how the data should be structured. * * One of the `plugin`, `codeMirrorResources`, or `codeMirrorOptions` keys must be provided for the plugin to be valid. Having multiple or all provided is also okay. * diff --git a/packages/renderer/package.json b/packages/renderer/package.json index cd898da02..cba4e2ff9 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -2,7 +2,7 @@ "name": "@joplin/renderer", "version": "1.0.17", "description": "The Joplin note renderer, used the mobile and desktop application", - "repository": "https://github.com/laurent22/joplin/tree/dev/packages/app-mobile/lib/joplin-renderer", + "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "main": "index.js", "types": "index.d.ts", "publishConfig": { diff --git a/packages/tools/gulp/tasks/copyLib.js b/packages/tools/gulp/tasks/copyLib.js index 28151a41e..663c6a1de 100644 --- a/packages/tools/gulp/tasks/copyLib.js +++ b/packages/tools/gulp/tasks/copyLib.js @@ -7,7 +7,7 @@ module.exports = { fn: async function() { const copyOptions = { excluded: [ - `${rootDir}/packages/app-mobile/lib/joplin-renderer/node_modules`, + `${rootDir}/packages/renderer/node_modules`, ], };