Skip to content

Commit

Permalink
Chore: Fixed a few links that were broken after Lerna upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Dec 10, 2020
1 parent f1bbcea commit ff5e8ee
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Assets/TinyMCE/JoplinLists/src/main/ts/ui/Buttons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
20 changes: 10 additions & 10 deletions joplin.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/app-cli/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`);
Expand Down
6 changes: 3 additions & 3 deletions packages/lib/services/plugins/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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:
*
Expand Down Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/gulp/tasks/copyLib.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
],
};

Expand Down

0 comments on commit ff5e8ee

Please sign in to comment.